Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the Instantiation model group #535

Merged
merged 41 commits into from
Jun 26, 2019
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
972fffc
Initial commit of the Instantiation model group
stevk Jun 6, 2019
0b3eaee
Add runtime support for two textures using the same image
stevk Jun 7, 2019
c398386
Add two materials using the same texture
stevk Jun 7, 2019
fce61cb
Add runtime support for two primitives using the same material
stevk Jun 7, 2019
0220d51
Add runtime support for two primitives using the same attribute acces…
stevk Jun 10, 2019
627b272
Fix merge errors
stevk Jun 10, 2019
5ded5b7
Add runtime support for two primitive indices using the same accessors
stevk Jun 10, 2019
840a294
Implement model for two nodes using the same mesh
stevk Jun 10, 2019
1fe8364
Implement model for two nodes using the same skin
stevk Jun 10, 2019
781ce5b
Implement model for two skins using the same skeleton
stevk Jun 10, 2019
b324639
Add runtime support for two skins using the same inverseBindMatrices
stevk Jun 11, 2019
adb2556
Add support to only instance inverseBindMatrices when indicated
stevk Jun 11, 2019
40ea6e8
Add runtime support for two animation schannels using the same samplers
stevk Jun 11, 2019
bd7288b
Add runtime support for two animation samplers using the same accessors
stevk Jun 11, 2019
bbc741c
Add runtime support for two accessors using the same buffer view
stevk Jun 11, 2019
0c2561d
Use vertex color instead of textures when textures aren't needed
stevk Jun 12, 2019
511c47d
Add runtime support for two samplers with different inputs sharing a …
stevk Jun 12, 2019
d4fe9ce
Refactor duplicate code
stevk Jun 12, 2019
09b557e
Cleanup
stevk Jun 12, 2019
01219d0
Cleanup
stevk Jun 12, 2019
036a03f
Cleanup
stevk Jun 12, 2019
53c2afc
Remove unused extension
stevk Jun 13, 2019
07af391
Change name to Instancing and name some dictionaries as ToIndex
stevk Jun 13, 2019
ebf7f77
Remove instanceBufferView flag and comment out model
stevk Jun 13, 2019
aca3ff0
Use one cache for all ienumerable dictionaries
stevk Jun 14, 2019
0eeb490
split skinjoints into node and inversebindmatrix, to remove need for …
stevk Jun 14, 2019
fea8109
Action feedback
stevk Jun 17, 2019
20a2b2f
Action feedback
stevk Jun 17, 2019
9804890
Action feedback
stevk Jun 17, 2019
58f2058
Add descriptions of what is different about the parent property
stevk Jun 17, 2019
fac4d9f
Action feedback
stevk Jun 20, 2019
4168753
Add comments
stevk Jun 20, 2019
18cfdde
Apply suggestions from code review
stevk Jun 21, 2019
367a8d6
Action feedback
stevk Jun 24, 2019
cc02176
Add textures for samplers and a model - Two textures pointing at the …
stevk Jun 25, 2019
ab1bfa1
Action feedback
stevk Jun 25, 2019
bd8a14d
Cleanup
stevk Jun 26, 2019
bc24da0
Changes to readme strings
stevk Jun 26, 2019
3744ee1
Changes to readme strings
stevk Jun 26, 2019
7e2ed33
Changes to readme strings
stevk Jun 26, 2019
3978f6b
Action feedback
stevk Jun 26, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Output/Positive/Animation_Skin/Animation_Skin_05.bin
Binary file not shown.
25 changes: 6 additions & 19 deletions Output/Positive/Animation_Skin/Animation_Skin_05.gltf
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,13 @@
},
{
"bufferView": 6,
"componentType": 5125,
"count": 12,
"type": "SCALAR",
"name": "Indices Accessor"
},
{
"bufferView": 7,
"componentType": 5126,
"count": 6,
"type": "VEC4",
"name": "weights accessor"
},
{
"bufferView": 8,
"bufferView": 7,
"componentType": 5123,
"count": 6,
"type": "VEC4",
Expand All @@ -91,7 +84,7 @@
"buffers": [
{
"uri": "Animation_Skin_05.bin",
"byteLength": 656
"byteLength": 608
}
],
"bufferViews": [
Expand Down Expand Up @@ -133,18 +126,12 @@
{
"buffer": 0,
"byteOffset": 464,
"byteLength": 48,
"name": "Indices"
},
{
"buffer": 0,
"byteOffset": 512,
"byteLength": 96,
"name": "weights buffer view"
},
{
"buffer": 0,
"byteOffset": 608,
"byteOffset": 560,
"byteLength": 48,
"name": "joint indices buffer view"
}
Expand Down Expand Up @@ -192,10 +179,10 @@
{
"attributes": {
"POSITION": 5,
"WEIGHTS_0": 7,
"JOINTS_0": 8
"WEIGHTS_0": 6,
"JOINTS_0": 7
},
"indices": 6,
"indices": 1,
"material": 1
}
]
Expand Down
Binary file modified Output/Positive/Animation_Skin/Animation_Skin_07.bin
Binary file not shown.
36 changes: 7 additions & 29 deletions Output/Positive/Animation_Skin/Animation_Skin_07.gltf
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,6 @@
{
"bufferView": 9,
"componentType": 5126,
"count": 2,
"type": "MAT4",
"name": "IBM"
},
{
"bufferView": 10,
"componentType": 5126,
"count": 3,
"type": "SCALAR",
"max": [
Expand All @@ -104,7 +97,7 @@
"name": "Animation Sampler Input"
},
{
"bufferView": 11,
"bufferView": 10,
"componentType": 5126,
"count": 3,
"type": "VEC4",
Expand All @@ -124,8 +117,8 @@
],
"samplers": [
{
"input": 10,
"output": 11
"input": 9,
"output": 10
}
]
}
Expand All @@ -137,7 +130,7 @@
"buffers": [
{
"uri": "Animation_Skin_07.bin",
"byteLength": 892
"byteLength": 764
}
],
"bufferViews": [
Expand Down Expand Up @@ -197,18 +190,12 @@
{
"buffer": 0,
"byteOffset": 704,
"byteLength": 128,
"name": "Inverse Bind Matrix"
},
{
"buffer": 0,
"byteOffset": 832,
"byteLength": 12,
"name": "Animation Sampler Input"
},
{
"buffer": 0,
"byteOffset": 844,
"byteOffset": 716,
"byteLength": 48,
"name": "Animation Sampler Output"
}
Expand Down Expand Up @@ -299,7 +286,7 @@
"name": "joint1"
},
{
"skin": 1,
"skin": 0,
"mesh": 1,
"name": "outerPrism"
}
Expand All @@ -320,16 +307,7 @@
"joints": [
1,
2
],
"name": "innerPrismSkinB"
},
{
"inverseBindMatrices": 9,
"joints": [
1,
2
],
"name": "outerPrismSkinB"
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Output/Positive/Animation_Skin/Manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"sampleImageName": "Figures/SampleImages/Animation_Skin_11.png",
"camera": {
"translation": [
0.8,
1.5,
0.0,
1.0
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"mimeType": "application/gltf-buffer",
"storage": "external",
"uri": "Animation_Skin_05.bin",
"byteLength": 656
"byteLength": 608
}
],
"hasAnimations": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"mimeType": "application/gltf-buffer",
"storage": "external",
"uri": "Animation_Skin_07.bin",
"byteLength": 892
"byteLength": 764
}
],
"hasAnimations": true,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Output/Positive/Instancing/Instancing_00.bin
Binary file not shown.
189 changes: 189 additions & 0 deletions Output/Positive/Instancing/Instancing_00.gltf
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
{
"accessors": [
{
"bufferView": 0,
"componentType": 5126,
"count": 4,
"type": "VEC3",
"max": [
-0.100000024,
0.5,
0.0
],
"min": [
-1.1,
-0.5,
0.0
],
"name": "Positions Accessor"
},
{
"bufferView": 1,
"componentType": 5126,
"count": 4,
"type": "VEC2",
"name": "UV Accessor 0"
},
{
"bufferView": 2,
"componentType": 5125,
"count": 6,
"type": "SCALAR",
"name": "Indices Accessor"
},
{
"bufferView": 3,
"componentType": 5126,
"count": 4,
"type": "VEC3",
"max": [
1.1,
0.5,
0.0
],
"min": [
0.100000024,
-0.5,
0.0
],
"name": "Positions Accessor"
},
{
"bufferView": 4,
"componentType": 5126,
"count": 4,
"type": "VEC2",
"name": "UV Accessor 0"
},
{
"bufferView": 5,
"componentType": 5125,
"count": 6,
"type": "SCALAR",
"name": "Indices Accessor"
}
],
"asset": {
"generator": "glTF Asset Generator",
"version": "2.0"
},
"buffers": [
{
"uri": "Instancing_00.bin",
"byteLength": 208
}
],
"bufferViews": [
{
"buffer": 0,
"byteLength": 48,
"name": "Positions"
},
{
"buffer": 0,
"byteOffset": 48,
"byteLength": 32,
"name": "Texture Coords 0"
},
{
"buffer": 0,
"byteOffset": 80,
"byteLength": 24,
"name": "Indices"
},
{
"buffer": 0,
"byteOffset": 104,
"byteLength": 48,
"name": "Positions"
},
{
"buffer": 0,
"byteOffset": 152,
"byteLength": 32,
"name": "Texture Coords 0"
},
{
"buffer": 0,
"byteOffset": 184,
"byteLength": 24,
"name": "Indices"
}
],
"images": [
{
"uri": "Textures/BaseColor_1.png"
}
],
"materials": [
{
"pbrMetallicRoughness": {
"baseColorTexture": {
"index": 0
}
}
},
{
"pbrMetallicRoughness": {
"baseColorTexture": {
"index": 1
}
}
}
],
"meshes": [
{
"primitives": [
{
"attributes": {
"POSITION": 0,
"TEXCOORD_0": 1
},
"indices": 2,
"material": 0
},
{
"attributes": {
"POSITION": 3,
"TEXCOORD_0": 4
},
"indices": 5,
"material": 1
}
]
}
],
"nodes": [
{
"mesh": 0
}
],
"samplers": [
{
"wrapS": 33071,
"wrapT": 33071
},
{
"wrapS": 33648,
"wrapT": 33648
}
],
"scene": 0,
"scenes": [
{
"nodes": [
0
]
}
],
"textures": [
{
"sampler": 0,
"source": 0
},
{
"sampler": 1,
"source": 0
}
]
}
Binary file added Output/Positive/Instancing/Instancing_01.bin
Binary file not shown.
Loading