diff --git a/blender/tbody.blend b/blender/tbody.blend index e5aeb4f..ed8510d 100644 Binary files a/blender/tbody.blend and b/blender/tbody.blend differ diff --git a/blender/tcannon.mtl b/blender/tcannon.mtl new file mode 100644 index 0000000..798ce21 --- /dev/null +++ b/blender/tcannon.mtl @@ -0,0 +1,10 @@ +# Blender MTL File: 'tbody.blend' +# Material Count: 1 + +newmtl None +Ns 0 +Ka 0.000000 0.000000 0.000000 +Kd 0.8 0.8 0.8 +Ks 0.8 0.8 0.8 +d 1 +illum 2 diff --git a/blender/tcannon.obj b/blender/tcannon.obj new file mode 100644 index 0000000..5ff52d1 --- /dev/null +++ b/blender/tcannon.obj @@ -0,0 +1,138 @@ +# Blender v2.78 (sub 0) OBJ File: 'tbody.blend' +# www.blender.org +mtllib tcannon.mtl +o Cylinder.001 +v -0.000000 0.000000 0.100000 +v -2.517020 0.005956 0.110753 +v 0.000000 -0.019509 0.098078 +v -2.517020 -0.013553 0.108831 +v 0.000000 -0.038268 0.092388 +v -2.517020 -0.032313 0.103141 +v 0.000000 -0.055557 0.083147 +v -2.517020 -0.049601 0.093900 +v 0.000000 -0.070710 0.070711 +v -2.517020 -0.064755 0.081463 +v 0.000000 -0.083147 0.055557 +v -2.517020 -0.077191 0.066310 +v 0.000000 -0.092388 0.038268 +v -2.517020 -0.086432 0.049021 +v 0.000000 -0.098078 0.019509 +v -2.517020 -0.092123 0.030262 +v 0.000000 -0.100000 -0.000000 +v -2.517020 -0.094044 0.010753 +v 0.000000 -0.098078 -0.019509 +v -2.517020 -0.092123 -0.008756 +v 0.000000 -0.092388 -0.038268 +v -2.517020 -0.086432 -0.027516 +v 0.000000 -0.083147 -0.055557 +v -2.517020 -0.077191 -0.044804 +v 0.000000 -0.070710 -0.070711 +v -2.517020 -0.064755 -0.059958 +v 0.000000 -0.055557 -0.083147 +v -2.517020 -0.049601 -0.072394 +v 0.000000 -0.038268 -0.092388 +v -2.517020 -0.032313 -0.081635 +v 0.000000 -0.019509 -0.098079 +v -2.517020 -0.013553 -0.087326 +v -0.000000 0.000000 -0.100000 +v -2.517020 0.005956 -0.089247 +v -0.000000 0.019509 -0.098079 +v -2.517020 0.025465 -0.087326 +v -0.000000 0.038269 -0.092388 +v -2.517020 0.044224 -0.081635 +v -0.000000 0.055557 -0.083147 +v -2.517020 0.061513 -0.072394 +v -0.000000 0.070711 -0.070711 +v -2.517020 0.076667 -0.059958 +v -0.000000 0.083147 -0.055557 +v -2.517020 0.089103 -0.044804 +v -0.000000 0.092388 -0.038268 +v -2.517020 0.098344 -0.027516 +v -0.000000 0.098079 -0.019509 +v -2.517020 0.104034 -0.008756 +v -0.000000 0.100000 0.000000 +v -2.517020 0.105956 0.010753 +v -0.000000 0.098079 0.019509 +v -2.517020 0.104034 0.030262 +v -0.000000 0.092388 0.038268 +v -2.517020 0.098344 0.049021 +v -0.000000 0.083147 0.055557 +v -2.517020 0.089103 0.066310 +v -0.000000 0.070711 0.070711 +v -2.517020 0.076666 0.081463 +v -0.000000 0.055557 0.083147 +v -2.517020 0.061513 0.093900 +v -0.000000 0.038268 0.092388 +v -2.517020 0.044224 0.103141 +v -0.000000 0.019509 0.098079 +v -2.517020 0.025465 0.108831 +vn 0.0040 -0.0980 0.9952 +vn 0.0034 -0.2903 0.9569 +vn 0.0027 -0.4714 0.8819 +vn 0.0018 -0.6344 0.7730 +vn 0.0009 -0.7730 0.6344 +vn -0.0001 -0.8819 0.4714 +vn -0.0010 -0.9569 0.2903 +vn -0.0019 -0.9952 0.0980 +vn -0.0028 -0.9952 -0.0980 +vn -0.0035 -0.9569 -0.2903 +vn -0.0041 -0.8819 -0.4714 +vn -0.0045 -0.7730 -0.6344 +vn -0.0048 -0.6344 -0.7730 +vn -0.0049 -0.4714 -0.8819 +vn -0.0048 -0.2903 -0.9569 +vn -0.0045 -0.0980 -0.9952 +vn -0.0040 0.0980 -0.9952 +vn -0.0034 0.2903 -0.9569 +vn -0.0027 0.4714 -0.8819 +vn -0.0018 0.6344 -0.7730 +vn -0.0009 0.7730 -0.6344 +vn 0.0001 0.8819 -0.4714 +vn 0.0010 0.9569 -0.2903 +vn 0.0019 0.9952 -0.0980 +vn 0.0028 0.9952 0.0980 +vn 0.0035 0.9569 0.2903 +vn 0.0041 0.8819 0.4714 +vn 0.0045 0.7730 0.6344 +vn 0.0048 0.6344 0.7730 +vn 0.0049 0.4714 0.8819 +vn -1.0000 -0.0000 0.0000 +vn 0.0048 0.2903 0.9569 +vn 0.0045 0.0980 0.9952 +vn 1.0000 0.0000 0.0000 +usemtl None +s off +f 1//1 2//1 4//1 3//1 +f 3//2 4//2 6//2 5//2 +f 5//3 6//3 8//3 7//3 +f 7//4 8//4 10//4 9//4 +f 9//5 10//5 12//5 11//5 +f 11//6 12//6 14//6 13//6 +f 13//7 14//7 16//7 15//7 +f 15//8 16//8 18//8 17//8 +f 17//9 18//9 20//9 19//9 +f 19//10 20//10 22//10 21//10 +f 21//11 22//11 24//11 23//11 +f 23//12 24//12 26//12 25//12 +f 25//13 26//13 28//13 27//13 +f 27//14 28//14 30//14 29//14 +f 29//15 30//15 32//15 31//15 +f 31//16 32//16 34//16 33//16 +f 33//17 34//17 36//17 35//17 +f 35//18 36//18 38//18 37//18 +f 37//19 38//19 40//19 39//19 +f 39//20 40//20 42//20 41//20 +f 41//21 42//21 44//21 43//21 +f 43//22 44//22 46//22 45//22 +f 45//23 46//23 48//23 47//23 +f 47//24 48//24 50//24 49//24 +f 49//25 50//25 52//25 51//25 +f 51//26 52//26 54//26 53//26 +f 53//27 54//27 56//27 55//27 +f 55//28 56//28 58//28 57//28 +f 57//29 58//29 60//29 59//29 +f 59//30 60//30 62//30 61//30 +f 4//31 2//31 64//31 62//31 60//31 58//31 56//31 54//31 52//31 50//31 48//31 46//31 44//31 42//31 40//31 38//31 36//31 34//31 32//31 30//31 28//31 26//31 24//31 22//31 20//31 18//31 16//31 14//31 12//31 10//31 8//31 6//31 +f 61//32 62//32 64//32 63//32 +f 63//33 64//33 2//33 1//33 +f 1//34 3//34 5//34 7//34 9//34 11//34 13//34 15//34 17//34 19//34 21//34 23//34 25//34 27//34 29//34 31//34 33//34 35//34 37//34 39//34 41//34 43//34 45//34 47//34 49//34 51//34 53//34 55//34 57//34 59//34 61//34 63//34 diff --git a/blender/tturret.mtl b/blender/tturret.mtl new file mode 100644 index 0000000..798ce21 --- /dev/null +++ b/blender/tturret.mtl @@ -0,0 +1,10 @@ +# Blender MTL File: 'tbody.blend' +# Material Count: 1 + +newmtl None +Ns 0 +Ka 0.000000 0.000000 0.000000 +Kd 0.8 0.8 0.8 +Ks 0.8 0.8 0.8 +d 1 +illum 2 diff --git a/blender/tturret.obj b/blender/tturret.obj new file mode 100644 index 0000000..0e3c695 --- /dev/null +++ b/blender/tturret.obj @@ -0,0 +1,234 @@ +# Blender v2.78 (sub 0) OBJ File: 'tbody.blend' +# www.blender.org +mtllib tturret.mtl +o Cylinder +v 0.000000 0.000000 0.750000 +v 0.000000 0.274418 0.750000 +v -0.146318 0.000000 0.735589 +v -0.146318 0.274418 0.735589 +v -0.287012 0.000000 0.692909 +v -0.287012 0.274418 0.692909 +v -0.416678 0.000000 0.623602 +v -0.416678 0.274418 0.623602 +v -0.530330 0.000000 0.530330 +v -0.530330 0.274418 0.530330 +v -0.623602 0.000000 0.416677 +v -0.623602 0.274418 0.416677 +v -0.692909 0.000000 0.287012 +v -0.692909 0.274418 0.287012 +v -0.735589 0.000000 0.146318 +v -0.735589 0.274418 0.146318 +v -0.750000 0.000000 -0.000000 +v -0.750000 0.274418 -0.000000 +v -0.735589 0.000000 -0.146318 +v -0.735589 0.274418 -0.146318 +v -0.692910 0.000000 -0.287013 +v -0.692910 0.274418 -0.287013 +v -0.623602 0.000000 -0.416678 +v -0.623602 0.274418 -0.416678 +v -0.530330 0.000000 -0.530330 +v -0.530330 0.274418 -0.530330 +v -0.416678 0.000000 -0.623602 +v -0.416678 0.274418 -0.623602 +v -0.287012 0.000000 -0.692910 +v -0.287012 0.274418 -0.692910 +v -0.146317 0.000000 -0.735589 +v -0.146317 0.274418 -0.735589 +v 0.000000 0.000000 -0.750000 +v 0.000000 0.274418 -0.750000 +v 0.146318 0.000000 -0.735589 +v 0.146318 0.274418 -0.735589 +v 0.287013 0.000000 -0.692910 +v 0.287013 0.274418 -0.692910 +v 0.416678 0.000000 -0.623602 +v 0.416678 0.274418 -0.623602 +v 0.530331 0.000000 -0.530330 +v 0.530331 0.274418 -0.530330 +v 0.623603 0.000000 -0.416677 +v 0.623603 0.274418 -0.416677 +v 0.692910 0.000000 -0.287012 +v 0.692910 0.274418 -0.287012 +v 0.735589 0.000000 -0.146317 +v 0.735589 0.274418 -0.146317 +v 0.750000 0.000000 0.000001 +v 0.750000 0.274418 0.000001 +v 0.735589 0.000000 0.146318 +v 0.735589 0.274418 0.146318 +v 0.692909 0.000000 0.287013 +v 0.692909 0.274418 0.287013 +v 0.623602 0.000000 0.416678 +v 0.623602 0.274418 0.416678 +v 0.530330 0.000000 0.530330 +v 0.530330 0.274418 0.530330 +v 0.416677 0.000000 0.623603 +v 0.416677 0.274418 0.623603 +v 0.287012 0.000000 0.692910 +v 0.287012 0.274418 0.692910 +v 0.146317 0.000000 0.735589 +v 0.146317 0.274418 0.735589 +v -0.114716 0.488240 0.576718 +v 0.000000 0.488240 0.588016 +v -0.225024 0.488240 0.543256 +v -0.326684 0.488240 0.488918 +v -0.415790 0.488240 0.415790 +v -0.488918 0.488240 0.326684 +v -0.543256 0.488240 0.225024 +v -0.576718 0.488240 0.114716 +v -0.588016 0.488240 -0.000000 +v -0.576718 0.488240 -0.114716 +v -0.543256 0.488240 -0.225024 +v -0.488918 0.488240 -0.326685 +v -0.415790 0.488240 -0.415791 +v -0.326684 0.488240 -0.488918 +v -0.225024 0.488240 -0.543256 +v -0.114716 0.488240 -0.576718 +v 0.000000 0.488240 -0.588017 +v 0.114717 0.488240 -0.576718 +v 0.225024 0.488240 -0.543256 +v 0.326685 0.488240 -0.488918 +v 0.415791 0.488240 -0.415790 +v 0.488918 0.488240 -0.326684 +v 0.543257 0.488240 -0.225024 +v 0.576718 0.488240 -0.114716 +v 0.588017 0.488240 0.000000 +v 0.576718 0.488240 0.114717 +v 0.543256 0.488240 0.225025 +v 0.488917 0.488240 0.326685 +v 0.415790 0.488240 0.415791 +v 0.326684 0.488240 0.488918 +v 0.225023 0.488240 0.543256 +v 0.114716 0.488240 0.576718 +vn -0.0980 0.0000 0.9952 +vn -0.2903 0.0000 0.9569 +vn -0.4714 0.0000 0.8819 +vn -0.6344 0.0000 0.7730 +vn -0.7730 0.0000 0.6344 +vn -0.8819 0.0000 0.4714 +vn -0.9569 0.0000 0.2903 +vn -0.9952 0.0000 0.0980 +vn -0.9952 0.0000 -0.0980 +vn -0.9569 0.0000 -0.2903 +vn -0.8819 0.0000 -0.4714 +vn -0.7730 0.0000 -0.6344 +vn -0.6344 0.0000 -0.7730 +vn -0.4714 0.0000 -0.8819 +vn -0.2903 0.0000 -0.9569 +vn -0.0980 0.0000 -0.9952 +vn 0.0980 0.0000 -0.9952 +vn 0.2903 0.0000 -0.9569 +vn 0.4714 0.0000 -0.8819 +vn 0.6344 0.0000 -0.7730 +vn 0.7730 0.0000 -0.6344 +vn 0.8819 0.0000 -0.4714 +vn 0.9569 0.0000 -0.2903 +vn 0.9952 0.0000 -0.0980 +vn 0.9952 0.0000 0.0980 +vn 0.9569 0.0000 0.2903 +vn 0.8819 0.0000 0.4714 +vn 0.7730 0.0000 0.6344 +vn 0.6344 0.0000 0.7730 +vn 0.4714 0.0000 0.8819 +vn -0.7947 0.6020 -0.0783 +vn 0.2903 0.0000 0.9569 +vn 0.0980 0.0000 0.9952 +vn 0.0000 -1.0000 -0.0000 +vn 0.0000 1.0000 -0.0000 +vn 0.2318 0.6020 -0.7641 +vn 0.7042 0.6020 0.3764 +vn -0.6172 0.6020 0.5066 +vn -0.3764 0.6020 -0.7042 +vn -0.0783 0.6020 0.7947 +vn 0.7641 0.6020 -0.2318 +vn 0.0783 0.6020 0.7947 +vn -0.7641 0.6020 -0.2318 +vn 0.3764 0.6020 -0.7042 +vn 0.6172 0.6020 0.5066 +vn -0.7042 0.6020 0.3764 +vn -0.2318 0.6020 -0.7641 +vn 0.7947 0.6020 -0.0783 +vn -0.2318 0.6020 0.7641 +vn -0.7042 0.6020 -0.3764 +vn 0.5066 0.6020 -0.6172 +vn 0.5066 0.6020 0.6172 +vn -0.7641 0.6020 0.2318 +vn -0.0783 0.6020 -0.7947 +vn 0.7947 0.6020 0.0783 +vn -0.3764 0.6020 0.7042 +vn -0.6172 0.6020 -0.5066 +vn 0.6172 0.6020 -0.5066 +vn 0.3764 0.6020 0.7042 +vn -0.7947 0.6020 0.0783 +vn 0.0783 0.6020 -0.7947 +vn 0.7641 0.6020 0.2318 +vn -0.5066 0.6020 0.6172 +vn -0.5066 0.6020 -0.6172 +vn 0.7042 0.6020 -0.3764 +vn 0.2318 0.6020 0.7641 +usemtl None +s off +f 1//1 2//1 4//1 3//1 +f 3//2 4//2 6//2 5//2 +f 5//3 6//3 8//3 7//3 +f 7//4 8//4 10//4 9//4 +f 9//5 10//5 12//5 11//5 +f 11//6 12//6 14//6 13//6 +f 13//7 14//7 16//7 15//7 +f 15//8 16//8 18//8 17//8 +f 17//9 18//9 20//9 19//9 +f 19//10 20//10 22//10 21//10 +f 21//11 22//11 24//11 23//11 +f 23//12 24//12 26//12 25//12 +f 25//13 26//13 28//13 27//13 +f 27//14 28//14 30//14 29//14 +f 29//15 30//15 32//15 31//15 +f 31//16 32//16 34//16 33//16 +f 33//17 34//17 36//17 35//17 +f 35//18 36//18 38//18 37//18 +f 37//19 38//19 40//19 39//19 +f 39//20 40//20 42//20 41//20 +f 41//21 42//21 44//21 43//21 +f 43//22 44//22 46//22 45//22 +f 45//23 46//23 48//23 47//23 +f 47//24 48//24 50//24 49//24 +f 49//25 50//25 52//25 51//25 +f 51//26 52//26 54//26 53//26 +f 53//27 54//27 56//27 55//27 +f 55//28 56//28 58//28 57//28 +f 57//29 58//29 60//29 59//29 +f 59//30 60//30 62//30 61//30 +f 20//31 18//31 73//31 74//31 +f 61//32 62//32 64//32 63//32 +f 63//33 64//33 2//33 1//33 +f 1//34 3//34 5//34 7//34 9//34 11//34 13//34 15//34 17//34 19//34 21//34 23//34 25//34 27//34 29//34 31//34 33//34 35//34 37//34 39//34 41//34 43//34 45//34 47//34 49//34 51//34 53//34 55//34 57//34 59//34 61//34 63//34 +f 65//35 66//35 96//35 95//35 94//35 93//35 92//35 91//35 90//35 89//35 88//35 87//35 86//35 85//35 84//35 83//35 82//35 81//35 80//35 79//35 78//35 77//35 76//35 75//35 74//35 73//35 72//35 71//35 70//35 69//35 68//35 67//35 +f 38//36 36//36 82//36 83//36 +f 56//37 54//37 91//37 92//37 +f 12//38 10//38 69//38 70//38 +f 30//39 28//39 78//39 79//39 +f 4//40 2//40 66//40 65//40 +f 48//41 46//41 87//41 88//41 +f 2//42 64//42 96//42 66//42 +f 22//43 20//43 74//43 75//43 +f 40//44 38//44 83//44 84//44 +f 58//45 56//45 92//45 93//45 +f 14//46 12//46 70//46 71//46 +f 32//47 30//47 79//47 80//47 +f 50//48 48//48 88//48 89//48 +f 6//49 4//49 65//49 67//49 +f 24//50 22//50 75//50 76//50 +f 42//51 40//51 84//51 85//51 +f 60//52 58//52 93//52 94//52 +f 16//53 14//53 71//53 72//53 +f 34//54 32//54 80//54 81//54 +f 52//55 50//55 89//55 90//55 +f 8//56 6//56 67//56 68//56 +f 26//57 24//57 76//57 77//57 +f 44//58 42//58 85//58 86//58 +f 62//59 60//59 94//59 95//59 +f 18//60 16//60 72//60 73//60 +f 36//61 34//61 81//61 82//61 +f 54//62 52//62 90//62 91//62 +f 10//63 8//63 68//63 69//63 +f 28//64 26//64 77//64 78//64 +f 46//65 44//65 86//65 87//65 +f 64//66 62//66 95//66 96//66 diff --git a/map.tscn b/map.tscn index 9417953..74ad6d8 100644 --- a/map.tscn +++ b/map.tscn @@ -8,12 +8,14 @@ extents = Vector3( 1, 1, 1 ) [node name="Spatial" type="Spatial"] +editor/display_folded = true _import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) +transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.14667, 0 ) [node name="TestCube" type="TestCube" parent="."] _import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) -transform/local = Transform( 100, 0, 0, 0, 0.1, 0, 0, 0, 100, 0, -2.53486, 0 ) +transform/local = Transform( 100, 0, 0, 0, 0.1, 0, 0, 0, 100, -0.0118325, -2.53486, 0.00344372 ) layers = 1 geometry/visible = true geometry/material_override = null @@ -54,6 +56,8 @@ _update_shape_index = 0 [node name="Spatial" parent="." instance=ExtResource( 1 )] +transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.575415, 0 ) + [node name="OmniLight" type="OmniLight" parent="."] _import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) diff --git a/tank-base.gd b/tank-base.gd index 1e75078..9bd7333 100644 --- a/tank-base.gd +++ b/tank-base.gd @@ -7,7 +7,7 @@ const STEER_LIMIT = .3 var steer_angle = 0 var steer_target = 0 -var view_sensitivity = 0.3; +var view_sensitivity = 0.1; export var engine_force = 20 @@ -45,17 +45,19 @@ func _fixed_process(delta): set_steering(steer_angle) +func _enter_tree(): + Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED); func _ready(): set_fixed_process(true) + set_process_input(true) func _input(ie): if ie.type == InputEvent.MOUSE_MOTION: - var yaw = rad2deg(get_node(".").get_rotation().y); - var pitch = rad2deg(get_node("Camera").get_rotation().x); - - yaw = fmod(yaw - ie.relative_x * view_sensitivity, 360); - pitch = max(min(pitch - ie.relative_y * view_sensitivity, 90), -90); - - get_node(".").set_rotation(Vector3(0, deg2rad(yaw), 0)); - get_node("Camera").set_rotation(Vector3(deg2rad(pitch), 0, 0)); + var turret = get_node("Turret") + var cannon = get_node("Turret/Cannon") + #var pitch = rad2deg(camera.get_rotation().x) + var plus_pitch = view_sensitivity * -ie.relative_y + var plus_yaw = fmod(view_sensitivity * ie.relative_x,360) + turret.rotate(Vector3(0,1,0), deg2rad(plus_yaw)) + cannon.rotate(Vector3(0,0,1), deg2rad(plus_pitch)) diff --git a/tank-base.tscn b/tank-base.tscn index d7183d1..6cef861 100644 --- a/tank-base.tscn +++ b/tank-base.tscn @@ -1,8 +1,10 @@ -[gd_scene load_steps=5 format=1] +[gd_scene load_steps=7 format=1] [ext_resource path="res://tank-base.gd" type="Script" id=1] [ext_resource path="res://tbody.msh" type="Mesh" id=2] [ext_resource path="res://twheel.msh" type="Mesh" id=3] +[ext_resource path="res://tturret.msh" type="Mesh" id=4] +[ext_resource path="res://tcannon.msh" type="Mesh" id=5] [sub_resource type="BoxShape" id=1] @@ -54,6 +56,7 @@ material/0 = null [node name="VehicleWheel" type="VehicleWheel" parent="VehicleBody"] +editor/display_folded = true _import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.882344, -0.794859, -1.6514 ) type/traction = true @@ -62,7 +65,7 @@ wheel/radius = 0.5 wheel/rest_length = 0.15 wheel/friction_slip = 10.5 suspension/travel = 5.0 -suspension/stiffness = 8.0 +suspension/stiffness = 16.0 suspension/max_force = 6000.0 damping/compression = 0.83 damping/relaxation = 0.88 @@ -90,6 +93,7 @@ material/0 = null [node name="VehicleWheel1" type="VehicleWheel" parent="VehicleBody"] +editor/display_folded = true _import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.927136, -0.794859, -1.6514 ) type/traction = true @@ -98,7 +102,7 @@ wheel/radius = 0.5 wheel/rest_length = 0.15 wheel/friction_slip = 10.5 suspension/travel = 5.0 -suspension/stiffness = 8.0 +suspension/stiffness = 16.0 suspension/max_force = 6000.0 damping/compression = 0.83 damping/relaxation = 0.88 @@ -127,6 +131,7 @@ material/0 = null [node name="VehicleWheel2" type="VehicleWheel" parent="VehicleBody"] +editor/display_folded = true _import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.927136, -0.794859, 1.00165 ) type/traction = true @@ -135,7 +140,7 @@ wheel/radius = 0.5 wheel/rest_length = 0.15 wheel/friction_slip = 10.5 suspension/travel = 5.0 -suspension/stiffness = 10.0 +suspension/stiffness = 20.0 suspension/max_force = 6000.0 damping/compression = 0.83 damping/relaxation = 0.88 @@ -163,6 +168,7 @@ material/0 = null [node name="VehicleWheel3" type="VehicleWheel" parent="VehicleBody"] +editor/display_folded = true _import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.880901, -0.794859, 1.00165 ) type/traction = true @@ -171,7 +177,7 @@ wheel/radius = 0.5 wheel/rest_length = 0.15 wheel/friction_slip = 10.5 suspension/travel = 5.0 -suspension/stiffness = 10.0 +suspension/stiffness = 20.0 suspension/max_force = 6000.0 damping/compression = 0.83 damping/relaxation = 0.88 @@ -205,10 +211,54 @@ shape = SubResource( 1 ) trigger = false _update_shape_index = 0 -[node name="Camera" type="InterpolatedCamera" parent="VehicleBody"] +[node name="Turret" type="MeshInstance" parent="VehicleBody"] _import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) -transform/local = Transform( -0.919673, 0.0404591, -0.390595, -0.0062019, 0.993057, 0.117466, 0.392635, 0.110452, -0.913037, -3.38148, 1.22883, -6.13712 ) +transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.495483, 0 ) +layers = 1 +geometry/visible = true +geometry/material_override = null +geometry/cast_shadow = 1 +geometry/receive_shadows = true +geometry/range_begin = 0.0 +geometry/range_end = 0.0 +geometry/extra_cull_margin = 0.0 +geometry/billboard = false +geometry/billboard_y = false +geometry/depth_scale = false +geometry/visible_in_all_rooms = false +geometry/use_baked_light = false +geometry/baked_light_tex_id = 0 +mesh/mesh = ExtResource( 4 ) +mesh/skeleton = NodePath("..") +material/0 = null + +[node name="Cannon" type="MeshInstance" parent="VehicleBody/Turret"] + +_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) +transform/local = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.083864, 0.154639, -0.0776682 ) +layers = 1 +geometry/visible = true +geometry/material_override = null +geometry/cast_shadow = 1 +geometry/receive_shadows = true +geometry/range_begin = 0.0 +geometry/range_end = 0.0 +geometry/extra_cull_margin = 0.0 +geometry/billboard = false +geometry/billboard_y = false +geometry/depth_scale = false +geometry/visible_in_all_rooms = false +geometry/use_baked_light = false +geometry/baked_light_tex_id = 0 +mesh/mesh = ExtResource( 5 ) +mesh/skeleton = NodePath("..") +material/0 = null + +[node name="Camera" type="InterpolatedCamera" parent="VehicleBody/Turret/Cannon"] + +_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) +transform/local = Transform( 1.94079e-08, -0.278, 0.960581, 8.39767e-08, 0.96058, 0.278, -1, 7.52709e-08, 4.19883e-08, -0.272305, 0.527291, 0.0291164 ) projection = 0 fov = 60.0 near = 0.1 diff --git a/tcannon.msh b/tcannon.msh new file mode 100644 index 0000000..708bba1 Binary files /dev/null and b/tcannon.msh differ diff --git a/tturret.msh b/tturret.msh new file mode 100644 index 0000000..34fc95c Binary files /dev/null and b/tturret.msh differ