From b82a3772f9a7a1d192e33bbfbd6749009fd15d55 Mon Sep 17 00:00:00 2001 From: osquallo Date: Tue, 4 Sep 2018 15:05:41 +0200 Subject: [PATCH] Correction des parametre des materiaux du dispensaire. --- .../dispensaire_materials/ceramic_tiles.tres | 6 +- .../dispensaire_materials/plastic_base.tres | 4 +- .../dispensaire_materials/steel_glossy.tres | 4 +- dispensaire_gridmap/dispensaire_gridmap.tscn | 244 +++++++++++++++++- dispensaire_scenes/dispensaire_scenes.tscn | 180 ++++++++++++- game_scene/Game/Box.gd | 9 +- game_scene/Game/Character/Character.gd | 2 +- game_scene/Game/Game.tscn | 16 +- global.gd | 2 +- global.tscn | 2 +- login_scene/login_scene.tscn | 2 +- project.godot | 1 + test_grid_map/test_grid_map_meshs.tscn | 16 +- 13 files changed, 447 insertions(+), 41 deletions(-) diff --git a/assets/Game/basekits/dispensaire_materials/ceramic_tiles.tres b/assets/Game/basekits/dispensaire_materials/ceramic_tiles.tres index 61aaff8..0313996 100644 --- a/assets/Game/basekits/dispensaire_materials/ceramic_tiles.tres +++ b/assets/Game/basekits/dispensaire_materials/ceramic_tiles.tres @@ -15,10 +15,10 @@ flags_no_depth_test = false flags_use_point_size = false flags_world_triplanar = false flags_fixed_size = false -flags_albedo_tex_force_srgb = false +flags_albedo_tex_force_srgb = true vertex_color_use_as_albedo = false vertex_color_is_srgb = false -params_diffuse_mode = 0 +params_diffuse_mode = 1 params_specular_mode = 0 params_blend_mode = 0 params_cull_mode = 0 @@ -63,5 +63,5 @@ uv2_triplanar = false uv2_triplanar_sharpness = 1.0 proximity_fade_enable = false distance_fade_enable = false -_sections_unfolded = [ "Albedo", "Ambient Occlusion", "Metallic", "NormalMap", "Parameters", "Roughness", "Vertex Color" ] +_sections_unfolded = [ "Albedo", "Ambient Occlusion", "Flags", "Metallic", "NormalMap", "Roughness", "Vertex Color" ] diff --git a/assets/Game/basekits/dispensaire_materials/plastic_base.tres b/assets/Game/basekits/dispensaire_materials/plastic_base.tres index 4c6d9f4..1efe84a 100644 --- a/assets/Game/basekits/dispensaire_materials/plastic_base.tres +++ b/assets/Game/basekits/dispensaire_materials/plastic_base.tres @@ -15,10 +15,10 @@ flags_no_depth_test = false flags_use_point_size = false flags_world_triplanar = false flags_fixed_size = false -flags_albedo_tex_force_srgb = false +flags_albedo_tex_force_srgb = true vertex_color_use_as_albedo = false vertex_color_is_srgb = false -params_diffuse_mode = 0 +params_diffuse_mode = 1 params_specular_mode = 0 params_blend_mode = 0 params_cull_mode = 0 diff --git a/assets/Game/basekits/dispensaire_materials/steel_glossy.tres b/assets/Game/basekits/dispensaire_materials/steel_glossy.tres index afbb734..69d4b06 100644 --- a/assets/Game/basekits/dispensaire_materials/steel_glossy.tres +++ b/assets/Game/basekits/dispensaire_materials/steel_glossy.tres @@ -15,7 +15,7 @@ flags_no_depth_test = false flags_use_point_size = false flags_world_triplanar = false flags_fixed_size = false -flags_albedo_tex_force_srgb = false +flags_albedo_tex_force_srgb = true vertex_color_use_as_albedo = false vertex_color_is_srgb = false params_diffuse_mode = 0 @@ -60,5 +60,5 @@ uv2_triplanar = false uv2_triplanar_sharpness = 1.0 proximity_fade_enable = false distance_fade_enable = false -_sections_unfolded = [ "Albedo", "Metallic", "NormalMap", "Roughness" ] +_sections_unfolded = [ "Albedo", "Flags", "Metallic", "NormalMap", "Roughness" ] diff --git a/dispensaire_gridmap/dispensaire_gridmap.tscn b/dispensaire_gridmap/dispensaire_gridmap.tscn index 53ccca2..2de52e2 100644 --- a/dispensaire_gridmap/dispensaire_gridmap.tscn +++ b/dispensaire_gridmap/dispensaire_gridmap.tscn @@ -1,13 +1,91 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://assets/Game/basekits/Kit_dispensaire.meshlib" type="MeshLibrary" id=1] [ext_resource path="res://game_scene/Game/portail/portail.tscn" type="PackedScene" id=2] -[node name="dispensaire_gridmap" type="Node"] +[sub_resource type="Environment" id=1] + +background_mode = 0 +background_sky_custom_fov = 0.0 +background_color = Color( 0, 0, 0, 1 ) +background_energy = 1.0 +background_canvas_max_layer = 0 +ambient_light_color = Color( 0, 0, 0, 1 ) +ambient_light_energy = 1.0 +ambient_light_sky_contribution = 1.0 +fog_enabled = false +fog_color = Color( 0.5, 0.6, 0.7, 1 ) +fog_sun_color = Color( 1, 0.9, 0.7, 1 ) +fog_sun_amount = 0.0 +fog_depth_enabled = true +fog_depth_begin = 10.0 +fog_depth_curve = 1.0 +fog_transmit_enabled = false +fog_transmit_curve = 1.0 +fog_height_enabled = false +fog_height_min = 0.0 +fog_height_max = 100.0 +fog_height_curve = 1.0 +tonemap_mode = 0 +tonemap_exposure = 1.0 +tonemap_white = 1.0 +auto_exposure_enabled = false +auto_exposure_scale = 0.4 +auto_exposure_min_luma = 0.05 +auto_exposure_max_luma = 8.0 +auto_exposure_speed = 0.5 +ss_reflections_enabled = false +ss_reflections_max_steps = 64 +ss_reflections_fade_in = 0.15 +ss_reflections_fade_out = 2.0 +ss_reflections_depth_tolerance = 0.2 +ss_reflections_roughness = true +ssao_enabled = false +ssao_radius = 1.0 +ssao_intensity = 1.0 +ssao_radius2 = 0.0 +ssao_intensity2 = 1.0 +ssao_bias = 0.01 +ssao_light_affect = 0.0 +ssao_color = Color( 0, 0, 0, 1 ) +ssao_quality = 0 +ssao_blur = 3 +ssao_edge_sharpness = 4.0 +dof_blur_far_enabled = false +dof_blur_far_distance = 10.0 +dof_blur_far_transition = 5.0 +dof_blur_far_amount = 0.1 +dof_blur_far_quality = 1 +dof_blur_near_enabled = false +dof_blur_near_distance = 2.0 +dof_blur_near_transition = 1.0 +dof_blur_near_amount = 0.1 +dof_blur_near_quality = 1 +glow_enabled = false +glow_levels/1 = false +glow_levels/2 = false +glow_levels/3 = true +glow_levels/4 = false +glow_levels/5 = true +glow_levels/6 = false +glow_levels/7 = false +glow_intensity = 0.8 +glow_strength = 1.0 +glow_bloom = 0.0 +glow_blend_mode = 2 +glow_hdr_threshold = 1.0 +glow_hdr_scale = 2.0 +glow_bicubic_upscale = false +adjustment_enabled = false +adjustment_brightness = 1.0 +adjustment_contrast = 1.0 +adjustment_saturation = 1.0 + +[node name="dispensaire_gridmap" type="Node" index="0"] [node name="start_position" type="Spatial" parent="." index="0"] -transform = Transform( 0.999997, 0, -0.002267, 0, 1, 0, 0.002267, 0, 0.999997, -1.73618, 2.22498, 1.81192 ) +transform = Transform( 0.999997, 0, -0.002267, 0, 1, 0, 0.002267, 0, 0.999997, -1.73618, 2.22498, -1.84151 ) [node name="world" type="Spatial" parent="." index="1"] @@ -23,7 +101,7 @@ cell_scale = 1.0 collision_layer = 1 collision_mask = 1 data = { -"cells": PoolIntArray( 3, 0, 655361, 5, 0, 655361, 65535, 0, 1048579, 2, 65534, 1, 4, 65534, 1, 0, 65535, 1441797, 1, 65535, 1441797, 2, 65535, 538312710, 3, 65535, 1048582, 4, 65535, 1441798, 5, 65535, 1048582, 6, 65535, 1441793, 65535, 65535, 1048578 ) +"cells": PoolIntArray( 3, 0, 655361, 5, 0, 655361, 65535, 0, 537919491, 2, 65534, 1, 4, 65534, 1, 0, 65535, 538312709, 1, 65535, 1441797, 2, 65535, 1441798, 3, 65535, 1048582, 4, 65535, 1441798, 5, 65535, 1048582, 6, 65535, 1441793, 65535, 65535, 1048578 ) } _sections_unfolded = [ "Cell" ] __meta__ = { @@ -35,4 +113,162 @@ __meta__ = { transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.65801, 0, 3.40425 ) scene_path = NodePath("res://game_scene/Game/Game.tscn") +[node name="world_environment" type="WorldEnvironment" parent="world" index="2"] + +environment = SubResource( 1 ) + +[node name="omni_light" type="OmniLight" parent="." index="2"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.10265, 3.33108, 2.24407 ) +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 1.0 +light_indirect_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +omni_range = 5.0 +omni_attenuation = 1.0 +omni_shadow_mode = 1 +omni_shadow_detail = 1 + +[node name="omni_light2" type="OmniLight" parent="." index="3"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.92399, 3.33108, -1.77007 ) +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 1.0 +light_indirect_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +omni_range = 5.0 +omni_attenuation = 1.0 +omni_shadow_mode = 1 +omni_shadow_detail = 1 + +[node name="omni_light3" type="OmniLight" parent="." index="4"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.61797, 3.33108, -1.39791 ) +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 1.0 +light_indirect_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +omni_range = 5.0 +omni_attenuation = 1.0 +omni_shadow_mode = 1 +omni_shadow_detail = 1 + +[node name="omni_light4" type="OmniLight" parent="." index="5"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8.6697, 3.33108, -1.75052 ) +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 1.0 +light_indirect_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +omni_range = 5.0 +omni_attenuation = 1.0 +omni_shadow_mode = 1 +omni_shadow_detail = 1 + +[node name="omni_light5" type="OmniLight" parent="." index="6"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 12.2862, 3.33108, -1.55863 ) +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 1.0 +light_indirect_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +omni_range = 5.0 +omni_attenuation = 1.0 +omni_shadow_mode = 1 +omni_shadow_detail = 1 + +[node name="omni_light6" type="OmniLight" parent="." index="7"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15.9343, 3.33108, -1.71557 ) +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 1.0 +light_indirect_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +omni_range = 5.0 +omni_attenuation = 1.0 +omni_shadow_mode = 1 +omni_shadow_detail = 1 + +[node name="omni_light7" type="OmniLight" parent="." index="8"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 19.2111, 3.33108, -1.80768 ) +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 1.0 +light_indirect_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +omni_range = 5.0 +omni_attenuation = 1.0 +omni_shadow_mode = 1 +omni_shadow_detail = 1 + diff --git a/dispensaire_scenes/dispensaire_scenes.tscn b/dispensaire_scenes/dispensaire_scenes.tscn index 79c622c..6dd73d1 100644 --- a/dispensaire_scenes/dispensaire_scenes.tscn +++ b/dispensaire_scenes/dispensaire_scenes.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor1wDoLRAA01.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor2wDoLAA01.tscn" type="PackedScene" id=2] @@ -6,14 +6,92 @@ [ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor2wDoLRAA01.tscn" type="PackedScene" id=4] [ext_resource path="res://game_scene/Game/portail/portail.tscn" type="PackedScene" id=5] +[sub_resource type="Environment" id=1] + +background_mode = 0 +background_sky_custom_fov = 0.0 +background_color = Color( 0, 0, 0, 1 ) +background_energy = 1.0 +background_canvas_max_layer = 0 +ambient_light_color = Color( 0, 0, 0, 1 ) +ambient_light_energy = 1.0 +ambient_light_sky_contribution = 1.0 +fog_enabled = false +fog_color = Color( 0.5, 0.6, 0.7, 1 ) +fog_sun_color = Color( 1, 0.9, 0.7, 1 ) +fog_sun_amount = 0.0 +fog_depth_enabled = true +fog_depth_begin = 10.0 +fog_depth_curve = 1.0 +fog_transmit_enabled = false +fog_transmit_curve = 1.0 +fog_height_enabled = false +fog_height_min = 0.0 +fog_height_max = 100.0 +fog_height_curve = 1.0 +tonemap_mode = 0 +tonemap_exposure = 1.0 +tonemap_white = 1.0 +auto_exposure_enabled = false +auto_exposure_scale = 0.4 +auto_exposure_min_luma = 0.05 +auto_exposure_max_luma = 8.0 +auto_exposure_speed = 0.5 +ss_reflections_enabled = false +ss_reflections_max_steps = 64 +ss_reflections_fade_in = 0.15 +ss_reflections_fade_out = 2.0 +ss_reflections_depth_tolerance = 0.2 +ss_reflections_roughness = true +ssao_enabled = false +ssao_radius = 1.0 +ssao_intensity = 1.0 +ssao_radius2 = 0.0 +ssao_intensity2 = 1.0 +ssao_bias = 0.01 +ssao_light_affect = 0.0 +ssao_color = Color( 0, 0, 0, 1 ) +ssao_quality = 0 +ssao_blur = 3 +ssao_edge_sharpness = 4.0 +dof_blur_far_enabled = false +dof_blur_far_distance = 10.0 +dof_blur_far_transition = 5.0 +dof_blur_far_amount = 0.1 +dof_blur_far_quality = 1 +dof_blur_near_enabled = false +dof_blur_near_distance = 2.0 +dof_blur_near_transition = 1.0 +dof_blur_near_amount = 0.1 +dof_blur_near_quality = 1 +glow_enabled = false +glow_levels/1 = false +glow_levels/2 = false +glow_levels/3 = true +glow_levels/4 = false +glow_levels/5 = true +glow_levels/6 = false +glow_levels/7 = false +glow_intensity = 0.8 +glow_strength = 1.0 +glow_bloom = 0.0 +glow_blend_mode = 2 +glow_hdr_threshold = 1.0 +glow_hdr_scale = 2.0 +glow_bicubic_upscale = false +adjustment_enabled = false +adjustment_brightness = 1.0 +adjustment_contrast = 1.0 +adjustment_saturation = 1.0 +_sections_unfolded = [ "Ambient Light", "Background" ] + [node name="dispensaire_scenes" type="Node"] [node name="world" type="Spatial" parent="." index="0"] -editor/display_folded = true - [node name="DisCor1wDoLRAA01" parent="world" index="0" instance=ExtResource( 1 )] +editor/display_folded = true transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, -1, 0, 0 ) _sections_unfolded = [ "material" ] @@ -23,7 +101,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.49329, -2.38419e-007, 3.4949 [node name="DisCor1wAA01" parent="world/DisCor1wDoLRAA01/DisCor2wDoLAA01" index="1" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -3.50318, -9.72748e-005, -0.00448728 ) +transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -3.50318, -9.72748e-005, -0.00448775 ) [node name="DisCor2wDoLAA02" parent="world/DisCor1wDoLRAA01" index="2" instance=ExtResource( 2 )] @@ -49,6 +127,94 @@ transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -3.48 transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, -4.48443, 0, 0.0136418 ) +[node name="omni_light" type="OmniLight" parent="world" index="2"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.902615, 3.38903, -2.44601 ) +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 1.0 +light_indirect_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +omni_range = 4.71185 +omni_attenuation = 1.0 +omni_shadow_mode = 1 +omni_shadow_detail = 1 + +[node name="omni_light2" type="OmniLight" parent="world" index="3"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.57933, 3.38903, -2.44601 ) +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 1.0 +light_indirect_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +omni_range = 4.44127 +omni_attenuation = 1.0 +omni_shadow_mode = 1 +omni_shadow_detail = 1 + +[node name="omni_light3" type="OmniLight" parent="world" index="4"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.57933, 3.38903, -7.06504 ) +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 1.0 +light_indirect_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +omni_range = 4.89511 +omni_attenuation = 1.0 +omni_shadow_mode = 1 +omni_shadow_detail = 1 + +[node name="omni_light4" type="OmniLight" parent="world" index="5"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.57933, 3.38903, -10.7416 ) +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 1.0 +light_indirect_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +omni_range = 6.84121 +omni_attenuation = 1.0 +omni_shadow_mode = 1 +omni_shadow_detail = 1 + [node name="portail" parent="." index="1" instance=ExtResource( 5 )] transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 0.679648, -1, 2.97083e-008 ) @@ -57,6 +223,10 @@ start_position_path = NodePath("World/portail_scenes/start_position") [node name="start_position" type="Spatial" parent="." index="2"] -transform = Transform( -1, 0, -1.50996e-007, 0, 1, 0, 1.50996e-007, 0, -1, -1.33112, 0, 0 ) +transform = Transform( -1, 0, -1.50996e-007, 0, 1, 0, 1.50996e-007, 0, -1, -4.98969, 0, 0 ) + +[node name="world_environment" type="WorldEnvironment" parent="." index="3"] + +environment = SubResource( 1 ) diff --git a/game_scene/Game/Box.gd b/game_scene/Game/Box.gd index 7726721..177a872 100644 --- a/game_scene/Game/Box.gd +++ b/game_scene/Game/Box.gd @@ -1,7 +1,8 @@ extends RigidBody func _on_Box_sleeping_state_changed(): - if self.sleeping: - $MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 1.0, 0.0, 1 ) - else: - $MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 0.0, 1.0, 1 ) \ No newline at end of file +# if self.sleeping: +# $MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 1.0, 0.0, 1 ) +# else: +# $MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 0.0, 1.0, 1 ) + pass \ No newline at end of file diff --git a/game_scene/Game/Character/Character.gd b/game_scene/Game/Character/Character.gd index cc0d1ad..9b9b4f3 100644 --- a/game_scene/Game/Character/Character.gd +++ b/game_scene/Game/Character/Character.gd @@ -154,7 +154,7 @@ func process_movement(delta): obj.sleeping = false obj.apply_impulse( collision_info.position, -collision_info.normal*delta ) 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 ) self.douleur += 0.25 if self.douleur >= 100: self.trauma += 0.25 diff --git a/game_scene/Game/Game.tscn b/game_scene/Game/Game.tscn index f17e90f..bf02459 100644 --- a/game_scene/Game/Game.tscn +++ b/game_scene/Game/Game.tscn @@ -255,11 +255,11 @@ points = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, -1, 0, -1 ) script/source = "extends RigidBody func _on_Box_sleeping_state_changed(): - if self.sleeping: - $MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 1.0, 0.0, 1 ) - else: - $MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 0.0, 1.0, 1 ) - +# if self.sleeping: +# $MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 1.0, 0.0, 1 ) +# else: +# $MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 0.0, 1.0, 1 ) + pass " [sub_resource type="CubeMesh" id=10] @@ -280,8 +280,8 @@ flags_no_depth_test = false flags_use_point_size = false flags_world_triplanar = false flags_fixed_size = false -flags_albedo_tex_force_srgb = false -vertex_color_use_as_albedo = true +flags_albedo_tex_force_srgb = true +vertex_color_use_as_albedo = false vertex_color_is_srgb = false params_diffuse_mode = 0 params_specular_mode = 0 @@ -1179,7 +1179,6 @@ disabled = false [node name="Box" type="RigidBody" parent="World" index="5"] -editor/display_folded = true transform = Transform( 0.640199, 0.768209, 0, -0.650662, 0.542239, -0.531616, -0.408393, 0.34034, 0.846985, 1.68693, 3.13013, -6.48976 ) input_ray_pickable = true input_capture_on_drag = false @@ -1235,7 +1234,6 @@ _sections_unfolded = [ "Transform" ] [node name="Box2" type="RigidBody" parent="World" index="6"] -editor/display_folded = true transform = Transform( 0.640199, 0.768209, 0, -0.650662, 0.542239, -0.531616, -0.408393, 0.34034, 0.846985, -3.00203, 8.74323, -4.47902 ) input_ray_pickable = true input_capture_on_drag = false diff --git a/global.gd b/global.gd index 379d72c..12688e1 100644 --- a/global.gd +++ b/global.gd @@ -3,7 +3,7 @@ extends Node const WINDOW_TITLE_INPUT = "GUI/Settings/Menus/TabContainer/Test/ScrollContainer/VBoxContainer/TitleBox/Title" #### Environment -var time_scale = 0.1 +var time_scale = 0.01 # ##### Character diff --git a/global.tscn b/global.tscn index 6e1eca4..218073e 100644 --- a/global.tscn +++ b/global.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://background_loader_scene/background_loader.tscn" type="PackedScene" id=2] [ext_resource path="res://gui_scene/GUI/GUI.tscn" type="PackedScene" id=3] -[node name="global" type="Node"] +[node name="global" type="Node" index="0"] pause_mode = 2 script = ExtResource( 1 ) diff --git a/login_scene/login_scene.tscn b/login_scene/login_scene.tscn index cdb55ec..b31d4b4 100644 --- a/login_scene/login_scene.tscn +++ b/login_scene/login_scene.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://login_scene/character_selection_menu.tscn" type="PackedScene" id=2] [ext_resource path="res://gui_scene/GUI/login/login_menu.tscn" type="PackedScene" id=3] -[node name="login_scene" type="Node" index="0"] +[node name="login_scene" type="Node"] script = ExtResource( 1 ) diff --git a/project.godot b/project.godot index bd743d3..95bab8b 100644 --- a/project.godot +++ b/project.godot @@ -117,3 +117,4 @@ quality/subsurface_scattering/follow_surface=true environment/default_clear_color=Color( 0, 0, 0, 1 ) quality/filters/msaa=3 environment/default_environment="res://default_env.tres" +quality/dynamic_fonts/use_oversampling=true diff --git a/test_grid_map/test_grid_map_meshs.tscn b/test_grid_map/test_grid_map_meshs.tscn index 6237108..976f91e 100644 --- a/test_grid_map/test_grid_map_meshs.tscn +++ b/test_grid_map/test_grid_map_meshs.tscn @@ -11,19 +11,19 @@ points = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, -1, 3, 1, 1, 3, -1, 1, 0, -1, -1, 3, -1, -1, 0, -1, -1, 3, 1, -1, 0, 1, 1, 3, 1, 1, 0, 1, 1, 3, 1, 1, 0, 1, 1, 3, -1, 1, 0, -1 ) -[sub_resource type="ConvexPolygonShape" id=4] +[sub_resource type="ConvexPolygonShape" id=2] points = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, -1, 3, 1, 1, 3, -1, 1, 0, -1, -1, 3, -1, -1, 0, -1, -1, 3, 1, -1, 0, 1, 1, 3, 1, 1, 0, 1 ) -[sub_resource type="ConvexPolygonShape" id=7] +[sub_resource type="ConvexPolygonShape" id=3] points = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, -1, 3, 1, 1, 3, -1, 1, 0, -1, -1, 3, -1, -1, 0, -1 ) -[sub_resource type="ConvexPolygonShape" id=10] +[sub_resource type="ConvexPolygonShape" id=4] points = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, -1, 3, 1 ) -[sub_resource type="ConvexPolygonShape" id=13] +[sub_resource type="ConvexPolygonShape" id=5] points = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, -1, 3, 1, 1, 3, -1, 1, 0, -1, -1, 3, -1, -1, 0, -1, 1, 3, 1, 1, 0, 1, 1, 3, -1, 1, 0, -1 ) @@ -91,7 +91,7 @@ constant_angular_velocity = Vector3( 0, 0, 0 ) [node name="collision_shape" type="CollisionShape" parent="kit_test_2way/static_body" index="0"] -shape = SubResource( 4 ) +shape = SubResource( 2 ) disabled = false [node name="kit_test_3way" type="MeshInstance" parent="." index="2"] @@ -124,7 +124,7 @@ constant_angular_velocity = Vector3( 0, 0, 0 ) [node name="collision_shape" type="CollisionShape" parent="kit_test_3way/static_body" index="0"] -shape = SubResource( 7 ) +shape = SubResource( 3 ) disabled = false [node name="kit_test_4way" type="MeshInstance" parent="." index="3"] @@ -157,7 +157,7 @@ constant_angular_velocity = Vector3( 0, 0, 0 ) [node name="collision_shape" type="CollisionShape" parent="kit_test_4way/static_body" index="0"] -shape = SubResource( 10 ) +shape = SubResource( 4 ) disabled = false [node name="kit_test_corner" type="MeshInstance" parent="." index="4"] @@ -190,7 +190,7 @@ constant_angular_velocity = Vector3( 0, 0, 0 ) [node name="collision_shape" type="CollisionShape" parent="kit_test_corner/static_body" index="0"] -shape = SubResource( 13 ) +shape = SubResource( 5 ) disabled = false