diff --git a/data/Assets/Models/Vegetation/Tentacle.blend b/data/Assets/Models/Vegetation/Tentacle.blend index ef9697a..d82662f 100644 Binary files a/data/Assets/Models/Vegetation/Tentacle.blend and b/data/Assets/Models/Vegetation/Tentacle.blend differ diff --git a/data/Source/Entities/TestAnim/Samba/Stick/Stick-Animation.xdi b/data/Source/Entities/TestAnim/Samba/Stick/Stick-Animation.xdi new file mode 100644 index 0000000..5ddb5a1 --- /dev/null +++ b/data/Source/Entities/TestAnim/Samba/Stick/Stick-Animation.xdi @@ -0,0 +1,9 @@ + + + Models/TestAnim/Samba/Stick/Stick.fbx + {00000000-0000-0000-0000-000000000000} + + 0.1 + 0, 0, 0, 0 + false + diff --git a/data/Source/Entities/TestAnim/Samba/Stick/Stick-Animation.xdm b/data/Source/Entities/TestAnim/Samba/Stick/Stick-Animation.xdm new file mode 100644 index 0000000..672bd3f --- /dev/null +++ b/data/Source/Entities/TestAnim/Samba/Stick/Stick-Animation.xdm @@ -0,0 +1,6 @@ + + + {B696D312-871A-B447-940A-B4BEFD03ABD8} + traktor.animation.AnimationAsset + + diff --git a/data/Source/Entities/TestAnim/Samba/Stick/Stick-Skeleton.xdi b/data/Source/Entities/TestAnim/Samba/Stick/Stick-Skeleton.xdi new file mode 100644 index 0000000..a7e0c42 --- /dev/null +++ b/data/Source/Entities/TestAnim/Samba/Stick/Stick-Skeleton.xdi @@ -0,0 +1,9 @@ + + + Models/TestAnim/Samba/Stick/Stick.fbx + 0, 0, 0, 1 + 0.1 + 0.25 + false + false + diff --git a/data/Source/Entities/TestAnim/Samba/Stick/Stick-Skeleton.xdm b/data/Source/Entities/TestAnim/Samba/Stick/Stick-Skeleton.xdm new file mode 100644 index 0000000..45e8f77 --- /dev/null +++ b/data/Source/Entities/TestAnim/Samba/Stick/Stick-Skeleton.xdm @@ -0,0 +1,6 @@ + + + {4744793E-B03B-2A41-BEC7-2604F93442CB} + traktor.animation.SkeletonAsset + + diff --git a/data/Source/Entities/TestAnim/Samba/Stick/Stick-Visual.xdi b/data/Source/Entities/TestAnim/Samba/Stick/Stick-Visual.xdi new file mode 100644 index 0000000..717d8e3 --- /dev/null +++ b/data/Source/Entities/TestAnim/Samba/Stick/Stick-Visual.xdi @@ -0,0 +1,16 @@ + + + Models/TestAnim/Samba/Stick/Stick.fbx + + MtSkinned + + + 0.1 + 0, 0, 0, 0 + false +
false
+ false + true + 1 + 0 +
diff --git a/data/Source/Entities/TestAnim/Samba/Stick/Stick-Visual.xdm b/data/Source/Entities/TestAnim/Samba/Stick/Stick-Visual.xdm new file mode 100644 index 0000000..873a05a --- /dev/null +++ b/data/Source/Entities/TestAnim/Samba/Stick/Stick-Visual.xdm @@ -0,0 +1,6 @@ + + + {A158E4ED-92EB-CA45-9CD1-23F19D50A18A} + traktor.mesh.MeshAsset + + diff --git a/data/Source/Entities/TestAnim/Samba/Stick/Stick.xdi b/data/Source/Entities/TestAnim/Samba/Stick/Stick.xdi new file mode 100644 index 0000000..8bccfa4 --- /dev/null +++ b/data/Source/Entities/TestAnim/Samba/Stick/Stick.xdi @@ -0,0 +1,26 @@ + + + {FA4A37CC-AFDF-094A-BFC6-72414B62E844} + Stick + + true + false + false + + + 0, 0, 0, 0 + 0, 0, 0, 1 + + + + {4744793E-B03B-2A41-BEC7-2604F93442CB} + + {B696D312-871A-B447-940A-B4BEFD03ABD8} + + + + + {A158E4ED-92EB-CA45-9CD1-23F19D50A18A} + + + diff --git a/data/Source/Entities/TestAnim/Samba/Stick/Stick.xdm b/data/Source/Entities/TestAnim/Samba/Stick/Stick.xdm new file mode 100644 index 0000000..537dde3 --- /dev/null +++ b/data/Source/Entities/TestAnim/Samba/Stick/Stick.xdm @@ -0,0 +1,6 @@ + + + {17F6AADF-A383-5747-A023-B2D51FF38214} + traktor.world.EntityData + + diff --git a/data/Source/Scenes/Scene 04 - Ocean.xdi b/data/Source/Scenes/Scene 04 - Ocean.xdi index a112b48..e916c9e 100644 --- a/data/Source/Scenes/Scene 04 - Ocean.xdi +++ b/data/Source/Scenes/Scene 04 - Ocean.xdi @@ -4,7 +4,7 @@ 0.1 1000 Adaptive - 0 + 0.15 100 @@ -246,6 +246,33 @@ + + {5DB8F51C-F86D-6A43-A07B-A94B5BA5842E} + Fog + + true + false + false + + + 0, 0, 0, 0 + 0, 0, 0, 1 + + + + 10 + 0.0005 + 1 + 0.643137, 0.580392, 0.45098, 1 + false + 100 + 10 + 128 + 1, 1, 1, 1 + 0.2 + + + @@ -690,7 +717,7 @@ -403.460999, 7.525172, -6.609062, 0 - 0.019518, 0, -0.008783, 0.999771 + 0.019518, -0, -0.008783, 0.999771 {87D9EDC0-6119-45F7-9E7D-5B48295584BA} @@ -1050,7 +1077,7 @@ -51.964951, 27.173201, -154.05101, 0 - -0.004869, 0, -0.043821, 0.999028 + -0.004869, 0, -0.043821, 0.999027 {87D9EDC0-6119-45F7-9E7D-5B48295584BA} @@ -1065,7 +1092,7 @@ 113.661362, 18.295149, -253.705704, 0 - 0.040882, 0, 0.022388, 0.998913 + 0.040882, -0, 0.022388, 0.998913 {87D9EDC0-6119-45F7-9E7D-5B48295584BA} @@ -1320,7 +1347,7 @@ 308.960144, 16.979403, 86.292625, 0 - 0.050585, 0, -0.003891, 0.998712 + 0.050585, -0, -0.003891, 0.998712 {87D9EDC0-6119-45F7-9E7D-5B48295584BA} @@ -1485,7 +1512,7 @@ -177.432388, 18.28368, 202.593079, 0 - 0.001952, 0, 0.018545, 0.999826 + 0.001952, -0, 0.018545, 0.999826 {87D9EDC0-6119-45F7-9E7D-5B48295584BA} @@ -2292,7 +2319,7 @@ -70.091217, 63.811661, -98.396339, 0 - -0.028273, 0, 0.017553, 0.999446 + -0.028273, -0, 0.017553, 0.999446 {51841614-8E59-46D8-AA82-A111DA35060B} @@ -2622,7 +2649,7 @@ 245.478699, 16.967327, 332.511078, 0 - -0.000977, 0, -0.005859, 0.999982 + -0.000977, -0, -0.005859, 0.999982 {51841614-8E59-46D8-AA82-A111DA35060B} @@ -2712,7 +2739,7 @@ -72.291405, 31.263428, -148.215088, 0 - -0.14155, 0, -0.047182, 0.988806 + -0.14155, -0, -0.047182, 0.988806 {35427C92-3197-4641-A1F5-31248037416B} @@ -2832,7 +2859,7 @@ -313.943329, 7.493299, -208.108261, 0 - -0.005859, 0, -0.005859, 0.999966 + -0.005859, -0, -0.005859, 0.999966 {35427C92-3197-4641-A1F5-31248037416B} @@ -2952,7 +2979,7 @@ 99.146034, 63.282398, -58.309864, 0 - -0.014626, 0, -0.028281, 0.999493 + -0.014626, -0, -0.028281, 0.999493 {35427C92-3197-4641-A1F5-31248037416B} @@ -3177,7 +3204,7 @@ 43.63398, 9.561535, -380.769257, 0 - 0.007809, 0, 0.016593, 0.999832 + 0.007809, -0, 0.016593, 0.999832 {35427C92-3197-4641-A1F5-31248037416B} @@ -3627,7 +3654,7 @@ -116.946541, 7.789314, -341.73523, 0 - 0.038007, 0, -0.001949, 0.999276 + 0.038007, -0, -0.001949, 0.999276 {51841614-8E59-46D8-AA82-A111DA35060B} @@ -3762,7 +3789,7 @@ -152.016159, 27.096472, -74.770332, 0 - 0.092053, 0.02122, -0.127756, 0.987297 + 0.092053, 0.02122, -0.127756, 0.987296 {E0CFEA9A-FFAE-46A5-995B-5454D5DD4578} @@ -4137,7 +4164,7 @@ 347.522583, 8.705627, -203.137177, 0 - -0.019504, 0, -0.023405, 0.999536 + -0.019504, -0, -0.023405, 0.999536 {E0CFEA9A-FFAE-46A5-995B-5454D5DD4578} @@ -4392,7 +4419,7 @@ -101.488251, 16.922625, 307.529175, 0 - 0.095337, 0, 0.011556, 0.995378 + 0.095337, -0, 0.011556, 0.995378 {E0CFEA9A-FFAE-46A5-995B-5454D5DD4578} @@ -4407,7 +4434,7 @@ -210.529907, 17.998016, 219.646896, 0 - 0.016583, 0, 0.021461, 0.999632 + 0.016583, -0, 0.021461, 0.999632 {E0CFEA9A-FFAE-46A5-995B-5454D5DD4578} @@ -4556,7 +4583,7 @@ false - 101.993835, 64.327484, 115.043991, 0 + 101.993835, 63.118019, 115.043991, 0 0, 0.276356, 0, 0.961055 @@ -4707,7 +4734,7 @@ -51.594193, 63.487373, 85.752823, 0 - 0.016594, 0, 0.005857, 0.999845 + 0.016594, -0, 0.005857, 0.999845 {866684AB-577A-F845-8A2E-43BA2AD093C9} @@ -4991,7 +5018,7 @@ false - 227.471634, 23.263615, -138.716293, 0 + 227.259659, 14.201352, -141.076828, 0 0.029777, 0.744047, 0.026691, 0.66693 @@ -5067,7 +5094,7 @@ -117.056915, 63.060013, 14.361792, 0 - 0.002929, 0, 0.015619, 0.999874 + 0.002929, -0, 0.015619, 0.999874 {16B8A484-A930-47B6-8D32-164FA9A50A25} @@ -5097,7 +5124,7 @@ -118.965866, 60.448441, -74.496155, 0 - -0.263458, 0.933008, -0.244598, 0.0161 + -0.263458, 0.933007, -0.244598, 0.0161 {16B8A484-A930-47B6-8D32-164FA9A50A25} @@ -5457,7 +5484,7 @@ 273.599762, 18.253086, 59.533695, 0 - -0.007809, 0, -0.015622, 0.999848 + -0.007809, -0, -0.015622, 0.999847 {59E61CFC-CC27-49D7-8C03-04F88A120FEA} @@ -5472,7 +5499,7 @@ 171.540619, 47.616585, -14.890706, 0 - -0.138783, 0, -0.231122, 0.962975 + -0.138783, -0, -0.231122, 0.962975 {59E61CFC-CC27-49D7-8C03-04F88A120FEA} @@ -5547,7 +5574,7 @@ 141.55748, 23.070784, -135.526474, 0 - -0.048262, 0, -0.073358, 0.996137 + -0.048262, -0, -0.073358, 0.996137 {59E61CFC-CC27-49D7-8C03-04F88A120FEA} @@ -5577,7 +5604,7 @@ 23.458242, 63.219223, -123.358406, 0 - -0.135302, 0, -0.081746, 0.987427 + -0.135302, -0, -0.081746, 0.987426 {59E61CFC-CC27-49D7-8C03-04F88A120FEA} @@ -5652,7 +5679,7 @@ -81.377586, 33.812752, -142.926987, 0 - -0.12215, 0, -0.071966, 0.989899 + -0.12215, -0, -0.071966, 0.989899 {59E61CFC-CC27-49D7-8C03-04F88A120FEA} @@ -5937,7 +5964,7 @@ -9.098827, 59.800953, 140.934341, 0 - 0.03606, 0, -0.005848, 0.999333 + 0.03606, -0, -0.005848, 0.999332 {59E61CFC-CC27-49D7-8C03-04F88A120FEA} @@ -5982,7 +6009,7 @@ 165.173859, 18.314911, 258.103943, 0 - -0.028282, 0, 0.009753, 0.999552 + -0.028282, -0, 0.009753, 0.999552 {59E61CFC-CC27-49D7-8C03-04F88A120FEA} @@ -6567,7 +6594,7 @@ 344.751434, 20.594437, 189.000534, 0 - 0.047932, -0.872818, -0.087574, -0.477726 + -0.047932, 0.872818, 0.087574, 0.477726 {76095AB8-238E-144B-BAFD-F8C3B2CCC052} @@ -6765,7 +6792,7 @@ 278.359802, 23.103514, -96.018921, 0 - -0.003987, 0, -0.021746, 0.999755 + -0.003987, -0, -0.021746, 0.999755 {E4D4D79B-CA05-4D23-A09B-055ECDBB6E60} @@ -6780,7 +6807,7 @@ 130.667221, 39.680786, -275.964539, 0 - -0.116954, 0, -0.035255, 0.992511 + -0.116954, -0, -0.035255, 0.992511 {40BB4C27-FEFD-4E0E-9D2E-6D0FA3A21A25} @@ -6845,6 +6872,21 @@ {42763567-308E-8047-85B3-894EAF9885E8} + + {2A8E85C3-5810-904F-9BC0-9CF5728EEF8E} + Stick + + true + false + false + + + 20.520336, 25.208538, -291.777832, 0 + 0, -0.666869, 0, 0.745175 + + + {17F6AADF-A383-5747-A023-B2D51FF38214} +