Merge branch 'master' of github.com:Faerbit/swp

This commit is contained in:
Steffen Fündgens 2015-01-23 16:04:13 +01:00
commit 9765f03d88
9 changed files with 1478 additions and 11929 deletions

File diff suppressed because it is too large Load Diff

View File

@ -83,6 +83,9 @@
<xOffset>0.0</xOffset>
<yOffset>1.0</yOffset>
<zOffset>0.0</zOffset>
<xRot>0.0</xRot>
<yRot>0.0</yRot>
<zRot>0.0</zRot>
<rColour>1.0</rColour>
<gColour>1.0</gColour>
<bColour>1.0</bColour>
@ -229,13 +232,13 @@
<typeID>180</typeID>
<ignoreHeightmap>true</ignoreHeightmap>
<object>
<modelPath>SimpleWall.obj</modelPath>
<modelPath>simpleWall.obj</modelPath>
<xOffset>0.0</xOffset>
<yOffset>25.0</yOffset>
<zOffset>0.0</zOffset>
<xRot>0.0</xRot>
<yRot>0.0</yRot>
<zRot>0.0</zRot>
<xOffset>0.0</xOffset>
<yOffset>40.0</yOffset>
<zOffset>0.0</zOffset>
<scale>1.5</scale>
<mass>0.0</mass>
</object>
@ -247,14 +250,14 @@
<ignoreHeightmap>false</ignoreHeightmap>
<object>
<modelPath>block.obj</modelPath>
<xOffset>0.0</xOffset>
<yOffset>20.0</yOffset>
<xOffset>0.0</xOffset>
<yOffset>5.0</yOffset>
<zOffset>0.0</zOffset>
<xRot>0.0</xRot>
<yRot>0.0</yRot>
<zRot>0.0</zRot>
<scale>1.5</scale>
<mass>2.0</mass>
<mass>1.0</mass>
</object>
</composition>
@ -338,3 +341,15 @@
<dampningL>0.555</dampningL>
<dampningA>0.5</dampningA>
</objectData>
<objectData>
<modelPath>simpleWall.obj</modelPath>
<texturePath>simpleWallTexture.png</texturePath>
<ambientFactor>0.1</ambientFactor>
<diffuseFactor>0.6</diffuseFactor>
<specularFactor>0.4</specularFactor>
<shininess>2.0</shininess>
<physicType>TriangleMesh</physicType>
<dampningL>0.555</dampningL>
<dampningA>0.5</dampningA>
</objectData>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 815 B

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

Before

Width:  |  Height:  |  Size: 3.5 MiB

After

Width:  |  Height:  |  Size: 3.5 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.