Merge pull request #14642 from donmccurdy/examples-keyframes-glb-v2

Examples: Merge animation "keyframes" and "scene" examples.
mrdoob · Aug 7, 2018 · 6201c9a · 6201c9a
2 parents f29976f + 94693c9
commit 6201c9a
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 6,517 deletions.
diff --git a/examples/files.js b/examples/files.js
@@ -1,8 +1,7 @@
 var files = {
 	"webgl": [
 		"webgl_animation_cloth",
-		"webgl_animation_keyframes_json",
-		"webgl_animation_scene",
+		"webgl_animation_keyframes",
 		"webgl_animation_skinning_blending",
 		"webgl_animation_skinning_morph",
 		"webgl_camera",

diff --git a/examples/models/gltf/LittlestTokyo.glb b/examples/models/gltf/LittlestTokyo.glb
diff --git a/examples/models/json/pump/pump.json b/examples/models/json/pump/pump.json
diff --git a/examples/models/json/pump/pump_body.jpg b/examples/models/json/pump/pump_body.jpg
diff --git a/examples/models/json/pump/pump_gears.jpg b/examples/models/json/pump/pump_gears.jpg
diff --git a/examples/models/json/pump/pump_metalreflect.jpg b/examples/models/json/pump/pump_metalreflect.jpg