Removed CSG related nodes.

This commit is contained in:
Relintai 2022-03-20 09:00:05 +01:00
parent 1aff26a273
commit 74057f28a2
5 changed files with 45 additions and 62 deletions

View File

@ -32,11 +32,11 @@ func _init():
if ClassDB.class_exists("_Time"): if ClassDB.class_exists("_Time"):
time_object = ClassDB.instance("_Time") time_object = ClassDB.instance("_Time")
elif ClassDB.class_exists("Time"): elif ClassDB.class_exists("Time"):
time_object = ClassDB.instance("Time") time_object = Time#ClassDB.instance("Time")
else: else:
time_object = ClassDB.instance("_OS") time_object = ClassDB.instance("_OS")
start_time = time_object.get_ticks_msec() start_time = Time.get_ticks_msec()
# In case when user doesn't provide time # In case when user doesn't provide time
time_for_each_step = time_to_show / (alone_steps.size()) time_for_each_step = time_to_show / (alone_steps.size())

View File

@ -1,6 +1,5 @@
[gd_scene load_steps=11 format=2] [gd_scene load_steps=9 format=2]
[ext_resource path="res://icon.png" type="Texture" id=1]
[ext_resource path="res://Physics/3D/StaticArena.gd" type="Script" id=2] [ext_resource path="res://Physics/3D/StaticArena.gd" type="Script" id=2]
[ext_resource path="res://Physics/3D/RigidBody3D.tscn" type="PackedScene" id=3] [ext_resource path="res://Physics/3D/RigidBody3D.tscn" type="PackedScene" id=3]
@ -8,20 +7,10 @@
friction = 0.89 friction = 0.89
rough = true rough = true
[sub_resource type="SpatialMaterial" id=2]
albedo_color = Color( 1, 1, 1, 0.521569 )
albedo_texture = ExtResource( 1 )
metallic = 1.0
metallic_specular = 0.86
metallic_texture = ExtResource( 1 )
[sub_resource type="BoxShape" id=3] [sub_resource type="BoxShape" id=3]
extents = Vector3( 50, 2, 50 ) extents = Vector3( 50, 2, 50 )
[sub_resource type="SpatialMaterial" id=4] [sub_resource type="CubeMesh" id=8]
params_diffuse_mode = 1
albedo_texture = ExtResource( 1 )
metallic = 0.8
[sub_resource type="BoxShape" id=5] [sub_resource type="BoxShape" id=5]
extents = Vector3( 50, 20, 5 ) extents = Vector3( 50, 20, 5 )
@ -46,27 +35,22 @@ collision_layer = 2147483651
collision_mask = 279045 collision_mask = 279045
physics_material_override = SubResource( 1 ) physics_material_override = SubResource( 1 )
[node name="CSGBox" type="CSGBox" parent="StaticArena/StaticBody"]
width = 100.0
height = 4.32824
depth = 100.0
material = SubResource( 2 )
[node name="CollisionShape" type="CollisionShape" parent="StaticArena/StaticBody"] [node name="CollisionShape" type="CollisionShape" parent="StaticArena/StaticBody"]
shape = SubResource( 3 ) shape = SubResource( 3 )
[node name="MeshInstance" type="MeshInstance" parent="StaticArena/StaticBody"]
mesh = SubResource( 8 )
[node name="StaticBody2" type="StaticBody" parent="StaticArena"] [node name="StaticBody2" type="StaticBody" parent="StaticArena"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 18.1689, 1.64214 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 18.1689, 1.64214 )
collision_layer = 2147483651 collision_layer = 2147483651
collision_mask = 279045 collision_mask = 279045
physics_material_override = SubResource( 1 ) physics_material_override = SubResource( 1 )
[node name="CSGBox" type="CSGBox" parent="StaticArena/StaticBody2"] [node name="MeshInstance2" type="MeshInstance" parent="StaticArena/StaticBody2"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.5124 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -18.1689, -1.64214 )
width = 100.0 mesh = SubResource( 8 )
height = 40.0 skeleton = NodePath("../../StaticBody")
depth = 10.0
material = SubResource( 4 )
[node name="CollisionShape" type="CollisionShape" parent="StaticArena/StaticBody2"] [node name="CollisionShape" type="CollisionShape" parent="StaticArena/StaticBody2"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.709 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.709 )
@ -78,12 +62,10 @@ collision_layer = 2147483651
collision_mask = 279045 collision_mask = 279045
physics_material_override = SubResource( 1 ) physics_material_override = SubResource( 1 )
[node name="CSGBox" type="CSGBox" parent="StaticArena/StaticBody3"] [node name="MeshInstance3" type="MeshInstance" parent="StaticArena/StaticBody3"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.5124 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -18.1689, -91.732 )
width = 100.0 mesh = SubResource( 8 )
height = 40.0 skeleton = NodePath("../../StaticBody")
depth = 10.0
material = SubResource( 4 )
[node name="CollisionShape" type="CollisionShape" parent="StaticArena/StaticBody3"] [node name="CollisionShape" type="CollisionShape" parent="StaticArena/StaticBody3"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.709 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.709 )
@ -95,12 +77,10 @@ collision_layer = 2147483651
collision_mask = 279045 collision_mask = 279045
physics_material_override = SubResource( 1 ) physics_material_override = SubResource( 1 )
[node name="CSGBox" type="CSGBox" parent="StaticArena/StaticBody4"] [node name="MeshInstance4" type="MeshInstance" parent="StaticArena/StaticBody4"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.13509, -46.5124 ) transform = Transform( -1.62921e-07, 0, 1, 0, 1, 0, -1, 0, -1.62921e-07, -0.572887, -18.1689, -1.90218 )
width = 100.0 mesh = SubResource( 8 )
height = 40.0 skeleton = NodePath("../../StaticBody")
depth = 10.0
material = SubResource( 4 )
[node name="CollisionShape" type="CollisionShape" parent="StaticArena/StaticBody4"] [node name="CollisionShape" type="CollisionShape" parent="StaticArena/StaticBody4"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.709 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.709 )
@ -112,12 +92,10 @@ collision_layer = 2147483651
collision_mask = 279045 collision_mask = 279045
physics_material_override = SubResource( 1 ) physics_material_override = SubResource( 1 )
[node name="CSGBox" type="CSGBox" parent="StaticArena/StaticBody5"] [node name="MeshInstance5" type="MeshInstance" parent="StaticArena/StaticBody5"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.5124 ) transform = Transform( -1.62921e-07, 0, 1, 0, 1, 0, -1, 0, -1.62921e-07, -0.814533, -18.8845, -92.1931 )
width = 100.0 mesh = SubResource( 8 )
height = 40.0 skeleton = NodePath("../../StaticBody")
depth = 10.0
material = SubResource( 4 )
[node name="CollisionShape" type="CollisionShape" parent="StaticArena/StaticBody5"] [node name="CollisionShape" type="CollisionShape" parent="StaticArena/StaticBody5"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.709 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -46.709 )
@ -129,9 +107,10 @@ transform = Transform( 0.998532, 0.013617, -0.0524264, 0, 0.967885, 0.251394, 0.
[node name="CollisionShape" type="CollisionShape" parent="StaticArena/StaticBody6"] [node name="CollisionShape" type="CollisionShape" parent="StaticArena/StaticBody6"]
shape = SubResource( 6 ) shape = SubResource( 6 )
[node name="CSGBox" type="CSGBox" parent="StaticArena/StaticBody6"] [node name="MeshInstance6" type="MeshInstance" parent="StaticArena/StaticBody6"]
width = 23.9394 transform = Transform( 0.998532, -2.79397e-09, 0.0541659, 0.013617, 0.967885, -0.251025, -0.0524264, 0.251394, 0.966464, 16.8068, -7.28462, -2.83402 )
depth = 44.6359 mesh = SubResource( 8 )
skeleton = NodePath("../../StaticBody")
[node name="StaticBody7" type="StaticBody" parent="StaticArena"] [node name="StaticBody7" type="StaticBody" parent="StaticArena"]
transform = Transform( -0.638995, 0.193375, -0.744507, 0, 0.967885, 0.251394, 0.769211, 0.16064, -0.618474, 10.0702, 7.03413, 0 ) transform = Transform( -0.638995, 0.193375, -0.744507, 0, 0.967885, 0.251394, 0.769211, 0.16064, -0.618474, 10.0702, 7.03413, 0 )
@ -140,9 +119,10 @@ transform = Transform( -0.638995, 0.193375, -0.744507, 0, 0.967885, 0.251394, 0.
transform = Transform( 1, -9.31323e-10, 0, 0, 1, 1.49012e-08, 3.72529e-09, 1.49012e-08, 1, 0, 0, 0 ) transform = Transform( 1, -9.31323e-10, 0, 0, 1, 1.49012e-08, 3.72529e-09, 1.49012e-08, 1, 0, 0, 0 )
shape = SubResource( 7 ) shape = SubResource( 7 )
[node name="CSGBox" type="CSGBox" parent="StaticArena/StaticBody7"] [node name="MeshInstance7" type="MeshInstance" parent="StaticArena/StaticBody7"]
width = 23.9394 transform = Transform( -0.638995, -1.93715e-07, 0.76921, 0.193375, 0.967885, 0.160639, -0.744508, 0.251394, -0.618474, 6.43481, -8.75555, 5.729 )
depth = 44.6359 mesh = SubResource( 8 )
skeleton = NodePath("../../StaticBody")
[node name="StaticBody8" type="StaticBody" parent="StaticArena"] [node name="StaticBody8" type="StaticBody" parent="StaticArena"]
transform = Transform( -0.314953, 0.2386, -0.918626, 0, 0.967885, 0.251394, 0.949107, 0.0791774, -0.304838, 10.0702, 7.03413, 24.278 ) transform = Transform( -0.314953, 0.2386, -0.918626, 0, 0.967885, 0.251394, 0.949107, 0.0791774, -0.304838, 10.0702, 7.03413, 24.278 )
@ -151,9 +131,10 @@ transform = Transform( -0.314953, 0.2386, -0.918626, 0, 0.967885, 0.251394, 0.94
transform = Transform( 1, -9.31323e-10, 0, 0, 1, 1.49012e-08, 3.72529e-09, 1.49012e-08, 1, 0, 0, 0 ) transform = Transform( 1, -9.31323e-10, 0, 0, 1, 1.49012e-08, 3.72529e-09, 1.49012e-08, 1, 0, 0, 0 )
shape = SubResource( 7 ) shape = SubResource( 7 )
[node name="CSGBox" type="CSGBox" parent="StaticArena/StaticBody8"] [node name="MeshInstance8" type="MeshInstance" parent="StaticArena/StaticBody8"]
width = 23.9394 transform = Transform( -0.314953, -7.45059e-08, 0.949107, 0.2386, 0.967885, 0.0791773, -0.918627, 0.251394, -0.304838, -19.8708, -11.1332, 14.8833 )
depth = 44.6359 mesh = SubResource( 8 )
skeleton = NodePath("../../StaticBody")
[node name="StaticBody9" type="StaticBody" parent="StaticArena"] [node name="StaticBody9" type="StaticBody" parent="StaticArena"]
transform = Transform( 0.289683, -0.599318, 0.746259, -0.123608, -0.796586, -0.591753, 0.949107, 0.0791774, -0.304838, 10.0702, 0.940654, -25.555 ) transform = Transform( 0.289683, -0.599318, 0.746259, -0.123608, -0.796586, -0.591753, 0.949107, 0.0791774, -0.304838, 10.0702, 0.940654, -25.555 )
@ -162,9 +143,10 @@ transform = Transform( 0.289683, -0.599318, 0.746259, -0.123608, -0.796586, -0.5
transform = Transform( 1, 7.45058e-09, 0, 1.49012e-08, 1, 4.84288e-08, 0, -3.1665e-08, 1, 0, 0, 0 ) transform = Transform( 1, 7.45058e-09, 0, 1.49012e-08, 1, 4.84288e-08, 0, -3.1665e-08, 1, 0, 0, 0 )
shape = SubResource( 7 ) shape = SubResource( 7 )
[node name="CSGBox" type="CSGBox" parent="StaticArena/StaticBody9"] [node name="MeshInstance9" type="MeshInstance" parent="StaticArena/StaticBody9"]
width = 23.9394 transform = Transform( 0.289683, -0.123608, 0.949108, -0.599317, -0.796586, 0.0791772, 0.746258, -0.591753, -0.304838, 21.4536, 8.80793, -14.7485 )
depth = 44.6359 mesh = SubResource( 8 )
skeleton = NodePath("../../StaticBody")
[node name="Objects" type="Spatial" parent="."] [node name="Objects" type="Spatial" parent="."]

View File

@ -1,9 +1,11 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://Physics/3D/RigidBody3D.gd" type="Script" id=1] [ext_resource path="res://Physics/3D/RigidBody3D.gd" type="Script" id=1]
[sub_resource type="SphereShape" id=1] [sub_resource type="SphereShape" id=1]
[sub_resource type="SphereMesh" id=2]
[node name="RigidBody" type="RigidBody"] [node name="RigidBody" type="RigidBody"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2888, 33.1278, 19.1751 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2888, 33.1278, 19.1751 )
gravity_scale = 5.0 gravity_scale = 5.0
@ -15,4 +17,5 @@ script = ExtResource( 1 )
transform = Transform( 5, 0, 0, 0, 5, 0, 0, 0, 5, 0, 0, 0 ) transform = Transform( 5, 0, 0, 0, 5, 0, 0, 0, 5, 0, 0, 0 )
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="CSGSphere" type="CSGSphere" parent="CollisionShape"] [node name="MeshInstance" type="MeshInstance" parent="CollisionShape"]
mesh = SubResource( 2 )

View File

@ -6,6 +6,3 @@
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
script = ExtResource( 1 ) script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}

View File

@ -30,6 +30,7 @@ process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/HDR_as_SRGB=false process/HDR_as_SRGB=false
process/invert_color=false process/invert_color=false
process/normal_map_invert_y=false
stream=false stream=false
size_limit=0 size_limit=0
detect_3d=false detect_3d=false