Fix an error with defining the same image twice.

jterrace · Apr 2, 2011 · d13e5af · d13e5af
1 parent 131bad9
commit d13e5af
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 45 deletions.
diff --git a/StandardDataSets/1_5/xml/uri/_reference/_reference_directory/_reference_directory.dae b/StandardDataSets/1_5/xml/uri/_reference/_reference_directory/_reference_directory.dae
@@ -51,15 +51,10 @@ dereferenceXRefs=0;cameraXFov=0;cameraYFov=1</comments>
     <library_images>
         <image id="file1" name="file1">
             <init_from>
-<ref>./PASSIMAGE.png</ref>
-</init_from>
+		<ref>./PASSIMAGE.png</ref>
+	    </init_from>
         </image>
-    <image id="file1-surface">
-<init_from>
-<ref>./PASSIMAGE.png</ref>
-</init_from>
-</image>
-</library_images>
+    </library_images>
     <library_materials>
         <material id="lambert1" name="lambert1">
             <instance_effect url="#lambert1-fx"/>
@@ -71,7 +66,7 @@ dereferenceXRefs=0;cameraXFov=0;cameraYFov=1</comments>
 
                 <newparam sid="file1-sampler">
                     <sampler2D>
-                        <instance_image url="#file1-surface"/>
+                        <instance_image url="#file1"/>
                     </sampler2D>
                 </newparam>
                 <technique sid="common">

diff --git a/StandardDataSets/1_5/xml/uri/case/mixed_case/mixed_case.dae b/StandardDataSets/1_5/xml/uri/case/mixed_case/mixed_case.dae
@@ -51,15 +51,10 @@ dereferenceXRefs=0;cameraXFov=0;cameraYFov=1</comments>
     <library_images>
         <image id="file1" name="file1">
             <init_from>
-<ref>PASSIMAGE_mixed.PnG</ref>
-</init_from>
+		<ref>PASSIMAGE_mixed.PnG</ref>
+	    </init_from>
         </image>
-    <image id="file1-surface">
-<init_from>
-<ref>PASSIMAGE_mixed.PnG</ref>
-</init_from>
-</image>
-</library_images>
+    </library_images>
     <library_materials>
         <material id="lambert1" name="lambert1">
             <instance_effect url="#lambert1-fx"/>
@@ -71,7 +66,7 @@ dereferenceXRefs=0;cameraXFov=0;cameraYFov=1</comments>
 
                 <newparam sid="file1-sampler">
                     <sampler2D>
-                        <instance_image url="#file1-surface"/>
+                        <instance_image url="#file1"/>
                     </sampler2D>
                 </newparam>
                 <technique sid="common">

diff --git a/StandardDataSets/1_5/xml/uri/case/upper_case/upper_case.dae b/StandardDataSets/1_5/xml/uri/case/upper_case/upper_case.dae
@@ -51,15 +51,10 @@ dereferenceXRefs=0;cameraXFov=0;cameraYFov=1</comments>
     <library_images>
         <image id="file1" name="file1">
             <init_from>
-<ref>PASSIMAGE_UPPER.PNG</ref>
-</init_from>
+		<ref>PASSIMAGE_UPPER.PNG</ref>
+	    </init_from>
         </image>
-    <image id="file1-surface">
-<init_from>
-<ref>PASSIMAGE_UPPER.PNG</ref>
-</init_from>
-</image>
-</library_images>
+    </library_images>
     <library_materials>
         <material id="lambert1" name="lambert1">
             <instance_effect url="#lambert1-fx"/>
@@ -71,7 +66,7 @@ dereferenceXRefs=0;cameraXFov=0;cameraYFov=1</comments>
 
                 <newparam sid="file1-sampler">
                     <sampler2D>
-                        <instance_image url="#file1-surface"/>
+                        <instance_image url="#file1"/>
                     </sampler2D>
                 </newparam>
                 <technique sid="common">

diff --git a/StandardDataSets/1_5/xml/uri/directory/one_dot/one_dot.dae b/StandardDataSets/1_5/xml/uri/directory/one_dot/one_dot.dae
@@ -51,15 +51,10 @@ dereferenceXRefs=0;cameraXFov=0;cameraYFov=1</comments>
     <library_images>
         <image id="file1" name="file1">
             <init_from>
-<ref>./PASSIMAGE.png</ref>
-</init_from>
+		<ref>./PASSIMAGE.png</ref>
+	    </init_from>
         </image>
-    <image id="file1-surface">
-<init_from>
-<ref>./PASSIMAGE.png</ref>
-</init_from>
-</image>
-</library_images>
+    </library_images>
     <library_materials>
         <material id="lambert1" name="lambert1">
             <instance_effect url="./one_dot.dae#lambert1-fx"/>
@@ -71,7 +66,7 @@ dereferenceXRefs=0;cameraXFov=0;cameraYFov=1</comments>
 
                 <newparam sid="file1-sampler">
                     <sampler2D>
-                        <instance_image url="#file1-surface"/>
+                        <instance_image url="#file1"/>
                     </sampler2D>
                 </newparam>
                 <technique sid="common">

diff --git a/StandardDataSets/1_5/xml/uri/directory/two_dots/two_dots.dae b/StandardDataSets/1_5/xml/uri/directory/two_dots/two_dots.dae
@@ -51,15 +51,10 @@ dereferenceXRefs=0;cameraXFov=0;cameraYFov=1</comments>
     <library_images>
         <image id="file1" name="file1">
             <init_from>
-<ref>../two_dots/PASSIMAGE.png</ref>
-</init_from>
+		<ref>../two_dots/PASSIMAGE.png</ref>
+	    </init_from>
         </image>
-    <image id="file1-surface">
-<init_from>
-<ref>../two_dots/PASSIMAGE.png</ref>
-</init_from>
-</image>
-</library_images>
+    </library_images>
     <library_materials>
         <material id="lambert1" name="lambert1">
             <instance_effect url="../two_dots/two_dots.dae#lambert1-fx"/>
@@ -71,7 +66,7 @@ dereferenceXRefs=0;cameraXFov=0;cameraYFov=1</comments>
 
                 <newparam sid="file1-sampler">
                     <sampler2D>
-                        <instance_image url="#file1-surface"/>
+                        <instance_image url="#file1"/>
                     </sampler2D>
                 </newparam>
                 <technique sid="common">