From 7115f60b91b5717d90f643fd692010905c7004db Mon Sep 17 00:00:00 2001
From: Bryan Galdrikian <bgaldrikian@nvidia.com>
Date: Thu, 31 May 2018 11:36:08 -0700
Subject: Blast 1.1.3.  See docs/release_notes.txt.

---
 samples/resources/configs/assets.xml    | 216 ++++++++++++++++----------------
 samples/resources/configs/resources.xml |  10 +-
 2 files changed, 113 insertions(+), 113 deletions(-)
 mode change 100644 => 100755 samples/resources/configs/assets.xml
 mode change 100644 => 100755 samples/resources/configs/resources.xml

(limited to 'samples/resources/configs')

diff --git a/samples/resources/configs/assets.xml b/samples/resources/configs/assets.xml
old mode 100644
new mode 100755
index d2e2291..d8f8187
--- a/samples/resources/configs/assets.xml
+++ b/samples/resources/configs/assets.xml
@@ -1,109 +1,109 @@
-<!--<Model file="blast" name="Blast" position="0 5 0"/>-->
-<Model file="wall" name="Model Wall (Simple)" position="0 11.5 0" rotation="1 0 0 -90"/>
-<Model file="wall" name="Model Wall (Skinned)" position="0 11.5 0" rotation="1 0 0 -90" isSkinned = "true"/>
-<Model file="hugeAsset" name="Tower - 38k chunks (Skinned)" position="0 0 0" rotation="1 0 0 0" isSkinned = "true"/>
-<Model file="towerSubsupport1" name="Tower subsupport-1 level (Simple)" position="0 0 0" rotation="1 0 0 0" isSkinned = "false"/>
-<Model file="towerSubsupport1" name="Tower subsupport-1 level (Skinned)" position="0 0 0" rotation="1 0 0 0" isSkinned = "true"/>
-<Model file="towerSubsupport2" name="Tower subsupport-2 level (Skinned)" position="0 0 0" rotation="1 0 0 0" isSkinned = "true"/>
-<Model file="towerSupport" name="Tower - only support (Skinned)" position="0 0 0" rotation="1 0 0 0" isSkinned = "true"/>
-<Model file="vase" name="Vase (Skinned)" position="0 1 0" rotation="1 0 0 0" isSkinned = "true"/>
-<Model file="table" name="Table" position="0 0.38 0" rotation="1 0 0 0"/>
-<Model file="bunny" name="Bunny (Simple)"/>
-<Model file="bunny" name="Bunny (Skinned)" isSkinned = "true"/>
-<Model file="bunnySubsupport" name="Bunny Subsupport (Simple)"/>
-<Model file="bunnySubsupport" name="Bunny Subsupport (Skinned)" isSkinned = "true"/>
-<Model file="bunnySupportOn2Level" name="Bunny Support on 2nd depth (Simple)"/>
-<Model file="bunnySupportOn2Level" name="Bunny Support on 2nd depth (Skinned)" isSkinned = "true"/>
-<Model id="blockwall" file="blockwall" name="Block Wall" position="0 7 0" isSkinned = "false"/>
-
-<Composite name="Block Walls (composite)" position="0 0 0">
-  <AssetRef id="blockwall" position="0 7 0" rotation="1 0 0 0" />
-  <AssetRef id="blockwall" position="0 21 0" rotation="1 0 0 0" />
-  <Joint asset0="0" asset1="1" chunk0="81" chunk1="70" position0="-11 7 0" position1="-11 -7 0" />
-  <Joint asset0="0" asset1="1" chunk0="46" chunk1="13" position0="0 7 0" position1="0 -7 0" />
-  <Joint asset0="0" asset1="1" chunk0="39" chunk1="4" position0="11 7 0" position1="11 -7 0" />
-</Composite> 
-
-<Composite name="Lego (composite)" position="0 0 0">
-	<AssetRef id="blockwall" position="-5 7 -5" />
-	<AssetRef id="blockwall" position="5 7 5" />
-	<AssetRef id="column" position="0 15 0" rotation="1 0 0 -90" />
-	<AssetRef id="column" position="0 27 0" />
-</Composite> 
-
-<Composite name="NRF Joints (composite)" position="0 0 0">
-	<AssetRef id="column support 1" position="15 10 0" />
-	<AssetRef id="column support 1" position="-15 10 0" />
-  	<Joint asset0="0" asset1="-1" chunk0="3" chunk1="0" position0="0 0 0" position1="15 30 0" />
-  	<Joint asset0="1" asset1="-1" chunk0="5" chunk1="0" position0="0 8 0" position1="-15 38 0" />
-</Composite>
-
-<!-- 
-	<Box> bondFlagsMask:
-		X_BONDS             = 1 << 0,
-		Y_BONDS             = 1 << 1,
-		Z_BONDS             = 1 << 2,
-		X_PLUS_WORLD_BONDS  = 1 << 3,
-		X_MINUS_WORLD_BONDS = 1 << 4,
-		Y_PLUS_WORLD_BONDS  = 1 << 5,
-		Y_MINUS_WORLD_BONDS = 1 << 6,
-		Z_PLUS_WORLD_BONDS  = 1 << 7,
-		Z_MINUS_WORLD_BONDS = 1 << 8,	
-	default: 000000111 (X_BONDS | Y_BONDS | Z_BONDS)
--->
-
-<Box name="Wall (3 depth, 625 nodes)" extents="20 20 2" bondFlagsMask="1000111">
-	<Level slices="1 1 1"  />
-	<Level slices="5 5 1"  />
-	<Level slices="5 5 1" isSupport="true" />
-</Box> 
-
-<Box name="Wall (2 depth, 625 nodes, no root chunk)" extents="20 20 2" bondFlagsMask="1000111">
-	<Level slices="5 5 1"  />
-	<Level slices="5 5 1" isSupport="true" />
-</Box> 
-
-<Box name="Static Frame" extents="20 20 2" bondFlagsMask="1111111">
-	<Level slices="1 1 1"  />
-	<Level slices="5 5 1"  />
-	<Level slices="5 5 1" isSupport="true" />
-</Box> 
-
-<Box name="Poor Man's Cloth" extents="20 20 0.2" jointAllBonds = "true" >
-	<Level slices="1 1 1"  />
-	<Level slices="20 20 1" isSupport="true"  />
-	<Level slices="2 2 1"  />
-</Box> 
-
-<Box name="Cube (4 depth, 1728 nodes)" extents="20 20 20">
-	<Level slices="1 1 1"  />
-	<Level slices="2 2 2"  />
-	<Level slices="2 2 2"  />	
-	<Level slices="3 3 3" isSupport="true" />
-</Box> 
-
-<Box id="column" name="Column (3 depth, 50 nodes)" extents="2 20 2">
-	<Level slices="1 1 1"  />
-	<Level slices="1 5 1"  />
-	<Level slices="1 10 1"  isSupport="true"/>	
-</Box>
-
-<Box id="column support 1" name="Column (3 depth, 50 nodes, support depth = 1)" extents="2 20 2">
-  <Level slices="1 1 1"  />
-  <Level slices="1 5 1"  isSupport="true" />
-  <Level slices="1 10 1" />
-</Box>
-
-<Box name="Cube of Layers (3 depth, 1250 nodes)" extents="20 20 20">
-	<Level slices="1 1 1"  />
-	<Level slices="1 1 10"  />
-	<Level slices="5 5 5"  isSupport="true"/>	
-</Box> 
-
-<Box name="Brittle Wall" extents="40 20 1" bondFlagsMask="1000111">
-	<Level slices="1 1 1"  />
-	<Level slices="2 2 1"  />
-	<Level slices="2 2 1"  isSupport="true"/>	
-	<Level slices="2 2 2"  />
-	<Level slices="2 2 2"  />
+<!--<Model file="blast" name="Blast" position="0 5 0"/>-->
+<Model file="wall" name="Model Wall (Simple)" position="0 11.5 0" rotation="1 0 0 -90"/>
+<Model file="wall" name="Model Wall (Skinned)" position="0 11.5 0" rotation="1 0 0 -90" isSkinned = "true"/>
+<Model file="hugeAsset" name="Tower - 38k chunks (Skinned)" position="0 0 0" rotation="1 0 0 0" isSkinned = "true"/>
+<Model file="towerSubsupport1" name="Tower subsupport-1 level (Simple)" position="0 0 0" rotation="1 0 0 0" isSkinned = "false"/>
+<Model file="towerSubsupport1" name="Tower subsupport-1 level (Skinned)" position="0 0 0" rotation="1 0 0 0" isSkinned = "true"/>
+<Model file="towerSubsupport2" name="Tower subsupport-2 level (Skinned)" position="0 0 0" rotation="1 0 0 0" isSkinned = "true"/>
+<Model file="towerSupport" name="Tower - only support (Skinned)" position="0 0 0" rotation="1 0 0 0" isSkinned = "true"/>
+<Model file="vase" name="Vase (Skinned)" position="0 1 0" rotation="1 0 0 0" isSkinned = "true"/>
+<Model file="table" name="Table" position="0 0.38 0" rotation="1 0 0 0"/>
+<Model file="bunny" name="Bunny (Simple)"/>
+<Model file="bunny" name="Bunny (Skinned)" isSkinned = "true"/>
+<Model file="bunnySubsupport" name="Bunny Subsupport (Simple)"/>
+<Model file="bunnySubsupport" name="Bunny Subsupport (Skinned)" isSkinned = "true"/>
+<Model file="bunnySupportOn2Level" name="Bunny Support on 2nd depth (Simple)"/>
+<Model file="bunnySupportOn2Level" name="Bunny Support on 2nd depth (Skinned)" isSkinned = "true"/>
+<Model id="blockwall" file="blockwall" name="Block Wall" position="0 7 0" isSkinned = "false"/>
+
+<Composite name="Block Walls (composite)" position="0 0 0">
+  <AssetRef id="blockwall" position="0 7 0" rotation="1 0 0 0" />
+  <AssetRef id="blockwall" position="0 21 0" rotation="1 0 0 0" />
+  <Joint asset0="0" asset1="1" chunk0="81" chunk1="70" position0="-11 7 0" position1="-11 -7 0" />
+  <Joint asset0="0" asset1="1" chunk0="46" chunk1="13" position0="0 7 0" position1="0 -7 0" />
+  <Joint asset0="0" asset1="1" chunk0="39" chunk1="4" position0="11 7 0" position1="11 -7 0" />
+</Composite> 
+
+<Composite name="Lego (composite)" position="0 0 0">
+	<AssetRef id="blockwall" position="-5 7 -5" />
+	<AssetRef id="blockwall" position="5 7 5" />
+	<AssetRef id="column" position="0 15 0" rotation="1 0 0 -90" />
+	<AssetRef id="column" position="0 27 0" />
+</Composite> 
+
+<Composite name="NRF Joints (composite)" position="0 0 0">
+	<AssetRef id="column support 1" position="15 10 0" />
+	<AssetRef id="column support 1" position="-15 10 0" />
+  	<Joint asset0="0" asset1="-1" chunk0="3" chunk1="0" position0="0 0 0" position1="15 30 0" />
+  	<Joint asset0="1" asset1="-1" chunk0="5" chunk1="0" position0="0 8 0" position1="-15 38 0" />
+</Composite>
+
+<!-- 
+	<Box> bondFlagsMask:
+		X_BONDS             = 1 << 0,
+		Y_BONDS             = 1 << 1,
+		Z_BONDS             = 1 << 2,
+		X_PLUS_WORLD_BONDS  = 1 << 3,
+		X_MINUS_WORLD_BONDS = 1 << 4,
+		Y_PLUS_WORLD_BONDS  = 1 << 5,
+		Y_MINUS_WORLD_BONDS = 1 << 6,
+		Z_PLUS_WORLD_BONDS  = 1 << 7,
+		Z_MINUS_WORLD_BONDS = 1 << 8,	
+	default: 000000111 (X_BONDS | Y_BONDS | Z_BONDS)
+-->
+
+<Box name="Wall (3 depth, 625 nodes)" extents="20 20 2" bondFlagsMask="1000111">
+	<Level slices="1 1 1"  />
+	<Level slices="5 5 1"  />
+	<Level slices="5 5 1" isSupport="true" />
+</Box> 
+
+<Box name="Wall (2 depth, 625 nodes, no root chunk)" extents="20 20 2" bondFlagsMask="1000111">
+	<Level slices="5 5 1"  />
+	<Level slices="5 5 1" isSupport="true" />
+</Box> 
+
+<Box name="Static Frame" extents="20 20 2" bondFlagsMask="1111111">
+	<Level slices="1 1 1"  />
+	<Level slices="5 5 1"  />
+	<Level slices="5 5 1" isSupport="true" />
+</Box> 
+
+<Box name="Poor Man's Cloth" extents="20 20 0.2" jointAllBonds = "true" >
+	<Level slices="1 1 1"  />
+	<Level slices="20 20 1" isSupport="true"  />
+	<Level slices="2 2 1"  />
+</Box> 
+
+<Box name="Cube (4 depth, 1728 nodes)" extents="20 20 20">
+	<Level slices="1 1 1"  />
+	<Level slices="2 2 2"  />
+	<Level slices="2 2 2"  />	
+	<Level slices="3 3 3" isSupport="true" />
+</Box> 
+
+<Box id="column" name="Column (3 depth, 50 nodes)" extents="2 20 2">
+	<Level slices="1 1 1"  />
+	<Level slices="1 5 1"  />
+	<Level slices="1 10 1"  isSupport="true"/>	
+</Box>
+
+<Box id="column support 1" name="Column (3 depth, 50 nodes, support depth = 1)" extents="2 20 2">
+  <Level slices="1 1 1"  />
+  <Level slices="1 5 1"  isSupport="true" />
+  <Level slices="1 10 1" />
+</Box>
+
+<Box name="Cube of Layers (3 depth, 1250 nodes)" extents="20 20 20">
+	<Level slices="1 1 1"  />
+	<Level slices="1 1 10"  />
+	<Level slices="5 5 5"  isSupport="true"/>	
+</Box> 
+
+<Box name="Brittle Wall" extents="40 20 1" bondFlagsMask="1000111">
+	<Level slices="1 1 1"  />
+	<Level slices="2 2 1"  />
+	<Level slices="2 2 1"  isSupport="true"/>	
+	<Level slices="2 2 2"  />
+	<Level slices="2 2 2"  />
 </Box> 
\ No newline at end of file
diff --git a/samples/resources/configs/resources.xml b/samples/resources/configs/resources.xml
old mode 100644
new mode 100755
index 2d9eaad..50482db
--- a/samples/resources/configs/resources.xml
+++ b/samples/resources/configs/resources.xml
@@ -1,5 +1,5 @@
-<project toolsVersion="3.5">
-	<platform name="win">
-		<dependency name="BlastSampleResources" version="22532953"/>
-	</platform>
-</project>
+<project toolsVersion="5.2">
+	<dependency name="BlastSampleResources" linkPath="../BlastSampleResources">
+		<package name="BlastSampleResources" version="22532953"/>
+	</dependency>
+</project>
-- 
cgit v1.2.3