diff --git a/project/assets/characters/player_fem/character_fem.blend b/project/assets/characters/player_fem/character_fem.blend index 27b1c11c..eceaf04c 100644 Binary files a/project/assets/characters/player_fem/character_fem.blend and b/project/assets/characters/player_fem/character_fem.blend differ diff --git a/project/assets/characters/player_fem/character_fem.blend1 b/project/assets/characters/player_fem/character_fem.blend1 index edf0312e..d545e70c 100644 Binary files a/project/assets/characters/player_fem/character_fem.blend1 and b/project/assets/characters/player_fem/character_fem.blend1 differ diff --git a/project/assets/characters/player_fem/textures/Face.png b/project/assets/characters/player_fem/textures/Face.png index e66061c5..088a06cc 100644 Binary files a/project/assets/characters/player_fem/textures/Face.png and b/project/assets/characters/player_fem/textures/Face.png differ diff --git a/project/assets/environments/blockouts/cliffs_blockout.blend b/project/assets/environments/blockouts/cliffs_blockout.blend index 8d9936e4..5a060658 100644 Binary files a/project/assets/environments/blockouts/cliffs_blockout.blend and b/project/assets/environments/blockouts/cliffs_blockout.blend differ diff --git a/project/assets/environments/blockouts/cliffs_blockout.blend1 b/project/assets/environments/blockouts/cliffs_blockout.blend1 index dd48e0ad..f1251619 100644 Binary files a/project/assets/environments/blockouts/cliffs_blockout.blend1 and b/project/assets/environments/blockouts/cliffs_blockout.blend1 differ diff --git a/project/assets/environments/blockouts/terrain.png b/project/assets/environments/blockouts/terrain.png index 5cb2fcd0..c1ad7ab3 100644 Binary files a/project/assets/environments/blockouts/terrain.png and b/project/assets/environments/blockouts/terrain.png differ diff --git a/project/assets/environments/props/flower.blend b/project/assets/environments/props/flower.blend new file mode 100644 index 00000000..1779896f Binary files /dev/null and b/project/assets/environments/props/flower.blend differ diff --git a/project/assets/environments/props/flower.blend.import b/project/assets/environments/props/flower.blend.import new file mode 100644 index 00000000..40504356 --- /dev/null +++ b/project/assets/environments/props/flower.blend.import @@ -0,0 +1,60 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dyt1mwbep2012" +path="res://.godot/imported/flower.blend-a54f993c4db9e1bce792f272b6b1a837.scn" + +[deps] + +source_file="res://assets/environments/props/flower.blend" +dest_files=["res://.godot/imported/flower.blend-a54f993c4db9e1bce792f272b6b1a837.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="uid://ba7qlhj5ylm3d" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +blender/nodes/visible=0 +blender/nodes/active_collection_only=false +blender/nodes/punctual_lights=true +blender/nodes/cameras=true +blender/nodes/custom_properties=true +blender/nodes/modifiers=1 +blender/meshes/colors=false +blender/meshes/uvs=true +blender/meshes/normals=true +blender/meshes/export_geometry_nodes_instances=false +blender/meshes/gpu_instances=false +blender/meshes/tangents=true +blender/meshes/skins=2 +blender/meshes/export_bones_deforming_mesh_only=false +blender/materials/unpack_enabled=true +blender/materials/export_materials=1 +blender/animation/limit_playback=true +blender/animation/always_sample=true +blender/animation/group_tracks=true +gltf/naming_version=2 diff --git a/project/assets/environments/props/flower.blend1 b/project/assets/environments/props/flower.blend1 new file mode 100644 index 00000000..4c4147f4 Binary files /dev/null and b/project/assets/environments/props/flower.blend1 differ diff --git a/project/assets/environments/props/tree.blend b/project/assets/environments/props/tree.blend index 774a6342..67827690 100644 Binary files a/project/assets/environments/props/tree.blend and b/project/assets/environments/props/tree.blend differ diff --git a/project/assets/environments/props/tree.blend1 b/project/assets/environments/props/tree.blend1 index 2708d830..b115a91f 100644 Binary files a/project/assets/environments/props/tree.blend1 and b/project/assets/environments/props/tree.blend1 differ diff --git a/project/assets/style/base_outline_material.tres b/project/assets/style/base_outline_material.tres index 4f534405..2ad2ad85 100644 --- a/project/assets/style/base_outline_material.tres +++ b/project/assets/style/base_outline_material.tres @@ -1,6 +1,9 @@ [gd_resource type="StandardMaterial3D" format=3 uid="uid://cd4vnmrmj8cj7"] [resource] +transparency = 2 +alpha_scissor_threshold = 0.5 +alpha_antialiasing_mode = 0 cull_mode = 1 shading_mode = 0 diffuse_mode = 3 @@ -9,6 +12,6 @@ vertex_color_use_as_albedo = true albedo_color = Color(0.121152334, 0.121152334, 0.121152334, 1) grow = true grow_amount = 0.02 -proximity_fade_distance = 0.2 +proximity_fade_distance = 0.1 stencil_mode = 3 stencil_outline_thickness = 0.029 diff --git a/project/assets/style/character_outline_material.tres b/project/assets/style/character_outline_material.tres new file mode 100644 index 00000000..c1ad274e --- /dev/null +++ b/project/assets/style/character_outline_material.tres @@ -0,0 +1,17 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://02s3lq67141v"] + +[resource] +transparency = 2 +alpha_scissor_threshold = 0.5 +alpha_antialiasing_mode = 0 +cull_mode = 1 +shading_mode = 0 +diffuse_mode = 3 +specular_mode = 2 +vertex_color_use_as_albedo = true +albedo_color = Color(0.121152334, 0.121152334, 0.121152334, 1) +grow = true +grow_amount = 0.02 +proximity_fade_enabled = true +proximity_fade_distance = 0.25 +stencil_outline_thickness = 0.029 diff --git a/project/assets/style/model_importer.gd b/project/assets/style/model_importer.gd index ab9d269c..0f81e368 100644 --- a/project/assets/style/model_importer.gd +++ b/project/assets/style/model_importer.gd @@ -1,16 +1,25 @@ @tool extends EditorScenePostImport -var outline_material : StandardMaterial3D +var regular_outline_material : StandardMaterial3D +var character_outline_material : StandardMaterial3D +var outline_disable_flag : String = "-nooutline" func _post_import(root : Node): - outline_material = ResourceLoader.load("res://assets/style/base_outline_material.tres") as StandardMaterial3D + regular_outline_material = ResourceLoader.load("res://assets/style/base_outline_material.tres") as StandardMaterial3D + character_outline_material = ResourceLoader.load("res://assets/style/character_outline_material.tres") as StandardMaterial3D apply_outline_recursive(root) return root func apply_outline_recursive(node : Node): if node != null: - if node is MeshInstance3D and outline_material: - (node as MeshInstance3D).material_overlay = outline_material + if node.name.contains(outline_disable_flag): + node.name = node.name.erase(node.name.find(outline_disable_flag), outline_disable_flag.length()) + elif node is MeshInstance3D: + var mesh : MeshInstance3D = (node as MeshInstance3D) + if mesh.skeleton and character_outline_material: + mesh.material_overlay = character_outline_material + elif regular_outline_material: + mesh.material_overlay = regular_outline_material for child in node.get_children(): apply_outline_recursive(child) diff --git a/project/assets/vehicles/bike.blend b/project/assets/vehicles/bike.blend index 0a4448cf..64e2be72 100644 Binary files a/project/assets/vehicles/bike.blend and b/project/assets/vehicles/bike.blend differ diff --git a/project/assets/vehicles/bike.blend1 b/project/assets/vehicles/bike.blend1 index ef94d864..527bf971 100644 Binary files a/project/assets/vehicles/bike.blend1 and b/project/assets/vehicles/bike.blend1 differ diff --git a/project/assets/vehicles/sidecar.png b/project/assets/vehicles/sidecar.png new file mode 100644 index 00000000..a6bfd9cb Binary files /dev/null and b/project/assets/vehicles/sidecar.png differ diff --git a/project/assets/vehicles/sidecar.png.import b/project/assets/vehicles/sidecar.png.import new file mode 100644 index 00000000..e50d6c10 --- /dev/null +++ b/project/assets/vehicles/sidecar.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://csscfssydx1n4" +path.s3tc="res://.godot/imported/sidecar.png-10b8daaf663ef9108162d2fab75bc493.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/vehicles/sidecar.png" +dest_files=["res://.godot/imported/sidecar.png-10b8daaf663ef9108162d2fab75bc493.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/project/scenes/style_test_blockout.scn b/project/scenes/style_test_blockout.scn index 759f6b8a..4a93ffb1 100644 Binary files a/project/scenes/style_test_blockout.scn and b/project/scenes/style_test_blockout.scn differ