Skip to content

Commit

Permalink
Merge pull request #2 from StardustXR/main
Browse files Browse the repository at this point in the history
feat: update hexagon
  • Loading branch information
nik012003 authored Feb 23, 2023
2 parents 8fa9e68 + 35a7d82 commit e547120
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 17 deletions.
Binary file modified assets/hexagon.blend
Binary file not shown.
Binary file modified res/protostar/hexagon/hexagon.bin
Binary file not shown.
132 changes: 115 additions & 17 deletions res/protostar/hexagon/hexagon.gltf
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,22 @@
}
],
"materials" : [
{
"alphaCutoff" : 0.5,
"alphaMode" : "MASK",
"extensions" : {
"KHR_materials_unlit" : {}
},
"name" : "Icon",
"pbrMetallicRoughness" : {
"baseColorTexture" : {
"index" : 0,
"texCoord" : 0
},
"metallicFactor" : 0,
"roughnessFactor" : 0.9
}
},
{
"alphaMode" : "BLEND",
"extensions" : {
Expand All @@ -36,7 +52,7 @@
1
],
"baseColorTexture" : {
"index" : 0,
"index" : 1,
"texCoord" : 0
},
"metallicFactor" : 0,
Expand All @@ -56,6 +72,15 @@
},
"indices" : 3,
"material" : 0
},
{
"attributes" : {
"POSITION" : 4,
"TEXCOORD_0" : 5,
"NORMAL" : 6
},
"indices" : 7,
"material" : 1
}
]
}
Expand All @@ -64,9 +89,18 @@
{
"sampler" : 0,
"source" : 0
},
{
"sampler" : 1,
"source" : 1
}
],
"images" : [
{
"mimeType" : "image/png",
"name" : "icon_test",
"uri" : "icon_test.png"
},
{
"mimeType" : "image/png",
"name" : "hex_atlas",
Expand All @@ -77,73 +111,137 @@
{
"bufferView" : 0,
"componentType" : 5126,
"count" : 108,
"count" : 6,
"max" : [
0.9999998807907104,
0.05000000074505806,
0.866025447845459
],
"min" : [
-0.9999998807907104,
0.05000000074505806,
-0.866025447845459
],
"type" : "VEC3"
},
{
"bufferView" : 1,
"componentType" : 5126,
"count" : 6,
"type" : "VEC2"
},
{
"bufferView" : 2,
"componentType" : 5126,
"count" : 6,
"type" : "VEC3"
},
{
"bufferView" : 3,
"componentType" : 5123,
"count" : 12,
"type" : "SCALAR"
},
{
"bufferView" : 4,
"componentType" : 5126,
"count" : 54,
"max" : [
1.0441828966140747,
0.05000000074505806,
0.9042890667915344
],
"min" : [
-1.0441828966140747,
-0.05000000074505806,
0,
-0.9042890667915344
],
"type" : "VEC3"
},
{
"bufferView" : 1,
"bufferView" : 5,
"componentType" : 5126,
"count" : 108,
"count" : 54,
"type" : "VEC2"
},
{
"bufferView" : 2,
"bufferView" : 6,
"componentType" : 5126,
"count" : 108,
"count" : 54,
"type" : "VEC3"
},
{
"bufferView" : 3,
"bufferView" : 7,
"componentType" : 5123,
"count" : 168,
"count" : 84,
"type" : "SCALAR"
}
],
"bufferViews" : [
{
"buffer" : 0,
"byteLength" : 1296,
"byteLength" : 72,
"byteOffset" : 0,
"target" : 34962
},
{
"buffer" : 0,
"byteLength" : 864,
"byteOffset" : 1296,
"byteLength" : 48,
"byteOffset" : 72,
"target" : 34962
},
{
"buffer" : 0,
"byteLength" : 72,
"byteOffset" : 120,
"target" : 34962
},
{
"buffer" : 0,
"byteLength" : 24,
"byteOffset" : 192,
"target" : 34963
},
{
"buffer" : 0,
"byteLength" : 648,
"byteOffset" : 216,
"target" : 34962
},
{
"buffer" : 0,
"byteLength" : 1296,
"byteOffset" : 2160,
"byteLength" : 432,
"byteOffset" : 864,
"target" : 34962
},
{
"buffer" : 0,
"byteLength" : 336,
"byteOffset" : 3456,
"byteLength" : 648,
"byteOffset" : 1296,
"target" : 34962
},
{
"buffer" : 0,
"byteLength" : 168,
"byteOffset" : 1944,
"target" : 34963
}
],
"samplers" : [
{
"magFilter" : 9729,
"minFilter" : 9987,
"wrapS" : 33071,
"wrapT" : 33071
},
{
"magFilter" : 9729,
"minFilter" : 9987
}
],
"buffers" : [
{
"byteLength" : 3792,
"byteLength" : 2112,
"uri" : "hexagon.bin"
}
]
Expand Down
Binary file added res/protostar/hexagon/icon_test.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e547120

Please sign in to comment.