mirror of
https://github.com/Relintai/broken_seals.git
synced 2024-11-20 21:07:17 +01:00
Updated the engine. Renamed World to World3D, Environment to Environment3D, and WorldEnvironment to WorldEnvironment3D, along with a few getters / setters.
This commit is contained in:
parent
0c8a02fea3
commit
f7f99b1928
2
HEADS
2
HEADS
@ -1 +1 @@
|
||||
{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "ad72b82a894fd38a5ccd6ec5100bf4121fab3e92"}}
|
||||
{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "b886d14cf5d9ecb7121d43e6a225b47c72907c06"}}
|
@ -17,6 +17,6 @@ container_path = NodePath("Viewport")
|
||||
|
||||
[node name="Viewport" type="Viewport" parent="."]
|
||||
size = Vector2( 500, 500 )
|
||||
own_world = true
|
||||
own_world_3d = true
|
||||
handle_input_locally = false
|
||||
render_target_update_mode = 3
|
||||
|
@ -17,7 +17,7 @@ container_path = NodePath("Viewport")
|
||||
|
||||
[node name="Viewport" type="Viewport" parent="."]
|
||||
size = Vector2( 500, 500 )
|
||||
own_world = true
|
||||
own_world_3d = true
|
||||
handle_input_locally = false
|
||||
render_target_update_mode = 3
|
||||
|
||||
|
@ -17,7 +17,7 @@ container_path = NodePath("Viewport")
|
||||
[node name="Viewport" type="Viewport" parent="."]
|
||||
size = Vector2( 60, 60 )
|
||||
size_override_stretch = true
|
||||
own_world = true
|
||||
own_world_3d = true
|
||||
handle_input_locally = false
|
||||
render_target_update_mode = 3
|
||||
|
||||
|
@ -11,7 +11,7 @@ sky_horizon_color = Color( 0.129412, 0.129412, 0.129412, 1 )
|
||||
sky_curve = 0.151361
|
||||
ground_horizon_color = Color( 0.0745098, 0.0745098, 0.0745098, 1 )
|
||||
|
||||
[sub_resource type="Environment" id=7]
|
||||
[sub_resource type="Environment3D" id=7]
|
||||
background_mode = 2
|
||||
background_sky = SubResource( 6 )
|
||||
background_color = Color( 0.105882, 0.0862745, 0.0862745, 1 )
|
||||
@ -148,7 +148,7 @@ positions = [ NodePath("../RightBackAttachment/RightBackAP"), NodePath("../Right
|
||||
transform = Transform( 0.962004, 0.140685, -0.234001, 0, 0.857032, 0.515262, 0.273036, -0.495684, 0.824468, -2.67044, 6.99647, 9.77147 )
|
||||
light_color = Color( 0.752941, 0.101961, 0.101961, 1 )
|
||||
|
||||
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
|
||||
[node name="WorldEnvironment3D" type="WorldEnvironment3D" parent="."]
|
||||
environment = SubResource( 7 )
|
||||
|
||||
[editable path="armature"]
|
||||
|
@ -220,7 +220,7 @@ func _physics_process(delta : float) -> void:
|
||||
if not world.is_position_walkable(transform.origin):
|
||||
return
|
||||
|
||||
var space : PhysicsDirectSpaceState = get_world().direct_space_state
|
||||
var space : PhysicsDirectSpaceState = get_world_3d().direct_space_state
|
||||
|
||||
var res : Dictionary = space.intersect_ray(transform.origin + Vector3(0, 1000, 0), transform.origin + Vector3(0, -100, 0), [ self ])
|
||||
|
||||
@ -238,7 +238,7 @@ func _physics_process(delta : float) -> void:
|
||||
# var camera : Camera = get_tree().get_root().get_camera() as Camera
|
||||
#
|
||||
# if camera != null:
|
||||
# var res = get_world().get_direct_space_state().intersect_ray(get_transform().origin, camera.transform.origin, [ self ], 1)
|
||||
# var res = get_world_3d().get_direct_space_state().intersect_ray(get_transform().origin, camera.transform.origin, [ self ], 1)
|
||||
#
|
||||
# if res:
|
||||
# los = true
|
||||
@ -664,7 +664,7 @@ func target(position : Vector2):
|
||||
var from = camera.project_ray_origin(position)
|
||||
var to = from + camera.project_ray_normal(position) * ray_length
|
||||
|
||||
var space_state = get_world().direct_space_state
|
||||
var space_state = get_world_3d().direct_space_state
|
||||
var result = space_state.intersect_ray(from, to, [], collision_mask)
|
||||
|
||||
if result:
|
||||
@ -682,7 +682,7 @@ func cmouseover(event):
|
||||
var from = camera.project_ray_origin(event.position)
|
||||
var to = from + camera.project_ray_normal(event.position) * ray_length
|
||||
|
||||
var space_state = get_world().direct_space_state
|
||||
var space_state = get_world_3d().direct_space_state
|
||||
var result = space_state.intersect_ray(from, to, [], collision_mask)
|
||||
|
||||
if result:
|
||||
|
@ -44,7 +44,7 @@ func _ready() -> void:
|
||||
func _physics_process(delta):
|
||||
var pos : Vector3 = to_global(Vector3())
|
||||
|
||||
var space_state = get_world().direct_space_state
|
||||
var space_state = get_world_3d().direct_space_state
|
||||
|
||||
var result : Dictionary = space_state.intersect_ray(pos, to_global(Vector3(0, 0, target_camera_distance)), [ player.get_body() ], player.get_body().collision_mask)
|
||||
|
||||
|
@ -51,7 +51,7 @@ func _physics_process(delta):
|
||||
|
||||
func update_visibility() -> void:
|
||||
_query.transform = Transform(Basis(), get_body().translation)
|
||||
var res : Array = get_body().get_world().direct_space_state.intersect_shape(_query)
|
||||
var res : Array = get_body().get_world_3d().direct_space_state.intersect_shape(_query)
|
||||
|
||||
#warning-ignore:unassigned_variable
|
||||
var currenty_sees : Array = Array()
|
||||
|
@ -229,7 +229,7 @@ sun_angle_max = 23.15
|
||||
sun_energy = 9.29
|
||||
texture_size = 0
|
||||
|
||||
[sub_resource type="Environment" id=13]
|
||||
[sub_resource type="Environment3D" id=13]
|
||||
background_mode = 2
|
||||
background_sky = SubResource( 12 )
|
||||
ambient_light_color = Color( 0.870588, 0.870588, 0.870588, 1 )
|
||||
@ -824,7 +824,7 @@ num_lods = 0
|
||||
script = ExtResource( 16 )
|
||||
show_loading_screen = false
|
||||
|
||||
[node name="WorldEnvironment" type="WorldEnvironment" parent="World"]
|
||||
[node name="WorldEnvironment3D" type="WorldEnvironment3D" parent="World"]
|
||||
environment = SubResource( 13 )
|
||||
__meta__ = {
|
||||
"_editor_description_": ""
|
||||
|
@ -23,7 +23,7 @@ sun_angle_max = 23.15
|
||||
sun_energy = 9.29
|
||||
texture_size = 0
|
||||
|
||||
[sub_resource type="Environment" id=3]
|
||||
[sub_resource type="Environment3D" id=3]
|
||||
background_mode = 2
|
||||
background_sky = SubResource( 2 )
|
||||
ambient_light_color = Color( 0.870588, 0.870588, 0.870588, 1 )
|
||||
@ -59,7 +59,7 @@ script = ExtResource( 2 )
|
||||
editor_chunk_spawn_range = 10
|
||||
test_prop = ExtResource( 5 )
|
||||
|
||||
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
|
||||
[node name="WorldEnvironment3D" type="WorldEnvironment3D" parent="."]
|
||||
environment = SubResource( 3 )
|
||||
__meta__ = {
|
||||
"_editor_description_": ""
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
[sub_resource type="ProceduralSky" id=2]
|
||||
|
||||
[sub_resource type="Environment" id=1]
|
||||
[sub_resource type="Environment3D" id=1]
|
||||
background_mode = 2
|
||||
background_sky = SubResource( 2 )
|
||||
|
||||
@ -21,5 +21,5 @@ script = ExtResource( 3 )
|
||||
|
||||
[node name="Dungeon" parent="." instance=ExtResource( 1 )]
|
||||
|
||||
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
|
||||
[node name="WorldEnvironment3D" type="WorldEnvironment3D" parent="."]
|
||||
environment = SubResource( 1 )
|
||||
|
@ -1,4 +1,4 @@
|
||||
[gd_resource type="Environment" load_steps=2 format=2]
|
||||
[gd_resource type="Environment3D" load_steps=2 format=2]
|
||||
|
||||
[sub_resource type="ProceduralSky" id=1]
|
||||
sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
|
||||
|
Loading…
Reference in New Issue
Block a user