Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-12 22:01:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed ProceduralTree3DMesh to ProceduralTreeMesh.

Browse Source
This commit is contained in:
Relintai 2024-09-08 13:31:27 +02:00
parent 755a8b0225
commit 883851a57a
4 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/procedural_tree_3d/config.py
View File

@ -9,7 +9,7 @@ def configure(env):
def get_doc_classes():
return [
"ProceduralTree3DMesh",
"ProceduralTreeMesh",
]
def get_doc_path():

70
modules/procedural_tree_3d/procedural_tree_3d_mesh.cpp
View File

@ -4,7 +4,7 @@
#include "servers/rendering_server.h"
void ProceduralTree3DMesh::_update() const {
void ProceduralTreeMesh::_update() const {
Array arr;
arr.resize(RS::ARRAY_MAX);
@ -38,24 +38,24 @@ void ProceduralTree3DMesh::_update() const {
clear_cache();
const_cast<ProceduralTree3DMesh *>(this)->emit_changed();
const_cast<ProceduralTreeMesh *>(this)->emit_changed();
}
void ProceduralTree3DMesh::_request_update() {
void ProceduralTreeMesh::_request_update() {
if (pending_request) {
return;
}
_update();
}
int ProceduralTree3DMesh::get_surface_count() const {
int ProceduralTreeMesh::get_surface_count() const {
if (pending_request) {
_update();
}
return TREE_SURFACE_COUNT;
}
int ProceduralTree3DMesh::surface_get_array_len(int p_idx) const {
int ProceduralTreeMesh::surface_get_array_len(int p_idx) const {
ERR_FAIL_INDEX_V(p_idx, TREE_SURFACE_COUNT, -1);
if (pending_request) {
_update();
@ -64,7 +64,7 @@ int ProceduralTree3DMesh::surface_get_array_len(int p_idx) const {
return RenderingServer::get_singleton()->mesh_surface_get_array_len(mesh, p_idx);
}
int ProceduralTree3DMesh::surface_get_array_index_len(int p_idx) const {
int ProceduralTreeMesh::surface_get_array_index_len(int p_idx) const {
ERR_FAIL_INDEX_V(p_idx, TREE_SURFACE_COUNT, -1);
if (pending_request) {
_update();
@ -73,7 +73,7 @@ int ProceduralTree3DMesh::surface_get_array_index_len(int p_idx) const {
return RenderingServer::get_singleton()->mesh_surface_get_array_index_len(mesh, p_idx);
}
Array ProceduralTree3DMesh::surface_get_arrays(int p_surface) const {
Array ProceduralTreeMesh::surface_get_arrays(int p_surface) const {
ERR_FAIL_INDEX_V(p_surface, TREE_SURFACE_COUNT, Array());
if (pending_request) {
_update();
@ -82,7 +82,7 @@ Array ProceduralTree3DMesh::surface_get_arrays(int p_surface) const {
return RenderingServer::get_singleton()->mesh_surface_get_arrays(mesh, p_surface);
}
Array ProceduralTree3DMesh::surface_get_blend_shape_arrays(int p_surface) const {
Array ProceduralTreeMesh::surface_get_blend_shape_arrays(int p_surface) const {
ERR_FAIL_INDEX_V(p_surface, TREE_SURFACE_COUNT, Array());
if (pending_request) {
_update();
@ -91,7 +91,7 @@ Array ProceduralTree3DMesh::surface_get_blend_shape_arrays(int p_surface) const
return Array();
}
uint32_t ProceduralTree3DMesh::surface_get_format(int p_idx) const {
uint32_t ProceduralTreeMesh::surface_get_format(int p_idx) const {
ERR_FAIL_INDEX_V(p_idx, TREE_SURFACE_COUNT, 0);
if (pending_request) {
_update();
@ -100,11 +100,11 @@ uint32_t ProceduralTree3DMesh::surface_get_format(int p_idx) const {
return RenderingServer::get_singleton()->mesh_surface_get_format(mesh, p_idx);
}
Mesh::PrimitiveType ProceduralTree3DMesh::surface_get_primitive_type(int p_idx) const {
Mesh::PrimitiveType ProceduralTreeMesh::surface_get_primitive_type(int p_idx) const {
return Mesh::PRIMITIVE_TRIANGLES;
}
void ProceduralTree3DMesh::surface_set_material(int p_idx, const Ref<Material> &p_material) {
void ProceduralTreeMesh::surface_set_material(int p_idx, const Ref<Material> &p_material) {
ERR_FAIL_INDEX(p_idx, TREE_SURFACE_COUNT);
switch (p_idx) {
@ -120,24 +120,24 @@ void ProceduralTree3DMesh::surface_set_material(int p_idx, const Ref<Material> &
}
}
Ref<Material> ProceduralTree3DMesh::surface_get_material(int p_idx) const {
Ref<Material> ProceduralTreeMesh::surface_get_material(int p_idx) const {
ERR_FAIL_INDEX_V(p_idx, TREE_SURFACE_COUNT, nullptr);
return _surfaces[p_idx].material;
}
int ProceduralTree3DMesh::get_blend_shape_count() const {
int ProceduralTreeMesh::get_blend_shape_count() const {
return 0;
}
StringName ProceduralTree3DMesh::get_blend_shape_name(int p_index) const {
StringName ProceduralTreeMesh::get_blend_shape_name(int p_index) const {
return StringName();
}
void ProceduralTree3DMesh::set_blend_shape_name(int p_index, const StringName &p_name) {
void ProceduralTreeMesh::set_blend_shape_name(int p_index, const StringName &p_name) {
}
AABB ProceduralTree3DMesh::get_aabb() const {
AABB ProceduralTreeMesh::get_aabb() const {
if (pending_request) {
_update();
}
@ -145,14 +145,14 @@ AABB ProceduralTree3DMesh::get_aabb() const {
return aabb;
}
RID ProceduralTree3DMesh::get_rid() const {
RID ProceduralTreeMesh::get_rid() const {
if (pending_request) {
_update();
}
return mesh;
}
void ProceduralTree3DMesh::set_trunk_material(const Ref<Material> &p_material) {
void ProceduralTreeMesh::set_trunk_material(const Ref<Material> &p_material) {
_surfaces[TREE_SURFACE_TRUNK].material = p_material;
if (!pending_request) {
// just apply it, else it'll happen when _update is called.
@ -162,12 +162,12 @@ void ProceduralTree3DMesh::set_trunk_material(const Ref<Material> &p_material) {
};
}
Ref<Material> ProceduralTree3DMesh::get_trunk_material() const {
Ref<Material> ProceduralTreeMesh::get_trunk_material() const {
return _surfaces[TREE_SURFACE_TRUNK].material;
}
void ProceduralTree3DMesh::set_twig_material(const Ref<Material> &p_material) {
void ProceduralTreeMesh::set_twig_material(const Ref<Material> &p_material) {
_surfaces[TREE_SURFACE_TWIG].material = p_material;
if (!pending_request) {
// just apply it, else it'll happen when _update is called.
@ -177,12 +177,12 @@ void ProceduralTree3DMesh::set_twig_material(const Ref<Material> &p_material) {
};
}
Ref<Material> ProceduralTree3DMesh::get_twig_material() const {
Ref<Material> ProceduralTreeMesh::get_twig_material() const {
return _surfaces[TREE_SURFACE_TWIG].material;
}
Array ProceduralTree3DMesh::get_mesh_arrays() const {
Array ProceduralTreeMesh::get_mesh_arrays() const {
Array arr;
for (int i = 0; i < TREE_SURFACE_COUNT; ++i) {
@ -192,17 +192,17 @@ Array ProceduralTree3DMesh::get_mesh_arrays() const {
return arr;
}
void ProceduralTree3DMesh::set_custom_aabb(const AABB &p_custom) {
void ProceduralTreeMesh::set_custom_aabb(const AABB &p_custom) {
custom_aabb = p_custom;
RS::get_singleton()->mesh_set_custom_aabb(mesh, custom_aabb);
emit_changed();
}
AABB ProceduralTree3DMesh::get_custom_aabb() const {
AABB ProceduralTreeMesh::get_custom_aabb() const {
return custom_aabb;
}
ProceduralTree3DMesh::ProceduralTree3DMesh() {
ProceduralTreeMesh::ProceduralTreeMesh() {
// defaults
mesh = RID_PRIME(RenderingServer::get_singleton()->mesh_create());
@ -210,23 +210,23 @@ ProceduralTree3DMesh::ProceduralTree3DMesh() {
pending_request = true;
}
ProceduralTree3DMesh::~ProceduralTree3DMesh() {
ProceduralTreeMesh::~ProceduralTreeMesh() {
RenderingServer::get_singleton()->free(mesh);
}
void ProceduralTree3DMesh::_bind_methods() {
ClassDB::bind_method(D_METHOD("_update"), &ProceduralTree3DMesh::_update);
void ProceduralTreeMesh::_bind_methods() {
ClassDB::bind_method(D_METHOD("_update"), &ProceduralTreeMesh::_update);
ClassDB::bind_method(D_METHOD("set_trunk_material", "material"), &ProceduralTree3DMesh::set_trunk_material);
ClassDB::bind_method(D_METHOD("get_trunk_material"), &ProceduralTree3DMesh::get_trunk_material);
ClassDB::bind_method(D_METHOD("set_trunk_material", "material"), &ProceduralTreeMesh::set_trunk_material);
ClassDB::bind_method(D_METHOD("get_trunk_material"), &ProceduralTreeMesh::get_trunk_material);
ClassDB::bind_method(D_METHOD("set_twig_material", "material"), &ProceduralTree3DMesh::set_twig_material);
ClassDB::bind_method(D_METHOD("get_twig_material"), &ProceduralTree3DMesh::get_twig_material);
ClassDB::bind_method(D_METHOD("set_twig_material", "material"), &ProceduralTreeMesh::set_twig_material);
ClassDB::bind_method(D_METHOD("get_twig_material"), &ProceduralTreeMesh::get_twig_material);
ClassDB::bind_method(D_METHOD("get_mesh_arrays"), &ProceduralTree3DMesh::get_mesh_arrays);
ClassDB::bind_method(D_METHOD("get_mesh_arrays"), &ProceduralTreeMesh::get_mesh_arrays);
ClassDB::bind_method(D_METHOD("set_custom_aabb", "aabb"), &ProceduralTree3DMesh::set_custom_aabb);
ClassDB::bind_method(D_METHOD("get_custom_aabb"), &ProceduralTree3DMesh::get_custom_aabb);
ClassDB::bind_method(D_METHOD("set_custom_aabb", "aabb"), &ProceduralTreeMesh::set_custom_aabb);
ClassDB::bind_method(D_METHOD("get_custom_aabb"), &ProceduralTreeMesh::get_custom_aabb);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "trunk_material", PROPERTY_HINT_RESOURCE_TYPE, "SpatialMaterial,ShaderMaterial"), "set_trunk_material", "get_trunk_material");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "twig_material", PROPERTY_HINT_RESOURCE_TYPE, "SpatialMaterial,ShaderMaterial"), "set_twig_material", "get_twig_material");

10
modules/procedural_tree_3d/procedural_tree_3d_mesh.h
View File

@ -3,8 +3,8 @@
#include "scene/resources/mesh/mesh.h"
class ProceduralTree3DMesh : public Mesh {
GDCLASS(ProceduralTree3DMesh, Mesh);
class ProceduralTreeMesh : public Mesh {
GDCLASS(ProceduralTreeMesh, Mesh);
public:
enum TreeSurfaces {
@ -39,8 +39,8 @@ public:
void set_custom_aabb(const AABB &p_custom);
AABB get_custom_aabb() const;
ProceduralTree3DMesh();
~ProceduralTree3DMesh();
ProceduralTreeMesh();
~ProceduralTreeMesh();
protected:
static void _bind_methods();
@ -63,6 +63,6 @@ private:
void _update() const;
};
VARIANT_ENUM_CAST(ProceduralTree3DMesh::TreeSurfaces);
VARIANT_ENUM_CAST(ProceduralTreeMesh::TreeSurfaces);
#endif

2
modules/procedural_tree_3d/register_types.cpp
View File

@ -5,7 +5,7 @@
void register_procedural_tree_3d_types(ModuleRegistrationLevel p_level) {
if (p_level == MODULE_REGISTRATION_LEVEL_SCENE) {
ClassDB::register_class<ProceduralTree3DMesh >();
ClassDB::register_class<ProceduralTreeMesh >();
}
}