godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29411 from clayjohn/multimesh_instance_2d 

Added MultiMeshInstance2D node for using MultiMesh in 2D
This commit is contained in:
Rémi Verschelde 2019-06-04 22:40:13 +02:00 committed by GitHub
parent 46c56cad0c 2b8b1d7c46
commit 197b65f32a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 226 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
doc/classes/MultiMeshInstance2D.xml Normal file
View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="MultiMeshInstance2D" inherits="Node2D" category="Core" version="3.2">
<brief_description>
Node that instances a [MultiMesh] in 2D.
</brief_description>
<description>
[MultiMeshInstance2D] is a specialized node to instance a [MultiMesh] resource in 2D.
Usage is the same as [MultiMeshInstance].
</description>
<tutorials>
</tutorials>
<methods>
</methods>
<members>
<member name="multimesh" type="MultiMesh" setter="set_multimesh" getter="get_multimesh">
The [MultiMesh] that will be drawn by the [MultiMeshInstance2D].
</member>
<member name="normal_map" type="Texture" setter="set_normal_map" getter="get_normal_map">
The normal map that will be used if using the default [CanvasItemMaterial].
</member>
<member name="texture" type="Texture" setter="set_texture" getter="get_texture">
The [Texture] that will be used if using the default [CanvasItemMaterial]. Can be accessed as [code]TEXTURE[/code] in CanvasItem shader.
</member>
</members>
<constants>
</constants>
</class>

2
drivers/gles2/rasterizer_canvas_gles2.cpp
View File

@ -1081,6 +1081,8 @@ void RasterizerCanvasGLES2::_canvas_item_render_commands(Item *p_item, Item *cur
} else { } else {
glVertexAttrib4fv(INSTANCE_ATTRIB_BASE + 3, buffer + color_ofs); glVertexAttrib4fv(INSTANCE_ATTRIB_BASE + 3, buffer + color_ofs);
} }
} else {
glVertexAttrib4f(INSTANCE_ATTRIB_BASE + 3, 1.0, 1.0, 1.0, 1.0);
} }
if (multi_mesh->custom_data_floats) { if (multi_mesh->custom_data_floats) {

5
drivers/gles2/shaders/canvas.glsl
View File

@ -112,7 +112,12 @@ void main() {
#ifdef USE_INSTANCING #ifdef USE_INSTANCING
mat4 extra_matrix_instance = extra_matrix * transpose(mat4(instance_xform0, instance_xform1, instance_xform2, vec4(0.0, 0.0, 0.0, 1.0))); mat4 extra_matrix_instance = extra_matrix * transpose(mat4(instance_xform0, instance_xform1, instance_xform2, vec4(0.0, 0.0, 0.0, 1.0)));
color *= instance_color; color *= instance_color;
#ifdef USE_INSTANCE_CUSTOM
vec4 instance_custom = instance_custom_data; vec4 instance_custom = instance_custom_data;
#else
vec4 instance_custom = vec4(0.0);
#endif
#else #else
mat4 extra_matrix_instance = extra_matrix; mat4 extra_matrix_instance = extra_matrix;

5
drivers/gles3/shaders/canvas.glsl
View File

@ -117,7 +117,12 @@ void main() {
#ifdef USE_INSTANCING #ifdef USE_INSTANCING
mat4 extra_matrix_instance = extra_matrix * transpose(mat4(instance_xform0, instance_xform1, instance_xform2, vec4(0.0, 0.0, 0.0, 1.0))); mat4 extra_matrix_instance = extra_matrix * transpose(mat4(instance_xform0, instance_xform1, instance_xform2, vec4(0.0, 0.0, 0.0, 1.0)));
color *= instance_color; color *= instance_color;
#ifdef USE_INSTANCE_CUSTOM
vec4 instance_custom = instance_custom_data; vec4 instance_custom = instance_custom_data;
#else
vec4 instance_custom = vec4(0.0);
#endif
#else #else
mat4 extra_matrix_instance = extra_matrix; mat4 extra_matrix_instance = extra_matrix;

4
editor/icons/icon_multi_mesh_instance_2d.svg Normal file
View File

@ -0,0 +1,4 @@
<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg">
<rect x="-1" y="-1" width="582" height="402" fill="none"/>
<path d="m3 1c-1.1046 0-2 0.89543-2 2 5.6e-4 0.71397 0.38169 1.3735 1 1.7305v6.541c-0.61771 0.35664-0.99874 1.0152-1 1.7285 0 1.1046 0.89543 2 2 2 0.71397-5.6e-4 1.3735-0.38169 1.7305-1h1.2695v-2h-1.2715c-0.17478-0.30301-0.42598-0.55488-0.72852-0.73047v-5.8555l3.5859 3.5859h1.4141v-1.4141l-3.5859-3.5859h5.8574c0.17532 0.30158 0.42647 0.55205 0.72852 0.72656v1.2734h2v-1.2695c0.61831-0.35698 0.99944-1.0165 1-1.7305 0-1.1046-0.89543-2-2-2-0.71397 5.6e-4 -1.3735 0.38169-1.7305 1h-6.541c-0.35664-0.61771-1.0152-0.99874-1.7285-1zm8 7v3h-3v2h3v3h2v-3h3v-2h-3v-3h-2z" fill="#a5b7f3" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 776 B

111
scene/2d/multimesh_instance_2d.cpp Normal file
View File

@ -0,0 +1,111 @@
/*************************************************************************/
/* multimesh_instance_2d.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "multimesh_instance_2d.h"
void MultiMeshInstance2D::_notification(int p_what) {
if (p_what == NOTIFICATION_DRAW) {
if (multimesh.is_valid()) {
draw_multimesh(multimesh, texture, normal_map);
}
}
}
void MultiMeshInstance2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_multimesh", "multimesh"), &MultiMeshInstance2D::set_multimesh);
ClassDB::bind_method(D_METHOD("get_multimesh"), &MultiMeshInstance2D::get_multimesh);
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("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_PROPERTY(PropertyInfo(Variant::OBJECT, "multimesh", PROPERTY_HINT_RESOURCE_TYPE, "MultiMesh"), "set_multimesh", "get_multimesh");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "normal_map", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_normal_map", "get_normal_map");
}
void MultiMeshInstance2D::set_multimesh(const Ref<MultiMesh> &p_multimesh) {
multimesh = p_multimesh;
update();
}
Ref<MultiMesh> MultiMeshInstance2D::get_multimesh() const {
return multimesh;
}
void MultiMeshInstance2D::set_texture(const Ref<Texture> &p_texture) {
if (p_texture == texture)
return;
texture = p_texture;
update();
emit_signal("texture_changed");
_change_notify("texture");
}
Ref<Texture> MultiMeshInstance2D::get_texture() const {
return texture;
}
void MultiMeshInstance2D::set_normal_map(const Ref<Texture> &p_texture) {
normal_map = p_texture;
update();
}
Ref<Texture> MultiMeshInstance2D::get_normal_map() const {
return normal_map;
}
Rect2 MultiMeshInstance2D::_edit_get_rect() const {
if (multimesh.is_valid()) {
AABB aabb = multimesh->get_aabb();
return Rect2(aabb.position.x, aabb.position.y, aabb.size.x, aabb.size.y);
}
return Node2D::_edit_get_rect();
}
MultiMeshInstance2D::MultiMeshInstance2D() {
}
MultiMeshInstance2D::~MultiMeshInstance2D() {
}

65
scene/2d/multimesh_instance_2d.h Normal file
View File

@ -0,0 +1,65 @@
/*************************************************************************/
/* multimesh_instance_2d.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef MULTIMESH_INSTANCE_2D_H
#define MULTIMESH_INSTANCE_2D_H
#include "scene/2d/node_2d.h"
#include "scene/resources/multimesh.h"
class MultiMeshInstance2D : public Node2D {
GDCLASS(MultiMeshInstance2D, Node2D);
Ref<MultiMesh> multimesh;
Ref<Texture> texture;
Ref<Texture> normal_map;
protected:
void _notification(int p_what);
static void _bind_methods();
public:
void set_multimesh(const Ref<MultiMesh> &p_multimesh);
Ref<MultiMesh> get_multimesh() const;
void set_texture(const Ref<Texture> &p_texture);
Ref<Texture> get_texture() const;
void set_normal_map(const Ref<Texture> &p_texture);
Ref<Texture> get_normal_map() const;
virtual Rect2 _edit_get_rect() const;
MultiMeshInstance2D();
~MultiMeshInstance2D();
};
#endif // MULTIMESH_INSTANCE_2D_H

12
scene/register_scene_types.cpp
View File

@ -48,6 +48,7 @@
#include "scene/2d/light_occluder_2d.h" #include "scene/2d/light_occluder_2d.h"
#include "scene/2d/line_2d.h" #include "scene/2d/line_2d.h"
#include "scene/2d/mesh_instance_2d.h" #include "scene/2d/mesh_instance_2d.h"
#include "scene/2d/multimesh_instance_2d.h"
#include "scene/2d/navigation_2d.h" #include "scene/2d/navigation_2d.h"
#include "scene/2d/parallax_background.h" #include "scene/2d/parallax_background.h"
#include "scene/2d/parallax_layer.h" #include "scene/2d/parallax_layer.h"
@ -543,6 +544,7 @@ void register_scene_types() {
ClassDB::register_class<Position2D>(); ClassDB::register_class<Position2D>();
ClassDB::register_class<Line2D>(); ClassDB::register_class<Line2D>();
ClassDB::register_class<MeshInstance2D>(); ClassDB::register_class<MeshInstance2D>();
ClassDB::register_class<MultiMeshInstance2D>();
ClassDB::register_virtual_class<CollisionObject2D>(); ClassDB::register_virtual_class<CollisionObject2D>();
ClassDB::register_virtual_class<PhysicsBody2D>(); ClassDB::register_virtual_class<PhysicsBody2D>();
ClassDB::register_class<StaticBody2D>(); ClassDB::register_class<StaticBody2D>();
@ -587,9 +589,13 @@ void register_scene_types() {
SceneTree::add_idle_callback(ParticlesMaterial::flush_changes); SceneTree::add_idle_callback(ParticlesMaterial::flush_changes);
ParticlesMaterial::init_shaders(); ParticlesMaterial::init_shaders();
#ifndef _3D_DISABLED
ClassDB::register_virtual_class<Mesh>(); ClassDB::register_virtual_class<Mesh>();
ClassDB::register_class<ArrayMesh>(); ClassDB::register_class<ArrayMesh>();
ClassDB::register_class<MultiMesh>();
ClassDB::register_class<SurfaceTool>();
ClassDB::register_class<MeshDataTool>();
#ifndef _3D_DISABLED
ClassDB::register_virtual_class<PrimitiveMesh>(); ClassDB::register_virtual_class<PrimitiveMesh>();
ClassDB::register_class<CapsuleMesh>(); ClassDB::register_class<CapsuleMesh>();
ClassDB::register_class<CubeMesh>(); ClassDB::register_class<CubeMesh>();
@ -603,7 +609,6 @@ void register_scene_types() {
SceneTree::add_idle_callback(SpatialMaterial::flush_changes); SceneTree::add_idle_callback(SpatialMaterial::flush_changes);
SpatialMaterial::init_shaders(); SpatialMaterial::init_shaders();
ClassDB::register_class<MultiMesh>();
ClassDB::register_class<MeshLibrary>(); ClassDB::register_class<MeshLibrary>();
OS::get_singleton()->yield(); //may take time to init OS::get_singleton()->yield(); //may take time to init
@ -619,9 +624,6 @@ void register_scene_types() {
ClassDB::register_class<ConvexPolygonShape>(); ClassDB::register_class<ConvexPolygonShape>();
ClassDB::register_class<ConcavePolygonShape>(); ClassDB::register_class<ConcavePolygonShape>();
ClassDB::register_class<SurfaceTool>();
ClassDB::register_class<MeshDataTool>();
OS::get_singleton()->yield(); //may take time to init OS::get_singleton()->yield(); //may take time to init
ClassDB::register_class<SpatialVelocityTracker>(); ClassDB::register_class<SpatialVelocityTracker>();