Update models for v0.6

KhronosGroup · May 14, 2014 · 63e9329 · 63e9329
1 parent f7e189a
commit 63e9329
Show file tree

Hide file tree

Showing 10 changed files with 16,377 additions and 15,390 deletions.
diff --git a/model/SuperMurdoch/SuperMurdoch.bin b/model/SuperMurdoch/SuperMurdoch.bin
diff --git a/model/SuperMurdoch/SuperMurdoch.json b/model/SuperMurdoch/SuperMurdoch.json
diff --git a/model/SuperMurdoch/SuperMurdoch0FS.glsl b/model/SuperMurdoch/SuperMurdoch0FS.glsl
@@ -1,13 +1,14 @@
 precision highp float;
 varying vec3 v_normal;
 uniform vec4 u_diffuse;
+uniform float u_transparency;
 void main(void) {
 vec3 normal = normalize(v_normal);
 vec4 color = vec4(0., 0., 0., 0.);
 vec4 diffuse = vec4(0., 0., 0., 1.);
 diffuse = u_diffuse;
 diffuse.xyz *= max(dot(normal,vec3(0.,0.,1.)), 0.);
 color.xyz += diffuse.xyz;
-color = vec4(color.rgb * diffuse.a, diffuse.a);
+color = vec4(color.rgb * diffuse.a, diffuse.a * u_transparency);
 gl_FragColor = color;
 }
diff --git a/model/duck/duck.bin b/model/duck/duck.bin
diff --git a/model/duck/duck.json b/model/duck/duck.json
@@ -1,8 +1,15 @@
 {
     "accessors": {
-        "attribute_23": {
+        "accessor_21": {
             "bufferView": "bufferView_29",
             "byteOffset": 0,
+            "byteStride": 0,
+            "count": 12636,
+            "type": 5123
+        },
+        "accessor_23": {
+            "bufferView": "bufferView_30",
+            "byteOffset": 0,
             "byteStride": 12,
             "count": 2399,
             "max": [
@@ -17,8 +24,8 @@
             ],
             "type": 35665
         },
-        "attribute_25": {
-            "bufferView": "bufferView_29",
+        "accessor_25": {
+            "bufferView": "bufferView_30",
             "byteOffset": 28788,
             "byteStride": 12,
             "count": 2399,
@@ -34,8 +41,8 @@
             ],
             "type": 35665
         },
-        "attribute_27": {
-            "bufferView": "bufferView_29",
+        "accessor_27": {
+            "bufferView": "bufferView_30",
             "byteOffset": 57576,
             "byteStride": 8,
             "count": 2399,
@@ -48,33 +55,27 @@
                 0.019963
             ],
             "type": 35664
-        },
-        "indices_21": {
-            "bufferView": "bufferView_30",
-            "byteOffset": 0,
-            "count": 12636,
-            "type": 5123
         }
     },
     "animations": {},
     "asset": {
-        "extras": {
-            "premultipliedAlpha": true
-        },
-        "generator": "collada2gltf@8037062997389f5714154c03f692356ce78a30c0"
+        "generator": "collada2gltf@53bdd01c320c249c36ae9fbc439ae2cdee39acc8",
+        "premultipliedAlpha": true,
+        "profile": "WebGL 1.0.2",
+        "version": 0.6
     },
     "bufferViews": {
         "bufferView_29": {
             "buffer": "duck",
-            "byteLength": 76768,
+            "byteLength": 25272,
             "byteOffset": 0,
-            "target": 34962
+            "target": 34963
         },
         "bufferView_30": {
             "buffer": "duck",
-            "byteLength": 25272,
-            "byteOffset": 76768,
-            "target": 34963
+            "byteLength": 76768,
+            "byteOffset": 25272,
+            "target": 34962
         }
     },
     "buffers": {
@@ -96,7 +97,7 @@
         }
     },
     "images": {
-        "image_0": {
+        "file2": {
             "path": "duckCM.png"
         }
     },
@@ -123,7 +124,7 @@
                         0,
                         1
                     ],
-                    "diffuse": "texture_image_0",
+                    "diffuse": "texture_file2",
                     "emission": [
                         0,
                         0,
@@ -148,11 +149,11 @@
             "primitives": [
                 {
                     "attributes": {
-                        "NORMAL": "attribute_25",
-                        "POSITION": "attribute_23",
-                        "TEXCOORD_0": "attribute_27"
+                        "NORMAL": "accessor_25",
+                        "POSITION": "accessor_23",
+                        "TEXCOORD_0": "accessor_27"
                     },
-                    "indices": "indices_21",
+                    "indices": "accessor_21",
                     "material": "blinn3-fx",
                     "primitive": 4
                 }
@@ -232,7 +233,6 @@
             "name": "directionalLight1"
         }
     },
-    "profile": "WebGL 1.0.2",
     "programs": {
         "program_0": {
             "attributes": [
@@ -386,11 +386,11 @@
         }
     },
     "textures": {
-        "texture_image_0": {
+        "texture_file2": {
             "format": 6408,
             "internalFormat": 6408,
             "sampler": "sampler_0",
-            "source": "image_0",
+            "source": "file2",
             "target": 3553,
             "type": 5121
         }

diff --git a/model/rambler/Rambler.bin b/model/rambler/Rambler.bin