diff --git a/project/assets/characters/player_fem/character_fem.blend b/project/assets/characters/player_fem/character_fem.blend index eceaf04c..1670122e 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.blend.import b/project/assets/characters/player_fem/character_fem.blend.import index c00745ef..f3b42a40 100644 --- a/project/assets/characters/player_fem/character_fem.blend.import +++ b/project/assets/characters/player_fem/character_fem.blend.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://ctp31vgapr25x" +uid="uid://grb3q5nd2uds" path="res://.godot/imported/character_fem.blend-e169cb46816e89cf00aa8e7f988a0574.scn" [deps] diff --git a/project/assets/characters/player_fem/character_fem.blend1 b/project/assets/characters/player_fem/character_fem.blend1 index d545e70c..a6f7632c 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 088a06cc..9f8eea5a 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 5a060658..a534f878 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 f1251619..1d600adb 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/style/model_importer.gd b/project/assets/style/model_importer.gd index 0f81e368..92ef55dc 100644 --- a/project/assets/style/model_importer.gd +++ b/project/assets/style/model_importer.gd @@ -3,7 +3,6 @@ extends EditorScenePostImport var regular_outline_material : StandardMaterial3D var character_outline_material : StandardMaterial3D -var outline_disable_flag : String = "-nooutline" func _post_import(root : Node): regular_outline_material = ResourceLoader.load("res://assets/style/base_outline_material.tres") as StandardMaterial3D @@ -11,13 +10,20 @@ func _post_import(root : Node): apply_outline_recursive(root) return root +func get_flag(node : Node, flag : String) -> bool: + if node.name.contains(flag): + node.name = node.name.erase(node.name.find(flag), flag.length()) + return true + else: + return false + func apply_outline_recursive(node : Node): if node != null: - 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 outline : bool = not get_flag(node, "-nooutline") + if outline and node is MeshInstance3D: + var detail : bool = get_flag(node, "-detailoutline") var mesh : MeshInstance3D = (node as MeshInstance3D) - if mesh.skeleton and character_outline_material: + if detail and character_outline_material: mesh.material_overlay = character_outline_material elif regular_outline_material: mesh.material_overlay = regular_outline_material