Updated test models paths

javagl · Jan 13, 2017 · 9c9d18e · 9c9d18e
1 parent 829d8c5
commit 9c9d18e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/jgltf-browser/src/main/resources/sampleModels.config b/jgltf-browser/src/main/resources/sampleModels.config
@@ -274,96 +274,96 @@
       } ]
     } ]
   }, {
-    "label" : "Tutorial Samples",
+    "label" : "Test models, v1.1",
     "children" : [ {
       "label" : "TriangleWithoutIndices",
       "children" : [ {
         "label" : "glTF",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/TriangleWithoutIndices/glTF/TriangleWithoutIndices.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/TriangleWithoutIndices/glTF/TriangleWithoutIndices.gltf"
       }, {
         "label" : "glTF-Embedded",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/TriangleWithoutIndices/glTF-Embedded/TriangleWithoutIndices.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/TriangleWithoutIndices/glTF-Embedded/TriangleWithoutIndices.gltf"
       } ]
     }, {
       "label" : "Triangle",
       "children" : [ {
         "label" : "glTF",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/Triangle/glTF/Triangle.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/Triangle/glTF/Triangle.gltf"
       }, {
         "label" : "glTF-Embedded",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/Triangle/glTF-Embedded/Triangle.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/Triangle/glTF-Embedded/Triangle.gltf"
       } ]
     }, {
       "label" : "AnimatedTriangle",
       "children" : [ {
         "label" : "glTF",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/AnimatedTriangle/glTF/AnimatedTriangle.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/AnimatedTriangle/glTF/AnimatedTriangle.gltf"
       }, {
         "label" : "glTF-Embedded",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/AnimatedTriangle/glTF-Embedded/AnimatedTriangle.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/AnimatedTriangle/glTF-Embedded/AnimatedTriangle.gltf"
       } ]
     }, {
       "label" : "SimpleMaterial",
       "children" : [ {
         "label" : "glTF",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/SimpleMaterial/glTF/SimpleMaterial.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/SimpleMaterial/glTF/SimpleMaterial.gltf"
       }, {
         "label" : "glTF-Embedded-buffer",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/SimpleMaterial/glTF-Embedded-buffer/SimpleMaterial.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/SimpleMaterial/glTF-Embedded-buffer/SimpleMaterial.gltf"
       } ]
     }, {
       "label" : "SimpleMeshes",
       "children" : [ {
         "label" : "glTF",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/SimpleMeshes/glTF/SimpleMeshes.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/SimpleMeshes/glTF/SimpleMeshes.gltf"
       }, {
         "label" : "glTF-Embedded",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/SimpleMeshes/glTF-Embedded/SimpleMeshes.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/SimpleMeshes/glTF-Embedded/SimpleMeshes.gltf"
       } ]
     }, {
       "label" : "AdvancedMaterial",
       "children" : [ {
         "label" : "glTF",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/AdvancedMaterial/glTF/AdvancedMaterial.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/AdvancedMaterial/glTF/AdvancedMaterial.gltf"
       }, {
         "label" : "glTF-Embedded-buffer",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/AdvancedMaterial/glTF-Embedded-buffer/AdvancedMaterial.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/AdvancedMaterial/glTF-Embedded-buffer/AdvancedMaterial.gltf"
       } ]
     }, {
       "label" : "SimpleOpacity",
       "children" : [ {
         "label" : "glTF",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/SimpleOpacity/glTF/SimpleOpacity.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/SimpleOpacity/glTF/SimpleOpacity.gltf"
       }, {
         "label" : "glTF-Embedded-buffer",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/SimpleOpacity/glTF-Embedded-buffer/SimpleOpacity.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/SimpleOpacity/glTF-Embedded-buffer/SimpleOpacity.gltf"
       } ]
     }, {
       "label" : "SimpleTexture",
       "children" : [ {
         "label" : "glTF",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/SimpleTexture/glTF/SimpleTexture.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/SimpleTexture/glTF/SimpleTexture.gltf"
       }, {
         "label" : "glTF-Embedded-buffer",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/SimpleTexture/glTF-Embedded-buffer/SimpleTexture.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/SimpleTexture/glTF-Embedded-buffer/SimpleTexture.gltf"
       } ]
     }, {
       "label" : "Cameras",
       "children" : [ {
         "label" : "glTF",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/Cameras/glTF/Cameras.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/Cameras/glTF/Cameras.gltf"
       }, {
         "label" : "glTF-Embedded",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/Cameras/glTF-Embedded/Cameras.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/Cameras/glTF-Embedded/Cameras.gltf"
       } ]
     }, {
       "label" : "SimpleSkin",
       "children" : [ {
         "label" : "glTF",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/SimpleSkin/glTF/SimpleSkin.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/SimpleSkin/glTF/SimpleSkin.gltf"
       }, {
         "label" : "glTF-Embedded-buffers",
-        "command" : "https://raw.githubusercontent.com/javagl/gltfTutorialModels/master/SimpleSkin/glTF-Embedded-buffers/SimpleSkin.gltf"
+        "command" : "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/master/1.1/SimpleSkin/glTF-Embedded-buffers/SimpleSkin.gltf"
       } ]
     } ]
   } ]

diff --git a/jgltf-validator/src/test/java/de/javagl/jgltf/validator/ValidateAll.java b/jgltf-validator/src/test/java/de/javagl/jgltf/validator/ValidateAll.java
@@ -57,8 +57,8 @@ private static ValidatorResult validate(String uriString) throws Exception
 
     private static List<String> getTutorialSampleModelsUriStrings()
     {
-        String path = "https://raw.githubusercontent.com/javagl/" + 
-            "gltfTutorialModels/master/";
+        String path = "https://raw.githubusercontent.com/KhronosGroup/" + 
+            "glTF-Sample-Models/master/1.1/";
 
         List<String> tutorialSampleModelUriStrings = Arrays.asList(
             path + "TriangleWithoutIndices/glTF/TriangleWithoutIndices.gltf",
@@ -90,6 +90,7 @@ private static List<String> getKhronosSampleModelsUriStrings()
     {
         String path = "https://raw.githubusercontent.com/KhronosGroup/" + 
             "glTF-Sample-Models/master/1.0/";
+
         List<String> khronosSampleModelUriStrings = Arrays.asList(
             path + "2CylinderEngine/glTF/2CylinderEngine.gltf",
             path + "2CylinderEngine/glTF-Embedded/2CylinderEngine.gltf",