dmuratshin 10 jaren geleden
bovenliggende
commit
31f7ff9b26
3 gewijzigde bestanden met toevoegingen van 5 en 9 verwijderingen
  1. 3 3
      .hg_archival.txt
  2. 1 5
      examples/Demo/data/xmls/res.xml
  3. 1 1
      oxygine/src/res/Resources.cpp

+ 3 - 3
.hg_archival.txt

@@ -1,6 +1,6 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: 7f0868edc42569894d9ed4d66efe234bbbdbdd5d
+node: 0a8403bb84ad5b1df02d5ac94e9047fa4680c748
 branch: default
 branch: default
 latesttag: oldrender
 latesttag: oldrender
-latesttagdistance: 923
-changessincelatesttag: 1075
+latesttagdistance: 924
+changessincelatesttag: 1076

+ 1 - 5
examples/Demo/data/xmls/res.xml

@@ -3,17 +3,13 @@
 	<font file="demo/font.fnt" />
 	<font file="demo/font.fnt" />
 	<set path = "./../images" />
 	<set path = "./../images" />
 
 
-	<set alpha="1" />
-
 	<atlas id = "primary" format="8888">
 	<atlas id = "primary" format="8888">
 		<image file="gray.png"/>
 		<image file="gray.png"/>
 		<image file="brush.png"/>
 		<image file="brush.png"/>
 		<image file="palette.png"/>		
 		<image file="palette.png"/>		
 		<image file="snow.png"/>
 		<image file="snow.png"/>
-
-		<set hit_test="true" />
+		
 		<image file="flower.png"/>
 		<image file="flower.png"/>
-		<set hit_test="false" />
 		
 		
 		<image id="anim" file="anim1.png" cols = "7" /> <!-- 'id' is optional -->
 		<image id="anim" file="anim1.png" cols = "7" /> <!-- 'id' is optional -->
 		<image file="batterfly.png"/>
 		<image file="batterfly.png"/>

+ 1 - 1
oxygine/src/res/Resources.cpp

@@ -251,7 +251,7 @@ namespace oxygine
         FS_LOG("loading xml resources");
         FS_LOG("loading xml resources");
 
 
         std::string xmlFolder = destHead;
         std::string xmlFolder = destHead;
-        XmlWalker walker(&xmlFolder, "", 1.0f, load_completely, false, resources, resources_meta);
+        XmlWalker walker(&xmlFolder, "", 1.0f, load_completely, true, resources, resources_meta);
 
 
         while (true)
         while (true)
         {
         {