瀏覽代碼

Update the assets

Panagiotis Christopoulos Charitos 5 年之前
父節點
當前提交
2f9a7f7f67

+ 10 - 10
samples/skeletal_animation/assets/Armature.002.ankiskel

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <skeleton>
 	<bones>
-		<bone name="Body" boneTransform="0.000002 0.000002 -56.073284 0.000005 -0.000001 -56.073292 -0.000002 90.000008 -56.073284 0.000001 -0.000002 -0.000001 -0.000000 0.000000 0.000000 1.000000 " transform="0.000000 0.000000 -1.000000 -0.000000 -1.000000 0.000000 0.000000 0.000004 0.000000 1.000000 0.000000 -90.000000 0.000000 0.000000 0.000000 1.000000 " />
-		<bone name="ArmL1" parent="Body" boneTransform="-42.907284 -36.099560 -0.000039 11.763820 36.099545 -42.907280 0.000022 105.882103 -0.000046 -0.000005 56.073273 -0.000047 -0.000000 0.000000 -0.000000 1.000000 " transform="0.000001 -0.000000 -1.000000 0.000003 0.643793 0.765200 0.000000 1.405537 0.765200 -0.643793 0.000001 59.164440 0.000000 0.000000 0.000000 1.000000 " />
-		<bone name="ArmL2" parent="ArmL1" boneTransform="-42.954617 -36.043224 -0.000049 -40.920933 36.043217 -42.954617 0.000026 105.828461 -0.000055 -0.000008 56.073277 -0.000068 -0.000000 0.000000 -0.000000 1.000000 " transform="0.999999 0.001312 -0.000000 52.545837 -0.001312 0.999999 -0.000000 0.000058 0.000000 0.000000 1.000000 0.000007 0.000000 0.000000 0.000000 1.000000 " />
-		<bone name="PinceR" parent="ArmL2" boneTransform="-42.954617 -36.043228 -0.000044 -95.769775 36.043224 -42.954617 0.000004 113.350021 -0.000038 -0.000022 56.073277 -0.000057 -0.000000 0.000000 -0.000000 1.000000 " transform="1.000000 0.000000 -0.000000 54.848843 -0.000000 1.000000 0.000000 -7.521539 0.000000 -0.000000 1.000000 0.000041 0.000000 0.000000 0.000000 1.000000 " />
-		<bone name="Flap3" parent="Body" boneTransform="0.000003 -56.073292 -0.000004 63.074375 -56.073284 -0.000003 0.000149 -0.000100 -0.000147 0.000004 -56.073284 46.614838 -0.000000 0.000000 -0.000000 1.000000 " transform="0.000000 -0.000003 1.000000 -46.614834 1.000000 0.000000 0.000000 26.925636 0.000000 1.000000 0.000003 -0.000019 0.000000 0.000000 0.000000 1.000000 " />
-		<bone name="Flap2" parent="Body" boneTransform="0.000002 -56.073288 0.000000 63.074360 -28.036764 -0.000009 -48.560791 0.000149 48.560806 0.000005 -28.036776 -46.614853 -0.000000 0.000000 -0.000000 1.000000 " transform="-0.000000 0.866024 0.500002 23.307423 1.000000 0.000000 0.000000 26.925648 0.000000 0.500002 -0.866024 -40.369652 0.000000 0.000000 0.000000 1.000000 " />
-		<bone name="Flap1" parent="Body" boneTransform="0.000004 -56.073299 -0.000007 63.074379 48.560867 0.000001 28.036695 46.614834 -28.036684 -0.000008 48.560871 -0.000028 -0.000000 0.000000 -0.000000 1.000000 " transform="0.000000 -0.500001 -0.866025 23.307423 1.000000 0.000000 0.000000 26.925632 0.000000 -0.866025 0.500001 40.369621 0.000000 0.000000 0.000000 1.000000 " />
-		<bone name="ArmR1" parent="Body" boneTransform="42.907284 -36.099567 -0.000012 11.763834 36.099567 42.907288 0.000036 -105.882126 -0.000011 -0.000029 56.073303 0.000048 -0.000000 0.000000 -0.000000 1.000000 " transform="0.000000 -0.000001 -1.000000 -0.000004 0.643793 -0.765200 0.000001 1.405545 -0.765200 -0.643793 0.000000 -59.164429 0.000000 0.000000 0.000000 1.000000 " />
-		<bone name="ArmR2" parent="ArmR1" boneTransform="42.954636 -36.043209 -0.000009 -40.920975 36.043209 42.954643 0.000036 -105.828468 -0.000013 -0.000028 56.073292 0.000045 -0.000000 0.000000 -0.000000 1.000000 " transform="0.999999 -0.001313 -0.000000 52.545834 0.001313 0.999999 -0.000000 -0.000022 0.000000 0.000000 1.000000 0.000005 0.000000 0.000000 0.000000 1.000000 " />
-		<bone name="PinceL" parent="ArmR2" boneTransform="42.954632 -36.043217 0.000017 -95.769806 36.043221 42.954647 0.000009 -113.349960 -0.000017 0.000010 56.073303 0.000035 -0.000000 0.000000 -0.000000 1.000000 " transform="1.000000 0.000000 -0.000000 54.848843 -0.000000 1.000000 0.000000 7.521454 0.000000 -0.000000 1.000000 0.000002 0.000000 0.000000 0.000000 1.000000 " />
+		<bone name="Body" boneTransform="0.000002 0.000002 -56.073284 0.000001 -0.000001 -56.073292 -0.000002 212.322784 -56.073284 0.000001 -0.000002 -0.000003 -0.000000 0.000000 0.000000 1.000000 " transform="0.000000 0.000000 -1.000000 -0.000000 -1.000000 0.000000 0.000000 0.000004 0.000000 1.000000 0.000000 -90.000000 0.000000 0.000000 0.000000 1.000000 " />
+		<bone name="ArmL1" parent="Body" boneTransform="-42.907284 -36.099560 -0.000039 90.514297 36.099545 -42.907280 0.000022 199.483505 -0.000046 -0.000005 56.073273 -0.000035 -0.000000 0.000000 -0.000000 1.000000 " transform="0.000001 -0.000000 -1.000000 0.000003 0.643793 0.765200 0.000000 1.405537 0.765200 -0.643793 0.000001 59.164440 0.000000 0.000000 0.000000 1.000000 " />
+		<bone name="ArmL2" parent="ArmL1" boneTransform="-42.954617 -36.043224 -0.000049 37.706654 36.043217 -42.954617 0.000026 199.533112 -0.000055 -0.000008 56.073277 -0.000051 -0.000000 0.000000 -0.000000 1.000000 " transform="0.999999 0.001312 -0.000000 52.545837 -0.001312 0.999999 -0.000000 0.000058 0.000000 0.000000 1.000000 0.000007 0.000000 0.000000 0.000000 1.000000 " />
+		<bone name="PinceR" parent="ArmL2" boneTransform="-42.954617 -36.043228 -0.000044 -17.142176 36.043224 -42.954617 0.000004 207.054672 -0.000038 -0.000022 56.073277 -0.000010 -0.000000 0.000000 -0.000000 1.000000 " transform="1.000000 0.000000 -0.000000 54.848843 -0.000000 1.000000 0.000000 -7.521539 0.000000 -0.000000 1.000000 0.000041 0.000000 0.000000 0.000000 1.000000 " />
+		<bone name="Flap3" parent="Body" boneTransform="0.000003 -56.073292 -0.000004 185.397156 -56.073284 -0.000003 0.000149 -0.000093 -0.000147 0.000004 -56.073284 46.614826 -0.000000 0.000000 -0.000000 1.000000 " transform="0.000000 -0.000003 1.000000 -46.614834 1.000000 0.000000 0.000000 26.925636 0.000000 1.000000 0.000003 -0.000019 0.000000 0.000000 0.000000 1.000000 " />
+		<bone name="Flap2" parent="Body" boneTransform="0.000002 -56.073288 0.000000 185.397141 -28.036764 -0.000009 -48.560791 0.000167 48.560806 0.000005 -28.036776 -46.614864 -0.000000 0.000000 -0.000000 1.000000 " transform="-0.000000 0.866024 0.500002 23.307423 1.000000 0.000000 0.000000 26.925648 0.000000 0.500002 -0.866024 -40.369652 0.000000 0.000000 0.000000 1.000000 " />
+		<bone name="Flap1" parent="Body" boneTransform="0.000004 -56.073299 -0.000007 185.397186 48.560867 0.000001 28.036695 46.614834 -28.036684 -0.000008 48.560871 -0.000011 -0.000000 0.000000 -0.000000 1.000000 " transform="0.000000 -0.500001 -0.866025 23.307423 1.000000 0.000000 0.000000 26.925632 0.000000 -0.866025 0.500001 40.369621 0.000000 0.000000 0.000000 1.000000 " />
+		<bone name="ArmR1" parent="Body" boneTransform="42.907284 -36.099567 -0.000012 90.514320 36.099567 42.907288 0.000036 -199.483521 -0.000011 -0.000029 56.073303 0.000112 -0.000000 0.000000 -0.000000 1.000000 " transform="0.000000 -0.000001 -1.000000 -0.000004 0.643793 -0.765200 0.000001 1.405545 -0.765200 -0.643793 0.000000 -59.164429 0.000000 0.000000 0.000000 1.000000 " />
+		<bone name="ArmR2" parent="ArmR1" boneTransform="42.954636 -36.043209 -0.000009 37.706573 36.043209 42.954643 0.000036 -199.533203 -0.000013 -0.000028 56.073292 0.000106 -0.000000 0.000000 -0.000000 1.000000 " transform="0.999999 -0.001313 -0.000000 52.545834 0.001313 0.999999 -0.000000 -0.000022 0.000000 0.000000 1.000000 0.000005 0.000000 0.000000 0.000000 1.000000 " />
+		<bone name="PinceL" parent="ArmR2" boneTransform="42.954632 -36.043217 0.000017 -17.142239 36.043221 42.954647 0.000009 -207.054672 -0.000017 0.000010 56.073303 0.000013 -0.000000 0.000000 -0.000000 1.000000 " transform="1.000000 0.000000 -0.000000 54.848843 -0.000000 1.000000 0.000000 7.521454 0.000000 -0.000000 1.000000 0.000002 0.000000 0.000000 0.000000 1.000000 " />
 	</bones>
 </skeleton>

二進制
samples/skeletal_animation/assets/Mesh.ankimesh


+ 1 - 1
samples/skeletal_animation/assets/room.001_room_blue.ankimdl → samples/skeletal_animation/assets/room.001_room.red.ankimdl

@@ -2,7 +2,7 @@
 	<modelPatches>
 		<modelPatch>
 			<mesh>assets/room.001.ankimesh</mesh>
-			<material>assets/room_blue.ankimtl</material>
+			<material>assets/room.red.ankimtl</material>
 		</modelPatch>
 	</modelPatches>
 </model>

二進制
samples/skeletal_animation/assets/room.002.ankimesh


+ 1 - 1
samples/skeletal_animation/assets/room.002_room_green.ankimdl → samples/skeletal_animation/assets/room.002_room.green.ankimdl

@@ -2,7 +2,7 @@
 	<modelPatches>
 		<modelPatch>
 			<mesh>assets/room.002.ankimesh</mesh>
-			<material>assets/room_green.ankimtl</material>
+			<material>assets/room.green.ankimtl</material>
 		</modelPatch>
 	</modelPatches>
 </model>

二進制
samples/skeletal_animation/assets/room.003.ankimesh


+ 1 - 1
samples/skeletal_animation/assets/room.003_room_blue.ankimdl → samples/skeletal_animation/assets/room.003_room.blue.ankimdl

@@ -2,7 +2,7 @@
 	<modelPatches>
 		<modelPatch>
 			<mesh>assets/room.003.ankimesh</mesh>
-			<material>assets/room_blue.ankimtl</material>
+			<material>assets/room.blue.ankimtl</material>
 		</modelPatch>
 	</modelPatches>
 </model>

二進制
samples/skeletal_animation/assets/room.004.ankimesh


+ 0 - 8
samples/skeletal_animation/assets/room.004_room_green.ankimdl

@@ -1,8 +0,0 @@
-<model>
-	<modelPatches>
-		<modelPatch>
-			<mesh>assets/room.004.ankimesh</mesh>
-			<material>assets/room_green.ankimtl</material>
-		</modelPatch>
-	</modelPatches>
-</model>

二進制
samples/skeletal_animation/assets/room.005.ankimesh


+ 0 - 8
samples/skeletal_animation/assets/room.005_room_red.ankimdl

@@ -1,8 +0,0 @@
-<model>
-	<modelPatches>
-		<modelPatch>
-			<mesh>assets/room.005.ankimesh</mesh>
-			<material>assets/room_red.ankimtl</material>
-		</modelPatch>
-	</modelPatches>
-</model>

二進制
samples/skeletal_animation/assets/room.ankimesh


+ 1 - 1
samples/skeletal_animation/assets/room.ankimtl

@@ -14,7 +14,7 @@
 	<inputs>
 		
 
-		<input shaderVar="m_diffColor" value="1.000000 1.000000 1.000000"/>
+		<input shaderVar="m_diffColor" value="0.613641 0.750176 0.800000"/>
 		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
 		<input shaderVar="m_roughness" value="0.500000"/>
 		<input shaderVar="m_metallic" value="0.000000"/>

+ 0 - 0
samples/skeletal_animation/assets/room_blue.ankimtl → samples/skeletal_animation/assets/room.blue.ankimtl


+ 0 - 0
samples/skeletal_animation/assets/room_green.ankimtl → samples/skeletal_animation/assets/room.green.ankimtl


+ 1 - 1
samples/skeletal_animation/assets/room_red.ankimtl → samples/skeletal_animation/assets/room.red.ankimtl

@@ -14,7 +14,7 @@
 	<inputs>
 		
 
-		<input shaderVar="m_diffColor" value="1.000000 0.000859 0.000000"/>
+		<input shaderVar="m_diffColor" value="1.000000 0.000000 0.000000"/>
 		<input shaderVar="m_specColor" value="0.040000 0.040000 0.040000"/>
 		<input shaderVar="m_roughness" value="0.500000"/>
 		<input shaderVar="m_metallic" value="0.000000"/>

+ 9 - 27
samples/skeletal_animation/assets/scene.lua

@@ -4,7 +4,7 @@ local events = getEventManager()
 
 node = scene:newModelNode("droid.001", "assets/Mesh_Robot.001.ankimdl")
 trf = Transform.new()
-trf:setOrigin(Vec4.new(0.000000, 0.000000, 0.000000, 0))
+trf:setOrigin(Vec4.new(0.000000, 2.181480, 0.000000, 0))
 rot = Mat3x4.new()
 rot:setAll(1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)
 trf:setRotation(rot)
@@ -17,7 +17,7 @@ trf:setOrigin(Vec4.new(0.000000, 11.142166, 0.000000, 0))
 rot = Mat3x4.new()
 rot:setAll(1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000)
 trf:setRotation(rot)
-trf:setScale(11.360806)
+trf:setScale(9.000000)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
 
 node = scene:newPointLightNode("Lamp_Orientation")
@@ -38,54 +38,36 @@ scene:setActiveCameraNode(node:getSceneNodeBase())
 frustumc = node:getSceneNodeBase():getFrustumComponent()
 frustumc:setPerspective(0.100000, 100.000000, getMainRenderer():getAspectRatio() * 0.750416, 0.750416)
 trf = Transform.new()
-trf:setOrigin(Vec4.new(7.551111, 5.291440, -8.256753, 0))
+trf:setOrigin(Vec4.new(5.526846, 8.527484, -6.015655, 0))
 rot = Mat3x4.new()
 rot:setAll(-0.712312, -0.312519, 0.628445, 0.000000, 0.000000, 0.895396, 0.445271, 0.000000, -0.701863, 0.317172, -0.637801, 0.000000)
 trf:setRotation(rot)
 trf:setScale(1.000000)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
 
-node = scene:newModelNode("room.001", "assets/room.001_room_blue.ankimdl")
+node = scene:newModelNode("room.001", "assets/room.001_room.red.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(0.000000, 11.142166, 0.000000, 0))
 rot = Mat3x4.new()
 rot:setAll(1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000)
 trf:setRotation(rot)
-trf:setScale(11.360806)
+trf:setScale(9.000000)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
 
-node = scene:newModelNode("room.002", "assets/room.002_room_green.ankimdl")
+node = scene:newModelNode("room.002", "assets/room.002_room.green.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(0.000000, 11.142166, 0.000000, 0))
 rot = Mat3x4.new()
 rot:setAll(1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000)
 trf:setRotation(rot)
-trf:setScale(11.360806)
+trf:setScale(9.000000)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
 
-node = scene:newModelNode("room.003", "assets/room.003_room_blue.ankimdl")
+node = scene:newModelNode("room.003", "assets/room.003_room.blue.ankimdl")
 trf = Transform.new()
 trf:setOrigin(Vec4.new(0.000000, 11.142166, 0.000000, 0))
 rot = Mat3x4.new()
 rot:setAll(1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000)
 trf:setRotation(rot)
-trf:setScale(11.360806)
-node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-
-node = scene:newModelNode("room.004", "assets/room.004_room_green.ankimdl")
-trf = Transform.new()
-trf:setOrigin(Vec4.new(0.000000, 11.142166, 0.000000, 0))
-rot = Mat3x4.new()
-rot:setAll(1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000)
-trf:setRotation(rot)
-trf:setScale(11.360806)
-node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)
-
-node = scene:newModelNode("room.005", "assets/room.005_room_red.ankimdl")
-trf = Transform.new()
-trf:setOrigin(Vec4.new(0.000000, 11.142166, 0.000000, 0))
-rot = Mat3x4.new()
-rot:setAll(1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000)
-trf:setRotation(rot)
-trf:setScale(11.360806)
+trf:setScale(9.000000)
 node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)