Просмотр исходного кода

Add some assets in the physics playground

Panagiotis Christopoulos Charitos 7 лет назад
Родитель
Сommit
fa89e2da5a

BIN
samples/physics_playground/assets/Asphalt_004_COLOR.ankitex


BIN
samples/physics_playground/assets/Asphalt_004_DISP.ankitex


BIN
samples/physics_playground/assets/Asphalt_004_NRM.ankitex


BIN
samples/physics_playground/assets/Asphalt_004_ROUGH.ankitex


BIN
samples/physics_playground/assets/Stone_Wall_007_COLOR.ankitex


BIN
samples/physics_playground/assets/Stone_Wall_007_DISP.ankitex


BIN
samples/physics_playground/assets/Stone_Wall_007_NORM.ankitex


BIN
samples/physics_playground/assets/Stone_Wall_007_ROUGH.ankitex


BIN
samples/physics_playground/assets/floor.ankimesh


BIN
samples/physics_playground/assets/physics_playground.blend


+ 36 - 36
samples/physics_playground/assets/scene.lua

@@ -52,7 +52,7 @@ trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
 node = scene:newStaticCollisionNode("Suzannedynamic-materialnone2_cl", "assets/Suzanne.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone3", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone3", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(37.2714, 2.88619, 0, 0))
 rot = Mat3x4.new()
@@ -60,9 +60,9 @@ rot:setAll(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone3_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone3_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone4", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone4", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(37.2714, 2.88619, -6, 0))
 rot = Mat3x4.new()
@@ -70,9 +70,9 @@ rot:setAll(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone4_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone4_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone5", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone5", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(37.2714, 2.88619, 6, 0))
 rot = Mat3x4.new()
@@ -80,9 +80,9 @@ rot:setAll(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone5_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone5_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone6", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone6", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(37.2714, 2.88619, 12, 0))
 rot = Mat3x4.new()
@@ -90,9 +90,9 @@ rot:setAll(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone6_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone6_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone7", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone7", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(42.2714, 2.88619, 12, 0))
 rot = Mat3x4.new()
@@ -100,9 +100,9 @@ rot:setAll(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone7_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone7_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone8", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone8", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(42.2714, 2.88619, 6, 0))
 rot = Mat3x4.new()
@@ -110,9 +110,9 @@ rot:setAll(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone8_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone8_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone9", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone9", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(42.2714, 2.88619, -6, 0))
 rot = Mat3x4.new()
@@ -120,9 +120,9 @@ rot:setAll(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone9_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone9_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone10", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone10", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(42.2714, 2.88619, 0, 0))
 rot = Mat3x4.new()
@@ -130,9 +130,9 @@ rot:setAll(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone10_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone10_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone11", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone11", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(39.7985, 6.37661, 12, 0))
 rot = Mat3x4.new()
@@ -140,9 +140,9 @@ rot:setAll(7.54979e-08, 1, 0, 0, -1, 7.54979e-08, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone11_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone11_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone12", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone12", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(39.7985, 6.37661, 6, 0))
 rot = Mat3x4.new()
@@ -150,9 +150,9 @@ rot:setAll(7.54979e-08, 1, 0, 0, -1, 7.54979e-08, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone12_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone12_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone13", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone13", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(39.7985, 6.37661, -6, 0))
 rot = Mat3x4.new()
@@ -160,9 +160,9 @@ rot:setAll(7.54979e-08, 1, 0, 0, -1, 7.54979e-08, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone13_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone13_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone14", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone14", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(39.7985, 6.37661, 0, 0))
 rot = Mat3x4.new()
@@ -170,9 +170,9 @@ rot:setAll(7.54979e-08, 1, 0, 0, -1, 7.54979e-08, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone14_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone14_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone15", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone15", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(33.7985, 5.37661, -6, 0))
 rot = Mat3x4.new()
@@ -180,9 +180,9 @@ rot:setAll(7.54979e-08, 1, 0, 0, -1, 7.54979e-08, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone15_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone15_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone16", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone16", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(32.7985, 4.37661, -6, 0))
 rot = Mat3x4.new()
@@ -190,9 +190,9 @@ rot:setAll(7.54979e-08, 1, 0, 0, -1, 7.54979e-08, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone16_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone16_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone17", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone17", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(31.7985, 3.37661, -6, 0))
 rot = Mat3x4.new()
@@ -200,9 +200,9 @@ rot:setAll(7.54979e-08, 1, 0, 0, -1, 7.54979e-08, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone17_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone17_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone18", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone18", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(28.7985, 0.376611, -6, 0))
 rot = Mat3x4.new()
@@ -210,9 +210,9 @@ rot:setAll(7.54979e-08, 1, 0, 0, -1, 7.54979e-08, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone18_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone18_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone19", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone19", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(29.7985, 1.37661, -6, 0))
 rot = Mat3x4.new()
@@ -220,9 +220,9 @@ rot:setAll(7.54979e-08, 1, 0, 0, -1, 7.54979e-08, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone19_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone19_cl", "assets/wall.ankicl", trf)
 
-node = scene:newModelNode("wallwalls-materialnone20", "assets/wallwalls-material.ankimdl")
+node = scene:newModelNode("wallwalls_001-materialnone20", "assets/wallwalls_001-material.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(30.7985, 2.37661, -6, 0))
 rot = Mat3x4.new()
@@ -230,7 +230,7 @@ rot:setAll(7.54979e-08, 1, 0, 0, -1, 7.54979e-08, 0, 0, 0, 0, 1, 0)
 trf:setRotation(rot)
 trf:setScale(1)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-node = scene:newStaticCollisionNode("wallwalls-materialnone20_cl", "assets/wall.ankicl", trf)
+node = scene:newStaticCollisionNode("wallwalls_001-materialnone20_cl", "assets/wall.ankicl", trf)
 
 node = scene:newPointLightNode("Lamp")
 lcomp = node:getSceneNodeBase():getLightComponent()

BIN
samples/physics_playground/assets/wall.ankimesh


+ 10 - 9
samples/physics_playground/assets/walls-material.ankimtl

@@ -3,12 +3,12 @@
 <material shaderProgram="shaders/GBufferGeneric.glslp">
 	
 	<mutators>
-		<mutator name="DIFFUSE_TEX" value="0"/>
+		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
-		<mutator name="ROUGHNESS_TEX" value="0"/>
+		<mutator name="ROUGHNESS_TEX" value="1"/>
 		<mutator name="METAL_TEX" value="0"/>
-		<mutator name="NORMAL_TEX" value="0"/>
-		<mutator name="PARALLAX" value="0"/>
+		<mutator name="NORMAL_TEX" value="1"/>
+		<mutator name="PARALLAX" value="1"/>
 		<mutator name="EMISSIVE_TEX" value="0"/>
 	</mutators>
 	
@@ -16,15 +16,16 @@
 		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
 		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
 		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
-		
+		<input shaderInput="modelViewMat" builtin="MODEL_VIEW_MATRIX"/>
 	
-		<input shaderInput="diffColor" value="0.548460 0.640000 0.063144"/>
+		<input shaderInput="diffTex" value="assets/Asphalt_004_COLOR.ankitex"/>
 		<input shaderInput="specColor" value="0.400000 0.400000 0.400000"/>
-		<input shaderInput="roughness" value="1.000000" />
+		<input shaderInput="roughnessTex" value="assets/Asphalt_004_ROUGH.ankitex"/>
 		<input shaderInput="metallic" value="0.000000"/>
-		
+		<input shaderInput="normalTex" value="assets/Asphalt_004_NRM.ankitex"/>
 		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
 		<input shaderInput="subsurface" value="0.000000"/>
-		
+		<input shaderInput="heightTex" value="assets/Asphalt_004_DISP.ankitex"/>
+		<input shaderInput="heightMapScale" value="0.05"/>
 	</inputs>
 </material>

+ 30 - 0
samples/physics_playground/assets/walls_001-material.ankimtl

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- This file is auto generated by ExporterMaterial.cpp -->
+<material shaderProgram="shaders/GBufferGeneric.glslp">
+	
+	<mutators>
+		<mutator name="DIFFUSE_TEX" value="1"/>
+		<mutator name="SPECULAR_TEX" value="0"/>
+		<mutator name="ROUGHNESS_TEX" value="1"/>
+		<mutator name="METAL_TEX" value="0"/>
+		<mutator name="NORMAL_TEX" value="1"/>
+		<mutator name="PARALLAX" value="0"/>
+		<mutator name="EMISSIVE_TEX" value="0"/>
+	</mutators>
+	
+	<inputs>
+		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
+		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
+		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
+		
+	
+		<input shaderInput="diffTex" value="assets/Stone_Wall_007_COLOR.ankitex"/>
+		<input shaderInput="specColor" value="0.400000 0.400000 0.400000"/>
+		<input shaderInput="roughnessTex" value="assets/Stone_Wall_007_ROUGH.ankitex"/>
+		<input shaderInput="metallic" value="0.000000"/>
+		<input shaderInput="normalTex" value="assets/Stone_Wall_007_NORM.ankitex"/>
+		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderInput="subsurface" value="0.000000"/>
+		
+	</inputs>
+</material>

+ 9 - 0
samples/physics_playground/assets/wallwalls_001-material.ankimdl

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<model>
+	<modelPatches>
+		<modelPatch>
+			<mesh>assets/wall.ankimesh</mesh>
+			<material>assets/walls_001-material.ankimtl</material>
+		</modelPatch>
+	</modelPatches>
+</model>