Godot-sandbox/test-client-godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

diverses modif.

Browse source
This commit is contained in:
osquallo 2018-07-27 21:01:34 +02:00
parent 0aaa638c0c
commit 0922f6f5a5
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scenes/Game/Character/Character.gd
View file

@ -20,6 +20,7 @@ var MOUSE_SENSITIVITY = 0.05
func _ready(): func _ready():
camera_rotation = $Camera_rotation_helper camera_rotation = $Camera_rotation_helper
camera = $Camera_rotation_helper/Camera camera = $Camera_rotation_helper/Camera
camera.make_current()
flashlight = $MeshInstance/Flashlight flashlight = $MeshInstance/Flashlight
func _process(delta): func _process(delta):
@ -90,11 +91,11 @@ func process_movement(delta):
obj.apply_impulse( collision_info.position, -collision_info.normal*delta ) obj.apply_impulse( collision_info.position, -collision_info.normal*delta )
if not obj.get_node( "MeshInstance" ).get_surface_material(0).get("albedo_color") == null: if not obj.get_node( "MeshInstance" ).get_surface_material(0).get("albedo_color") == null:
obj.get_node( "MeshInstance" ).get_surface_material(0).albedo_color = Color( 1, 0, 1, 1 ) obj.get_node( "MeshInstance" ).get_surface_material(0).albedo_color = Color( 1, 0, 1, 1 )
get_node( "../../GUI/HUD/Jauges/douleur/ProgressBar" ).value += 0.1 get_node( "../../GUI/HUD/Jauges/douleur/ProgressBar" ).value += 0.25
if get_node( "../../GUI/HUD/Jauges/douleur/ProgressBar" ).value >= 100: if get_node( "../../GUI/HUD/Jauges/douleur/ProgressBar" ).value >= 100:
get_node( "../../GUI/HUD/Jauges/trauma/ProgressBar" ).value += 0.1 get_node( "../../GUI/HUD/Jauges/trauma/ProgressBar" ).value += 0.25
if get_node( "../../GUI/HUD/Jauges/trauma/ProgressBar" ).value >= 100: if get_node( "../../GUI/HUD/Jauges/trauma/ProgressBar" ).value >= 100:
get_node( "../../GUI/HUD/Jauges/oubli/ProgressBar" ).value += 0.1 get_node( "../../GUI/HUD/Jauges/oubli/ProgressBar" ).value += 0.25
# obj.get_node( "MeshInstance" ).get_surface_material(0).albedo_color = Color( collision_info.normal ) # obj.get_node( "MeshInstance" ).get_surface_material(0).albedo_color = Color( collision_info.normal )
# if obj.has_method( "hit" ): # if obj.has_method( "hit" ):
# obj.hit( collision_info.position, collision_info.collider_velocity ) # obj.hit( collision_info.position, collision_info.collider_velocity )

8
scenes/Game/Game.tscn
View file

@ -242,14 +242,20 @@ material = SubResource( 8 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 0.4, 0.4 ) size = Vector2( 0.4, 0.4 )
[node name="Game" type="Spatial"] [node name="Game" type="Spatial" index="0"]
_sections_unfolded = [ "Transform" ]
[node name="Character" parent="." index="0" instance=ExtResource( 1 )] [node name="Character" parent="." index="0" instance=ExtResource( 1 )]
[node name="World" type="Spatial" parent="." index="1"] [node name="World" type="Spatial" parent="." index="1"]
_sections_unfolded = [ "Transform", "Visibility" ]
[node name="Terrain" parent="World" index="0" instance=ExtResource( 2 )] [node name="Terrain" parent="World" index="0" instance=ExtResource( 2 )]
_sections_unfolded = [ "Transform" ]
[node name="OmniLight" type="OmniLight" parent="World" index="1"] [node name="OmniLight" type="OmniLight" parent="World" index="1"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7.46929, 4.14904, -7.50301 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7.46929, 4.14904, -7.50301 )