summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editor/editor_property_name_processor.cpp1
-rw-r--r--editor/plugins/visual_shader_editor_plugin.cpp1
-rwxr-xr-xeditor/translations/extract.py168
-rw-r--r--modules/fbx/editor_scene_importer_fbx.cpp24
-rw-r--r--modules/fbx/editor_scene_importer_fbx.h3
-rw-r--r--modules/text_server_adv/SCsub7
-rw-r--r--scene/resources/visual_shader.cpp1
-rw-r--r--servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp1
-rw-r--r--servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp1
-rw-r--r--servers/rendering/shader_types.cpp1
10 files changed, 64 insertions, 144 deletions
diff --git a/editor/editor_property_name_processor.cpp b/editor/editor_property_name_processor.cpp
index d89247b429..af4ae3e576 100644
--- a/editor/editor_property_name_processor.cpp
+++ b/editor/editor_property_name_processor.cpp
@@ -125,6 +125,7 @@ EditorPropertyNameProcessor::EditorPropertyNameProcessor() {
capitalize_string_remaps["dtls"] = "DTLS";
capitalize_string_remaps["etc"] = "ETC";
capitalize_string_remaps["etc2"] = "ETC2";
+ capitalize_string_remaps["fbx"] = "FBX";
capitalize_string_remaps["fft"] = "FFT";
capitalize_string_remaps["fov"] = "FOV";
capitalize_string_remaps["fps"] = "FPS";
diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp
index 55c1651d16..580e71a788 100644
--- a/editor/plugins/visual_shader_editor_plugin.cpp
+++ b/editor/plugins/visual_shader_editor_plugin.cpp
@@ -5047,7 +5047,6 @@ VisualShaderEditor::VisualShaderEditor() {
add_options.push_back(AddOption("LightColor", "Input", "Light", "VisualShaderNodeInput", vformat(input_param_for_light_shader_mode, "light_color", "LIGHT_COLOR"), { "light_color" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL));
add_options.push_back(AddOption("Metallic", "Input", "Light", "VisualShaderNodeInput", vformat(input_param_for_light_shader_mode, "metallic", "METALLIC"), { "metallic" }, VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL));
add_options.push_back(AddOption("Roughness", "Input", "Light", "VisualShaderNodeInput", vformat(input_param_for_light_shader_mode, "roughness", "ROUGHNESS"), { "roughness" }, VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL));
- add_options.push_back(AddOption("ShadowAttenuation", "Input", "Light", "VisualShaderNodeInput", vformat(input_param_for_light_shader_mode, "shadow_attenuation", "SHADOW_ATTENUATION"), { "shadow_attenuation" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL));
add_options.push_back(AddOption("Specular", "Input", "Light", "VisualShaderNodeInput", vformat(input_param_for_light_shader_mode, "specular", "SPECULAR_LIGHT"), { "specular" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL));
add_options.push_back(AddOption("View", "Input", "Light", "VisualShaderNodeInput", vformat(input_param_for_fragment_and_light_shader_modes, "view", "VIEW"), { "view" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL));
diff --git a/editor/translations/extract.py b/editor/translations/extract.py
index 8737eb5204..4a7e87e271 100755
--- a/editor/translations/extract.py
+++ b/editor/translations/extract.py
@@ -9,6 +9,40 @@ import subprocess
import sys
+class Message:
+ __slots__ = ("msgid", "msgid_plural", "msgctxt", "comments", "locations")
+
+ def format(self):
+ lines = []
+
+ if self.comments:
+ for i, content in enumerate(self.comments):
+ prefix = "#. TRANSLATORS:" if i == 0 else "#."
+ lines.append(prefix + content)
+
+ lines.append("#: " + " ".join(self.locations))
+
+ if self.msgctxt:
+ lines.append('msgctxt "{}"'.format(self.msgctxt))
+
+ if self.msgid_plural:
+ lines += [
+ 'msgid "{}"'.format(self.msgid),
+ 'msgid_plural "{}"'.format(self.msgid_plural),
+ 'msgstr[0] ""',
+ 'msgstr[1] ""',
+ ]
+ else:
+ lines += [
+ 'msgid "{}"'.format(self.msgid),
+ 'msgstr ""',
+ ]
+
+ return "\n".join(lines)
+
+
+messages_map = {} # (id, context) -> Message.
+
line_nb = False
for arg in sys.argv[1:]:
@@ -42,9 +76,6 @@ with open("editor/editor_property_name_processor.cpp") as f:
remaps[m.group("from")] = m.group("to")
-unique_str = []
-unique_loc = {}
-ctx_group = {} # Store msgctx, msg, and locations.
main_po = """
# LANGUAGE translation of the Godot Engine editor.
# Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.
@@ -119,95 +150,6 @@ def _process_editor_string(name):
return " ".join(capitalized_parts)
-def _write_message(msgctx, msg, msg_plural, location):
- global main_po
- main_po += "#: " + location + "\n"
- if msgctx != "":
- main_po += 'msgctxt "' + msgctx + '"\n'
- main_po += 'msgid "' + msg + '"\n'
- if msg_plural != "":
- main_po += 'msgid_plural "' + msg_plural + '"\n'
- main_po += 'msgstr[0] ""\n'
- main_po += 'msgstr[1] ""\n\n'
- else:
- main_po += 'msgstr ""\n\n'
-
-
-def _add_additional_location(msgctx, msg, location):
- global main_po
- # Add additional location to previous occurrence.
- if msgctx != "":
- msg_pos = main_po.find('\nmsgctxt "' + msgctx + '"\nmsgid "' + msg + '"')
- else:
- msg_pos = main_po.find('\nmsgid "' + msg + '"')
-
- if msg_pos == -1:
- print("Someone apparently thought writing Python was as easy as GDScript. Ping Akien.")
- main_po = main_po[:msg_pos] + " " + location + main_po[msg_pos:]
-
-
-def _write_translator_comment(msgctx, msg, translator_comment):
- if translator_comment == "":
- return
-
- global main_po
- if msgctx != "":
- msg_pos = main_po.find('\nmsgctxt "' + msgctx + '"\nmsgid "' + msg + '"')
- else:
- msg_pos = main_po.find('\nmsgid "' + msg + '"')
-
- # If it's a new message, just append comment to the end of PO file.
- if msg_pos == -1:
- main_po += _format_translator_comment(translator_comment, True)
- return
-
- # Find position just before location. Translator comment will be added there.
- translator_comment_pos = main_po.rfind("\n\n#", 0, msg_pos) + 2
- if translator_comment_pos - 2 == -1:
- print("translator_comment_pos not found")
- return
-
- # Check if a previous translator comment already exists. If so, merge them together.
- if main_po.find("TRANSLATORS:", translator_comment_pos, msg_pos) != -1:
- translator_comment_pos = main_po.find("\n#:", translator_comment_pos, msg_pos) + 1
- if translator_comment_pos == 0:
- print('translator_comment_pos after "TRANSLATORS:" not found')
- return
- main_po = (
- main_po[:translator_comment_pos]
- + _format_translator_comment(translator_comment, False)
- + main_po[translator_comment_pos:]
- )
- return
-
- main_po = (
- main_po[:translator_comment_pos]
- + _format_translator_comment(translator_comment, True)
- + main_po[translator_comment_pos:]
- )
-
-
-def _format_translator_comment(comment, new):
- if not comment:
- return ""
-
- comment_lines = comment.split("\n")
-
- formatted_comment = ""
- if not new:
- for comment in comment_lines:
- formatted_comment += "#. " + comment.strip() + "\n"
- return formatted_comment
-
- formatted_comment = "#. TRANSLATORS: "
- for i in range(len(comment_lines)):
- if i == 0:
- formatted_comment += comment_lines[i].strip() + "\n"
- else:
- formatted_comment += "#. " + comment_lines[i].strip() + "\n"
- return formatted_comment
-
-
def _is_block_translator_comment(translator_line):
line = translator_line.strip()
if line.find("//") == 0:
@@ -301,32 +243,20 @@ def process_file(f, fname):
def _add_message(msg, msg_plural, msgctx, location, translator_comment):
- global main_po, unique_str, unique_loc
-
- # Write translator comment.
- _write_translator_comment(msgctx, msg, translator_comment)
- translator_comment = ""
-
- if msgctx != "":
- # If it's a new context or a new message within an existing context, then write new msgid.
- # Else add location to existing msgid.
- if not msgctx in ctx_group:
- _write_message(msgctx, msg, msg_plural, location)
- ctx_group[msgctx] = {msg: [location]}
- elif not msg in ctx_group[msgctx]:
- _write_message(msgctx, msg, msg_plural, location)
- ctx_group[msgctx][msg] = [location]
- elif not location in ctx_group[msgctx][msg]:
- _add_additional_location(msgctx, msg, location)
- ctx_group[msgctx][msg].append(location)
- else:
- if not msg in unique_str:
- _write_message(msgctx, msg, msg_plural, location)
- unique_str.append(msg)
- unique_loc[msg] = [location]
- elif not location in unique_loc[msg]:
- _add_additional_location(msgctx, msg, location)
- unique_loc[msg].append(location)
+ key = (msg, msgctx)
+ message = messages_map.get(key)
+ if not message:
+ message = Message()
+ message.msgid = msg
+ message.msgid_plural = msg_plural
+ message.msgctxt = msgctx
+ message.locations = []
+ message.comments = []
+ messages_map[key] = message
+ if location not in message.locations:
+ message.locations.append(location)
+ if translator_comment and translator_comment not in message.comments:
+ message.comments.append(translator_comment)
print("Updating the editor.pot template...")
@@ -335,6 +265,8 @@ for fname in matches:
with open(fname, "r", encoding="utf8") as f:
process_file(f, fname)
+main_po += "\n\n".join(message.format() for message in messages_map.values())
+
with open("editor.pot", "w") as f:
f.write(main_po)
diff --git a/modules/fbx/editor_scene_importer_fbx.cpp b/modules/fbx/editor_scene_importer_fbx.cpp
index ca10594a42..afaeb15708 100644
--- a/modules/fbx/editor_scene_importer_fbx.cpp
+++ b/modules/fbx/editor_scene_importer_fbx.cpp
@@ -58,24 +58,8 @@
void EditorSceneFormatImporterFBX::get_extensions(List<String> *r_extensions) const {
// register FBX as the one and only format for FBX importing
- const String import_setting_string = "filesystem/import/fbx/";
- const String fbx_str = "fbx";
- Vector<String> exts;
- exts.push_back(fbx_str);
- _register_project_setting_import(fbx_str, import_setting_string, exts, r_extensions, true);
-}
-
-void EditorSceneFormatImporterFBX::_register_project_setting_import(const String generic,
- const String import_setting_string,
- const Vector<String> &exts,
- List<String> *r_extensions,
- const bool p_enabled) const {
- const String use_generic = "use_" + generic;
- _GLOBAL_DEF(import_setting_string + use_generic, p_enabled, true);
- if (ProjectSettings::get_singleton()->get(import_setting_string + use_generic)) {
- for (int32_t i = 0; i < exts.size(); i++) {
- r_extensions->push_back(exts[i]);
- }
+ if (GLOBAL_GET("filesystem/import/fbx/use_fbx")) {
+ r_extensions->push_back("fbx");
}
}
@@ -1473,3 +1457,7 @@ Ref<Animation> EditorSceneFormatImporterFBX::import_animation(const String &p_pa
int p_bake_fps) {
return Ref<Animation>();
}
+
+EditorSceneFormatImporterFBX::EditorSceneFormatImporterFBX() {
+ _GLOBAL_DEF("filesystem/import/fbx/use_fbx", true, true);
+}
diff --git a/modules/fbx/editor_scene_importer_fbx.h b/modules/fbx/editor_scene_importer_fbx.h
index eebcb86409..fb72f93feb 100644
--- a/modules/fbx/editor_scene_importer_fbx.h
+++ b/modules/fbx/editor_scene_importer_fbx.h
@@ -119,10 +119,9 @@ private:
template <class T>
T _interpolate_track(const Vector<float> &p_times, const Vector<T> &p_values, float p_time, AssetImportAnimation::Interpolation p_interp);
- void _register_project_setting_import(const String generic, const String import_setting_string, const Vector<String> &exts, List<String> *r_extensions, const bool p_enabled) const;
public:
- EditorSceneFormatImporterFBX() {}
+ EditorSceneFormatImporterFBX();
~EditorSceneFormatImporterFBX() {}
virtual void get_extensions(List<String> *r_extensions) const override;
diff --git a/modules/text_server_adv/SCsub b/modules/text_server_adv/SCsub
index dfd3bb3f1e..525d4d3efb 100644
--- a/modules/text_server_adv/SCsub
+++ b/modules/text_server_adv/SCsub
@@ -122,7 +122,7 @@ if env["builtin_harfbuzz"]:
env_harfbuzz.Append(CCFLAGS=["-DHAVE_ICU"])
if env["builtin_icu"]:
env_harfbuzz.Append(CPPPATH=["#thirdparty/icu4c/common/"])
- env_harfbuzz.Append(CCFLAGS=["-DHAVE_ICU_BUILTIN"])
+ env_harfbuzz.Append(CCFLAGS=["-DU_HAVE_LIB_SUFFIX=1", "-DU_LIB_SUFFIX_C_NAME=_godot", "-DHAVE_ICU_BUILTIN"])
if freetype_enabled:
env_harfbuzz.Append(
@@ -464,11 +464,16 @@ if env["builtin_icu"]:
"-DUCONFIG_NO_FILE_IO",
"-DUCONFIG_NO_TRANSLITERATION",
"-DPKGDATA_MODE=static",
+ "-DU_ENABLE_DYLOAD=0",
+ "-DU_HAVE_LIB_SUFFIX=1",
+ "-DU_LIB_SUFFIX_C_NAME=_godot",
"-DICU_DATA_NAME=" + icu_data_name,
]
)
env_text_server_adv.Append(
CXXFLAGS=[
+ "-DU_HAVE_LIB_SUFFIX=1",
+ "-DU_LIB_SUFFIX_C_NAME=_godot",
"-DICU_DATA_NAME=" + icu_data_name,
]
)
diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp
index 63bed921f1..129f76702e 100644
--- a/scene/resources/visual_shader.cpp
+++ b/scene/resources/visual_shader.cpp
@@ -2627,7 +2627,6 @@ const VisualShaderNodeInput::Port VisualShaderNodeInput::ports[] = {
{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_3D, "light", "LIGHT" },
{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_3D, "light_color", "LIGHT_COLOR" },
{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_SCALAR, "attenuation", "ATTENUATION" },
- { Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_3D, "shadow_attenuation", "SHADOW_ATTENUATION" },
{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_3D, "albedo", "ALBEDO" },
{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_3D, "backlight", "BACKLIGHT" },
{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_3D, "diffuse", "DIFFUSE_LIGHT" },
diff --git a/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp b/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
index 33ad2c2c31..5a0ed7ebad 100644
--- a/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
+++ b/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
@@ -616,7 +616,6 @@ void SceneShaderForwardClustered::init(RendererStorageRD *p_storage, const Strin
actions.renames["LIGHT_COLOR"] = "light_color";
actions.renames["LIGHT"] = "light";
actions.renames["ATTENUATION"] = "attenuation";
- actions.renames["SHADOW_ATTENUATION"] = "shadow_attenuation";
actions.renames["DIFFUSE_LIGHT"] = "diffuse_light";
actions.renames["SPECULAR_LIGHT"] = "specular_light";
diff --git a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
index d7ed4a36f0..9452c7e6df 100644
--- a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
+++ b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
@@ -586,7 +586,6 @@ void SceneShaderForwardMobile::init(RendererStorageRD *p_storage, const String p
actions.renames["LIGHT_COLOR"] = "light_color";
actions.renames["LIGHT"] = "light";
actions.renames["ATTENUATION"] = "attenuation";
- actions.renames["SHADOW_ATTENUATION"] = "shadow_attenuation";
actions.renames["DIFFUSE_LIGHT"] = "diffuse_light";
actions.renames["SPECULAR_LIGHT"] = "specular_light";
diff --git a/servers/rendering/shader_types.cpp b/servers/rendering/shader_types.cpp
index f0785d4042..27a69fbc2e 100644
--- a/servers/rendering/shader_types.cpp
+++ b/servers/rendering/shader_types.cpp
@@ -178,7 +178,6 @@ ShaderTypes::ShaderTypes() {
shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["LIGHT"] = constt(ShaderLanguage::TYPE_VEC3);
shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["LIGHT_COLOR"] = constt(ShaderLanguage::TYPE_VEC3);
shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["ATTENUATION"] = constt(ShaderLanguage::TYPE_FLOAT);
- shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["SHADOW_ATTENUATION"] = constt(ShaderLanguage::TYPE_VEC3);
shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["ALBEDO"] = constt(ShaderLanguage::TYPE_VEC3);
shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["BACKLIGHT"] = constt(ShaderLanguage::TYPE_VEC3);
shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["METALLIC"] = constt(ShaderLanguage::TYPE_FLOAT);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 12:49:55 +0000