asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Remove normal_map from MeshInstance2D and MultiMeshInstance2D

Browse source
This commit is contained in:
clayjohn 2023-01-12 13:13:37 -08:00
parent 40b9c246b6
commit b514e20fb5
6 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/classes/MeshInstance2D.xml
View file

@ -13,10 +13,6 @@
<member name="mesh" type="Mesh" setter="set_mesh" getter="get_mesh"> <member name="mesh" type="Mesh" setter="set_mesh" getter="get_mesh">
The [Mesh] that will be drawn by the [MeshInstance2D]. The [Mesh] that will be drawn by the [MeshInstance2D].
</member> </member>
<member name="normal_map" type="Texture2D" setter="set_normal_map" getter="get_normal_map">
The normal map that will be used if using the default [CanvasItemMaterial].
[b]Note:[/b] Godot expects the normal map to use X+, Y+, and Z+ coordinates. See [url=http://wiki.polycount.com/wiki/Normal_Map_Technical_Details#Common_Swizzle_Coordinates]this page[/url] for a comparison of normal map coordinates expected by popular engines.
</member>
<member name="texture" type="Texture2D" setter="set_texture" getter="get_texture"> <member name="texture" type="Texture2D" setter="set_texture" getter="get_texture">
The [Texture2D] that will be used if using the default [CanvasItemMaterial]. Can be accessed as [code]TEXTURE[/code] in CanvasItem shader. The [Texture2D] that will be used if using the default [CanvasItemMaterial]. Can be accessed as [code]TEXTURE[/code] in CanvasItem shader.
</member> </member>

4
doc/classes/MultiMeshInstance2D.xml
View file

@ -13,10 +13,6 @@
<member name="multimesh" type="MultiMesh" setter="set_multimesh" getter="get_multimesh"> <member name="multimesh" type="MultiMesh" setter="set_multimesh" getter="get_multimesh">
The [MultiMesh] that will be drawn by the [MultiMeshInstance2D]. The [MultiMesh] that will be drawn by the [MultiMeshInstance2D].
</member> </member>
<member name="normal_map" type="Texture2D" setter="set_normal_map" getter="get_normal_map">
The normal map that will be used if using the default [CanvasItemMaterial].
[b]Note:[/b] Godot expects the normal map to use X+, Y+, and Z+ coordinates. See [url=http://wiki.polycount.com/wiki/Normal_Map_Technical_Details#Common_Swizzle_Coordinates]this page[/url] for a comparison of normal map coordinates expected by popular engines.
</member>
<member name="texture" type="Texture2D" setter="set_texture" getter="get_texture"> <member name="texture" type="Texture2D" setter="set_texture" getter="get_texture">
The [Texture2D] that will be used if using the default [CanvasItemMaterial]. Can be accessed as [code]TEXTURE[/code] in CanvasItem shader. The [Texture2D] that will be used if using the default [CanvasItemMaterial]. Can be accessed as [code]TEXTURE[/code] in CanvasItem shader.
</member> </member>

13
scene/2d/mesh_instance_2d.cpp
View file

@ -49,14 +49,10 @@ void MeshInstance2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_texture", "texture"), &MeshInstance2D::set_texture); ClassDB::bind_method(D_METHOD("set_texture", "texture"), &MeshInstance2D::set_texture);
ClassDB::bind_method(D_METHOD("get_texture"), &MeshInstance2D::get_texture); ClassDB::bind_method(D_METHOD("get_texture"), &MeshInstance2D::get_texture);
ClassDB::bind_method(D_METHOD("set_normal_map", "normal_map"), &MeshInstance2D::set_normal_map);
ClassDB::bind_method(D_METHOD("get_normal_map"), &MeshInstance2D::get_normal_map);
ADD_SIGNAL(MethodInfo("texture_changed")); ADD_SIGNAL(MethodInfo("texture_changed"));
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "normal_map", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_normal_map", "get_normal_map");
} }
void MeshInstance2D::set_mesh(const Ref<Mesh> &p_mesh) { void MeshInstance2D::set_mesh(const Ref<Mesh> &p_mesh) {
@ -77,15 +73,6 @@ void MeshInstance2D::set_texture(const Ref<Texture2D> &p_texture) {
emit_signal(SceneStringNames::get_singleton()->texture_changed); emit_signal(SceneStringNames::get_singleton()->texture_changed);
} }
void MeshInstance2D::set_normal_map(const Ref<Texture2D> &p_texture) {
normal_map = p_texture;
queue_redraw();
}
Ref<Texture2D> MeshInstance2D::get_normal_map() const {
return normal_map;
}
Ref<Texture2D> MeshInstance2D::get_texture() const { Ref<Texture2D> MeshInstance2D::get_texture() const {
return texture; return texture;
} }

4
scene/2d/mesh_instance_2d.h
View file

@ -39,7 +39,6 @@ class MeshInstance2D : public Node2D {
Ref<Mesh> mesh; Ref<Mesh> mesh;
Ref<Texture2D> texture; Ref<Texture2D> texture;
Ref<Texture2D> normal_map;
protected: protected:
void _notification(int p_what); void _notification(int p_what);
@ -57,9 +56,6 @@ public:
void set_texture(const Ref<Texture2D> &p_texture); void set_texture(const Ref<Texture2D> &p_texture);
Ref<Texture2D> get_texture() const; Ref<Texture2D> get_texture() const;
void set_normal_map(const Ref<Texture2D> &p_texture);
Ref<Texture2D> get_normal_map() const;
MeshInstance2D(); MeshInstance2D();
}; };

13
scene/2d/multimesh_instance_2d.cpp
View file

@ -50,14 +50,10 @@ void MultiMeshInstance2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_texture", "texture"), &MultiMeshInstance2D::set_texture); ClassDB::bind_method(D_METHOD("set_texture", "texture"), &MultiMeshInstance2D::set_texture);
ClassDB::bind_method(D_METHOD("get_texture"), &MultiMeshInstance2D::get_texture); ClassDB::bind_method(D_METHOD("get_texture"), &MultiMeshInstance2D::get_texture);
ClassDB::bind_method(D_METHOD("set_normal_map", "normal_map"), &MultiMeshInstance2D::set_normal_map);
ClassDB::bind_method(D_METHOD("get_normal_map"), &MultiMeshInstance2D::get_normal_map);
ADD_SIGNAL(MethodInfo("texture_changed")); ADD_SIGNAL(MethodInfo("texture_changed"));
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "multimesh", PROPERTY_HINT_RESOURCE_TYPE, "MultiMesh"), "set_multimesh", "get_multimesh"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "multimesh", PROPERTY_HINT_RESOURCE_TYPE, "MultiMesh"), "set_multimesh", "get_multimesh");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "normal_map", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_normal_map", "get_normal_map");
} }
void MultiMeshInstance2D::set_multimesh(const Ref<MultiMesh> &p_multimesh) { void MultiMeshInstance2D::set_multimesh(const Ref<MultiMesh> &p_multimesh) {
@ -91,15 +87,6 @@ Ref<Texture2D> MultiMeshInstance2D::get_texture() const {
return texture; return texture;
} }
void MultiMeshInstance2D::set_normal_map(const Ref<Texture2D> &p_texture) {
normal_map = p_texture;
queue_redraw();
}
Ref<Texture2D> MultiMeshInstance2D::get_normal_map() const {
return normal_map;
}
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
Rect2 MultiMeshInstance2D::_edit_get_rect() const { Rect2 MultiMeshInstance2D::_edit_get_rect() const {
if (multimesh.is_valid()) { if (multimesh.is_valid()) {

4
scene/2d/multimesh_instance_2d.h
View file

@ -40,7 +40,6 @@ class MultiMeshInstance2D : public Node2D {
Ref<MultiMesh> multimesh; Ref<MultiMesh> multimesh;
Ref<Texture2D> texture; Ref<Texture2D> texture;
Ref<Texture2D> normal_map;
protected: protected:
void _notification(int p_what); void _notification(int p_what);
@ -57,9 +56,6 @@ public:
void set_texture(const Ref<Texture2D> &p_texture); void set_texture(const Ref<Texture2D> &p_texture);
Ref<Texture2D> get_texture() const; Ref<Texture2D> get_texture() const;
void set_normal_map(const Ref<Texture2D> &p_texture);
Ref<Texture2D> get_normal_map() const;
MultiMeshInstance2D(); MultiMeshInstance2D();
~MultiMeshInstance2D(); ~MultiMeshInstance2D();
}; };