Skip to content

Commit f5384ae

Browse files
DRx3DDRx3D
authored
Merge branch 'master' into develop/gltf-sample-viewer-enhancements
2 parents e07b02e + 300e3c8 commit f5384ae

File tree

100 files changed

+3693
-490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+3693
-490
lines changed

‎2.0/BoxVertexColors/README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
# Box Vertex Colors
2+
3+
A simple unit cube that uses vertex colors, stored in the `COLORS_0` attribute. The color of each vertex is given by the RGB colors that are defined by the vertex coordinates. So the vertex at (0,0,0) is black, the vertex at (1,0,0) is red, the vertex at (1,1,0) is yellow, ..., and the vertex at (1,1,1) is white.
4+
25
## Screenshot
36

47
![screenshot](screenshot/screenshot.png)
58

69
## License Information
710

8-
Donated by Michael Feldstein for glTF testing.
11+
Public domain ([CC0](https://creativecommons.org/publicdomain/zero/1.0/))
12+

‎2.0/BoxVertexColors/glTF-Binary/BoxVertexColors.glb‎

-956 Bytes
Binary file not shown.

‎2.0/BoxVertexColors/glTF-Embedded/BoxVertexColors.gltf‎

Lines changed: 74 additions & 219 deletions
Original file line numberDiff line numberDiff line change
@@ -1,220 +1,75 @@
11
{
2-
"accessors": [
3-
{
4-
"bufferView": 0,
5-
"byteOffset": 0,
6-
"componentType": 5123,
7-
"count": 36,
8-
"type": "SCALAR"
9-
},
10-
{
11-
"bufferView": 1,
12-
"byteOffset": 0,
13-
"componentType": 5126,
14-
"count": 24,
15-
"max": [
16-
0.5,
17-
0.5,
18-
0.5
19-
],
20-
"min": [
21-
-0.5,
22-
-0.5,
23-
-0.5
24-
],
25-
"type": "VEC3"
26-
},
27-
{
28-
"bufferView": 2,
29-
"byteOffset": 0,
30-
"componentType": 5126,
31-
"count": 24,
32-
"type": "VEC3"
33-
},
34-
{
35-
"bufferView": 3,
36-
"byteOffset": 0,
37-
"componentType": 5126,
38-
"count": 24,
39-
"type": "VEC4"
40-
},
41-
{
42-
"bufferView": 4,
43-
"byteOffset": 0,
44-
"componentType": 5126,
45-
"count": 24,
46-
"type": "VEC2"
47-
}
48-
],
49-
"asset": {
50-
"generator": "FBX2glTF",
51-
"version": "2.0"
52-
},
53-
"bufferViews": [
54-
{
55-
"buffer": 0,
56-
"byteLength": 72,
57-
"byteOffset": 0,
58-
"target": 34963
59-
},
60-
{
61-
"buffer": 0,
62-
"byteLength": 288,
63-
"byteOffset": 72,
64-
"target": 34962
65-
},
66-
{
67-
"buffer": 0,
68-
"byteLength": 288,
69-
"byteOffset": 360,
70-
"target": 34962
71-
},
72-
{
73-
"buffer": 0,
74-
"byteLength": 384,
75-
"byteOffset": 648,
76-
"target": 34962
77-
},
78-
{
79-
"buffer": 0,
80-
"byteLength": 192,
81-
"byteOffset": 1032,
82-
"target": 34962
83-
}
84-
],
85-
"buffers": [
86-
{
87-
"byteLength": 1224,
88-
"uri": "data:application/octet-stream;base64,AAABAAIAAQAAAAMABAAFAAYABwAEAAYACAAJAAoACwAJAAgADAANAA4ADQAMAA8AEAARABIAEAASABMAFAAVABYAFAAWABcAAAAAvwAAAD8AAAC/AAAAPwAAAD8AAAA/AAAAPwAAAD8AAAC/AAAAvwAAAD8AAAA/AAAAvwAAAD8AAAA/AAAAvwAAAD8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAL8AAAA/AAAAPwAAAD8AAAA/AAAAvwAAAL8AAAA/AAAAPwAAAL8AAAA/AAAAvwAAAD8AAAA/AAAAPwAAAD8AAAC/AAAAPwAAAL8AAAA/AAAAPwAAAL8AAAC/AAAAPwAAAD8AAAA/AAAAPwAAAL8AAAC/AAAAvwAAAL8AAAC/AAAAvwAAAD8AAAC/AAAAPwAAAD8AAAC/AAAAPwAAAL8AAAA/AAAAvwAAAL8AAAA/AAAAvwAAAL8AAAC/AAAAPwAAAL8AAAC/AAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAHekGMHp6JTz+/38/UdInMBHtfz9SNZs6rTHKPJsTwTrvy00/XMpNP0HLTT8AAIA/3ssCP4z/fz+gF+43whYUON7LAj+M/38/oBfuN8IWFDgd6QYwenolPP7/fz9R0icw6vR/PwjDNTqNSsY80xtiOu/LTT9cyk0/QctNPwAAgD8R7X8/UjWbOq0xyjybE8E678tNP1zKTT9By00/AACAP6bmIzurlgY+BNh/P0ziSzveywI/jP9/P6AX7jfCFhQ478tNP1zKTT9By00/AACAP6bmIzurlgY+BNh/P0ziSzsSAI885Oh+PxdguT574rE8Ee1/P1I1mzqtMco8mxPBOhIAjzzk6H4/F2C5PnvisTzq9H8/CMM1Oo1KxjzTG2I6HekGMHp6JTz+/38/UdInMO/LTT9cyk0/QctNPwAAgD+m5iM7q5YGPgTYfz9M4ks778tNP1zKTT9By00/AACAP+r0fz8IwzU6jUrGPNMbYjoSAI885Oh+PxdguT574rE8AACAPgAAAAAAAAA/qqqqPgAAAD8AAAAAAACAPqqqqj4AAIA+qqqqPgAAAACqqqo+AAAAAKqqKj8AAIA+qqoqPwAAAD+qqqo+AACAPqqqKj8AAAA/qqoqPwAAgD6qqqo+AABAP6qqqj4AAAA/qqoqPwAAQD+qqio/AAAAP6qqqj4AAEA/qqoqPwAAgD+qqio/AACAP6qqqj4AAEA/qqqqPgAAAD+qqio/AACAPqqqKj8AAIA+AACAPwAAAD8AAIA/"
89-
}
90-
],
91-
"materials": [
92-
{
93-
"name": "Default",
94-
"pbrMetallicRoughness": {
95-
"baseColorFactor": [
96-
0.800000011920929,
97-
0.800000011920929,
98-
0.800000011920929,
99-
1.0
100-
],
101-
"metallicFactor": 0.100000001490116,
102-
"roughnessFactor": 0.990000005960464
103-
}
104-
}
105-
],
106-
"meshes": [
107-
{
108-
"name": "Cube",
109-
"primitives": [
110-
{
111-
"attributes": {
112-
"COLOR_0": 3,
113-
"NORMAL": 2,
114-
"POSITION": 1,
115-
"TEXCOORD_0": 4
116-
},
117-
"indices": 0,
118-
"material": 0,
119-
"mode": 4
120-
}
121-
]
122-
}
123-
],
124-
"nodes": [
125-
{
126-
"children": [
127-
1,
128-
2,
129-
3
130-
],
131-
"name": "RootNode",
132-
"rotation": [
133-
0.0,
134-
0.0,
135-
0.0,
136-
1.0
137-
],
138-
"scale": [
139-
1.0,
140-
1.0,
141-
1.0
142-
],
143-
"translation": [
144-
0.0,
145-
0.0,
146-
0.0
147-
]
148-
},
149-
{
150-
"name": "Mesh",
151-
"rotation": [
152-
0.0,
153-
0.0,
154-
0.0,
155-
1.0
156-
],
157-
"scale": [
158-
1.0,
159-
1.0,
160-
1.0
161-
],
162-
"translation": [
163-
0.0,
164-
0.0,
165-
0.0
166-
]
167-
},
168-
{
169-
"mesh": 0,
170-
"name": "Cube",
171-
"rotation": [
172-
0.0,
173-
0.0,
174-
0.0,
175-
1.0
176-
],
177-
"scale": [
178-
1.0,
179-
1.0,
180-
1.0
181-
],
182-
"translation": [
183-
0.0,
184-
0.0,
185-
0.0
186-
]
187-
},
188-
{
189-
"name": "Texture Group",
190-
"rotation": [
191-
0.0,
192-
0.0,
193-
0.0,
194-
1.0
195-
],
196-
"scale": [
197-
1.0,
198-
1.0,
199-
1.0
200-
],
201-
"translation": [
202-
0.0,
203-
0.0,
204-
0.0
205-
]
206-
}
207-
],
208-
"samplers": [
209-
{}
210-
],
211-
"scene": 0,
212-
"scenes": [
213-
{
214-
"name": "Root Scene",
215-
"nodes": [
216-
0
217-
]
218-
}
219-
]
220-
}
2+
"accessors" : [ {
3+
"bufferView" : 0,
4+
"byteOffset" : 0,
5+
"componentType" : 5123,
6+
"count" : 36,
7+
"type" : "SCALAR",
8+
"max" : [ 23 ],
9+
"min" : [ 0 ]
10+
}, {
11+
"bufferView" : 1,
12+
"byteOffset" : 0,
13+
"componentType" : 5126,
14+
"count" : 24,
15+
"type" : "VEC3",
16+
"max" : [ 1.0, 1.0, 1.0 ],
17+
"min" : [ 0.0, 0.0, 0.0 ]
18+
}, {
19+
"bufferView" : 1,
20+
"byteOffset" : 288,
21+
"componentType" : 5126,
22+
"count" : 24,
23+
"type" : "VEC3",
24+
"max" : [ 1.0, 1.0, 1.0 ],
25+
"min" : [ -1.0, -1.0, -1.0 ]
26+
}, {
27+
"bufferView" : 1,
28+
"byteOffset" : 576,
29+
"componentType" : 5126,
30+
"count" : 24,
31+
"type" : "VEC3",
32+
"max" : [ 1.0, 1.0, 1.0 ],
33+
"min" : [ 0.0, 0.0, 0.0 ]
34+
} ],
35+
"asset" : {
36+
"generator" : "JglTF from https://github.com/javagl/JglTF",
37+
"version" : "2.0"
38+
},
39+
"buffers" : [ {
40+
"uri" : "data:application/gltf-buffer;base64,AAACAAEAAAADAAIABAAGAAUABAAHAAYACAAKAAkACAALAAoADAAOAA0ADAAPAA4AEAASABEAEAATABIAFAAWABUAFAAXABYAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAgD8AAAAAAAAAAAAAgD8AAAAAAACAPwAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAgD8AAIA/AACAPwAAgD8AAIA/AACAPwAAAAAAAAAAAACAPwAAAAAAAIA/AACAPwAAgD8AAIA/AACAPwAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAIA/AAAAAAAAgD8AAAAAAACAPwAAgD8AAAAAAACAPwAAgD8AAIA/AAAAAAAAgD8AAIA/AAAAAAAAAAAAAIA/AACAPwAAAAAAAIA/AACAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAgD8AAAAAAAAAAAAAgD8AAAAAAACAPwAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAgD8AAIA/AACAPwAAgD8AAIA/AACAPwAAAAAAAAAAAACAPwAAAAAAAIA/AACAPwAAgD8AAIA/AACAPwAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAIA/AAAAAAAAgD8AAAAAAACAPwAAgD8AAAAAAACAPwAAgD8AAIA/AAAAAAAAgD8AAIA/AAAAAAAAAAAAAIA/AACAPwAAAAAAAIA/AACAPwAAAAAAAAAAAAAAAAAAAAAAAAAA",
41+
"byteLength" : 936
42+
} ],
43+
"bufferViews" : [ {
44+
"name" : "indices bufferView",
45+
"buffer" : 0,
46+
"byteOffset" : 0,
47+
"byteLength" : 72,
48+
"target" : 34963
49+
}, {
50+
"name" : "attributes bufferView",
51+
"buffer" : 0,
52+
"byteOffset" : 72,
53+
"byteLength" : 864,
54+
"byteStride" : 12,
55+
"target" : 34962
56+
} ],
57+
"meshes" : [ {
58+
"primitives" : [ {
59+
"attributes" : {
60+
"POSITION" : 1,
61+
"NORMAL" : 2,
62+
"COLOR_0" : 3
63+
},
64+
"indices" : 0,
65+
"mode" : 4
66+
} ]
67+
} ],
68+
"nodes" : [ {
69+
"mesh" : 0
70+
} ],
71+
"scene" : 0,
72+
"scenes" : [ {
73+
"nodes" : [ 0 ]
74+
} ]
75+
}

0 commit comments

Comments
 (0)