mirror of
https://github.com/Relintai/props.git
synced 2024-11-08 10:02:14 +01:00
Added PropinstancePropJob (copy paste of terraman's prop job), and started reworking PropInstance.
This commit is contained in:
parent
39892b4a7c
commit
669ab8e193
1
SCsub
1
SCsub
@ -36,6 +36,7 @@ sources = [
|
||||
"prop_instance.cpp",
|
||||
"prop_ess_entity.cpp",
|
||||
"prop_instance_job.cpp",
|
||||
"prop_instance_prop_job.cpp",
|
||||
|
||||
"prop_scene_instance.cpp",
|
||||
|
||||
|
||||
@ -45,56 +45,16 @@ void PropInstance::set_snap_axis(const Vector3 &value) {
|
||||
_snap_axis = value;
|
||||
}
|
||||
|
||||
void PropInstance::register_prop_mesh_data_instance(MeshDataInstance *instance) {
|
||||
//ERR_FAIL_COND(!ObjectDB::instance_validate(instance));
|
||||
|
||||
_mesh_data_instances.push_back(instance);
|
||||
|
||||
if (_auto_bake)
|
||||
queue_bake();
|
||||
}
|
||||
|
||||
void PropInstance::unregister_prop_mesh_data_instance(MeshDataInstance *instance) {
|
||||
//ERR_FAIL_COND(!ObjectDB::instance_validate(instance));
|
||||
|
||||
_mesh_data_instances.erase(instance);
|
||||
|
||||
if (_auto_bake)
|
||||
queue_bake();
|
||||
}
|
||||
|
||||
void PropInstance::bake() {
|
||||
_baking = true;
|
||||
_baking = true;
|
||||
_bake_queued = false;
|
||||
|
||||
//_job->clear();
|
||||
|
||||
for (int i = 0; i < _mesh_data_instances.size(); ++i) {
|
||||
MeshDataInstance *md = _mesh_data_instances.get(i);
|
||||
|
||||
//ERR_CONTINUE(!ObjectDB::instance_validate(md));
|
||||
|
||||
Ref<MeshDataResource> mdr = md->get_mesh();
|
||||
|
||||
if (!mdr.is_valid())
|
||||
continue;
|
||||
|
||||
Transform t = md->get_transform();
|
||||
|
||||
Spatial *sp = Object::cast_to<Spatial>(md->get_parent());
|
||||
|
||||
while (sp) {
|
||||
t *= sp->get_transform();
|
||||
|
||||
sp = Object::cast_to<Spatial>(sp->get_parent());
|
||||
}
|
||||
|
||||
//_job->add_mesh_instance(t, mdr, md->get_texture());
|
||||
if (!_job.is_valid()) {
|
||||
_job.instance();
|
||||
}
|
||||
|
||||
//if (_job->get_mesh_instance_count() > 0) {
|
||||
// ThreadPool::get_singleton()->add_job(_job);
|
||||
//}
|
||||
_job->set_prop_instace(this);
|
||||
|
||||
}
|
||||
|
||||
void PropInstance::bake_finished() {
|
||||
@ -147,6 +107,7 @@ void PropInstance::build() {
|
||||
// n->set_owner(get_tree()->get_edited_scene_root());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
PropInstance::PropInstance() {
|
||||
@ -158,7 +119,6 @@ PropInstance::PropInstance() {
|
||||
//_job->connect("completed", this, "bake_finished", Vector<Variant>(), Object::CONNECT_DEFERRED);
|
||||
}
|
||||
PropInstance::~PropInstance() {
|
||||
_mesh_data_instances.clear();
|
||||
//_job.unref();
|
||||
_prop_data.unref();
|
||||
}
|
||||
@ -166,7 +126,9 @@ PropInstance::~PropInstance() {
|
||||
void PropInstance::_notification(int p_what) {
|
||||
switch (p_what) {
|
||||
case NOTIFICATION_ENTER_TREE: {
|
||||
build();
|
||||
if (_prop_data.is_valid()) {
|
||||
build();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ SOFTWARE.
|
||||
|
||||
#include "core/math/vector3.h"
|
||||
|
||||
//#include "prop_instance_job.h"
|
||||
#include "prop_instance_prop_job.h"
|
||||
|
||||
#include "props/prop_data.h"
|
||||
|
||||
@ -57,9 +57,6 @@ public:
|
||||
Vector3 get_snap_axis() const;
|
||||
void set_snap_axis(const Vector3 &value);
|
||||
|
||||
void register_prop_mesh_data_instance(MeshDataInstance *instance);
|
||||
void unregister_prop_mesh_data_instance(MeshDataInstance *instance);
|
||||
|
||||
void bake();
|
||||
void queue_bake();
|
||||
void bake_finished();
|
||||
@ -80,8 +77,13 @@ private:
|
||||
bool _baking;
|
||||
bool _snap_to_mesh;
|
||||
Vector3 _snap_axis;
|
||||
Vector<MeshDataInstance *> _mesh_data_instances;
|
||||
//Ref<PropInstanceJob> _job;
|
||||
|
||||
Ref<PropInstancePropJob> _job;
|
||||
|
||||
bool _merge_extures;
|
||||
Vector<Ref<Material> > _original_materials;//if !_merge_extures, just use this ?
|
||||
|
||||
static HashMap<Ref<PropData>, Ref<Material> > _material_map;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
397
prop_instance_prop_job.cpp
Normal file
397
prop_instance_prop_job.cpp
Normal file
@ -0,0 +1,397 @@
|
||||
/*
|
||||
Copyright (c) 2019-2021 Péter Magyar
|
||||
|
||||
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 "prop_instance_prop_job.h"
|
||||
|
||||
#include "prop_instance.h"
|
||||
#include "prop_mesher.h"
|
||||
|
||||
#ifdef MESH_DATA_RESOURCE_PRESENT
|
||||
#include "../mesh_data_resource/mesh_data_resource.h"
|
||||
#endif
|
||||
|
||||
#ifdef MESH_UTILS_PRESENT
|
||||
#include "../mesh_utils/fast_quadratic_mesh_simplifier.h"
|
||||
#endif
|
||||
|
||||
PropInstance *PropInstancePropJob::get_prop_instace() {
|
||||
return _prop_instace;
|
||||
}
|
||||
void PropInstancePropJob::set_prop_instace(PropInstance *prop) {
|
||||
_prop_instace = prop;
|
||||
}
|
||||
void PropInstancePropJob::set_prop_instace_bind(Node *prop) {
|
||||
set_prop_instace(Object::cast_to<PropInstance>(prop));
|
||||
}
|
||||
|
||||
Ref<PropMesher> PropInstancePropJob::get_prop_mesher() const {
|
||||
return _prop_mesher;
|
||||
}
|
||||
void PropInstancePropJob::set_prop_mesher(const Ref<PropMesher> &mesher) {
|
||||
_prop_mesher = mesher;
|
||||
}
|
||||
|
||||
void PropInstancePropJob::phase_physics_process() {
|
||||
/*
|
||||
Ref<TerraChunkDefault> chunk = _chunk;
|
||||
|
||||
//TODO this should only update the differences
|
||||
for (int i = 0; i < chunk->collider_get_count(); ++i) {
|
||||
PhysicsServer::get_singleton()->free(chunk->collider_get_body(i));
|
||||
}
|
||||
|
||||
chunk->colliders_clear();
|
||||
|
||||
#ifdef MESH_DATA_RESOURCE_PRESENT
|
||||
for (int i = 0; i < chunk->mesh_data_resource_get_count(); ++i) {
|
||||
Ref<MeshDataResource> mdr = chunk->mesh_data_resource_get(i);
|
||||
|
||||
for (int j = 0; j < mdr->get_collision_shape_count(); ++j) {
|
||||
Ref<Shape> shape = mdr->get_collision_shape(j);
|
||||
Transform offset = mdr->get_collision_shape_offset(j);
|
||||
|
||||
if (!shape.is_valid()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
RID body = PhysicsServer::get_singleton()->body_create(PhysicsServer::BODY_MODE_STATIC);
|
||||
|
||||
Transform transform = chunk->mesh_data_resource_get_transform(i);
|
||||
transform *= offset;
|
||||
|
||||
PhysicsServer::get_singleton()->body_add_shape(body, shape->get_rid());
|
||||
|
||||
//TODO store the layer mask somewhere
|
||||
PhysicsServer::get_singleton()->body_set_collision_layer(body, 1);
|
||||
PhysicsServer::get_singleton()->body_set_collision_mask(body, 1);
|
||||
|
||||
if (chunk->get_voxel_world()->is_inside_tree() && chunk->get_voxel_world()->is_inside_world()) {
|
||||
Ref<World> world = chunk->get_voxel_world()->GET_WORLD();
|
||||
|
||||
if (world.is_valid() && world->get_space() != RID()) {
|
||||
PhysicsServer::get_singleton()->body_set_space(body, world->get_space());
|
||||
}
|
||||
}
|
||||
|
||||
PhysicsServer::get_singleton()->body_set_state(body, PhysicsServer::BODY_STATE_TRANSFORM, chunk->get_transform() * transform);
|
||||
|
||||
chunk->collider_add(transform, shape, shape->get_rid(), body);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if TOOLS_ENABLED
|
||||
if (SceneTree::get_singleton()->is_debugging_collisions_hint() && chunk->collider_get_count() > 0) {
|
||||
chunk->draw_debug_mdr_colliders();
|
||||
}
|
||||
#endif
|
||||
|
||||
set_build_phase_type(BUILD_PHASE_TYPE_NORMAL);
|
||||
next_phase();
|
||||
}
|
||||
|
||||
void PropInstancePropJob::phase_prop() {
|
||||
#ifdef MESH_DATA_RESOURCE_PRESENT
|
||||
Ref<TerraChunkDefault> chunk = _chunk;
|
||||
|
||||
if (!get_prop_mesher().is_valid()) {
|
||||
set_complete(true); //So threadpool knows it's done
|
||||
next_job();
|
||||
return;
|
||||
}
|
||||
|
||||
if (should_do()) {
|
||||
if (chunk->mesh_data_resource_get_count() == 0) {
|
||||
set_complete(true); //So threadpool knows it's done
|
||||
next_job();
|
||||
return;
|
||||
}
|
||||
|
||||
for (int i = 0; i < chunk->mesh_data_resource_get_count(); ++i) {
|
||||
if (chunk->mesh_data_resource_get_is_inside(i)) {
|
||||
get_prop_mesher()->add_mesh_data_resource_transform(chunk->mesh_data_resource_get(i), chunk->mesh_data_resource_get_transform(i), chunk->mesh_data_resource_get_uv_rect(i));
|
||||
}
|
||||
}
|
||||
|
||||
if (get_prop_mesher()->get_vertex_count() == 0) {
|
||||
//reset_stages();
|
||||
|
||||
set_complete(true); //So threadpool knows it's done
|
||||
next_job();
|
||||
return;
|
||||
}
|
||||
|
||||
if (should_return()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (should_do()) {
|
||||
if ((chunk->get_build_flags() & TerraChunkDefault::BUILD_FLAG_USE_LIGHTING) != 0) {
|
||||
get_prop_mesher()->bake_colors(_chunk);
|
||||
}
|
||||
|
||||
if (should_return()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (should_do()) {
|
||||
if ((chunk->get_build_flags() & TerraChunkDefault::BUILD_FLAG_USE_LIGHTING) != 0) {
|
||||
TerraWorldDefault *world = Object::cast_to<TerraWorldDefault>(chunk->get_voxel_world());
|
||||
|
||||
if (world) {
|
||||
for (int i = 0; i < chunk->mesh_data_resource_get_count(); ++i) {
|
||||
if (!chunk->mesh_data_resource_get_is_inside(i)) {
|
||||
Ref<MeshDataResource> mdr = chunk->mesh_data_resource_get(i);
|
||||
|
||||
ERR_CONTINUE(!mdr.is_valid());
|
||||
|
||||
Transform trf = chunk->mesh_data_resource_get_transform(i);
|
||||
|
||||
Array arr = mdr->get_array();
|
||||
|
||||
if (arr.size() <= Mesh::ARRAY_VERTEX) {
|
||||
continue;
|
||||
}
|
||||
|
||||
PoolVector3Array varr = arr[Mesh::ARRAY_VERTEX];
|
||||
|
||||
if (varr.size() == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
PoolColorArray carr = world->get_vertex_colors(trf, varr);
|
||||
|
||||
get_prop_mesher()->add_mesh_data_resource_transform_colored(mdr, trf, carr, chunk->mesh_data_resource_get_uv_rect(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (should_return()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (get_prop_mesher()->get_vertex_count() != 0) {
|
||||
if (should_do()) {
|
||||
temp_mesh_arr = get_prop_mesher()->build_mesh();
|
||||
|
||||
if (should_return()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
RID mesh_rid = chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 0);
|
||||
|
||||
if (should_do()) {
|
||||
if (mesh_rid == RID()) {
|
||||
if ((chunk->get_build_flags() & TerraChunkDefault::BUILD_FLAG_CREATE_LODS) != 0)
|
||||
chunk->meshes_create(TerraChunkDefault::MESH_INDEX_PROP, chunk->get_lod_num() + 1);
|
||||
else
|
||||
chunk->meshes_create(TerraChunkDefault::MESH_INDEX_PROP, 1);
|
||||
|
||||
mesh_rid = chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 0);
|
||||
}
|
||||
|
||||
if (VS::get_singleton()->mesh_get_surface_count(mesh_rid) > 0)
|
||||
#if !GODOT4
|
||||
VS::get_singleton()->mesh_remove_surface(mesh_rid, 0);
|
||||
#else
|
||||
VS::get_singleton()->mesh_clear(mesh_rid);
|
||||
#endif
|
||||
|
||||
if (should_return()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (should_do()) {
|
||||
|
||||
VS::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
|
||||
|
||||
if (chunk->get_library()->prop_material_get(0).is_valid())
|
||||
VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->prop_material_get(0)->get_rid());
|
||||
|
||||
if (should_return()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if ((chunk->get_build_flags() & TerraChunkDefault::BUILD_FLAG_CREATE_LODS) != 0) {
|
||||
if (should_do()) {
|
||||
|
||||
if (chunk->get_lod_num() >= 1) {
|
||||
//for lod 1 just remove uv2
|
||||
temp_mesh_arr[VisualServer::ARRAY_TEX_UV2] = Variant();
|
||||
|
||||
VisualServer::get_singleton()->mesh_add_surface_from_arrays(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 1), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
|
||||
|
||||
if (chunk->get_library()->prop_material_get(1).is_valid())
|
||||
VisualServer::get_singleton()->mesh_surface_set_material(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 1), 0, chunk->get_library()->prop_material_get(1)->get_rid());
|
||||
}
|
||||
|
||||
if (should_return()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (should_do()) {
|
||||
if (chunk->get_lod_num() >= 2) {
|
||||
Array temp_mesh_arr2 = merge_mesh_array(temp_mesh_arr);
|
||||
temp_mesh_arr = temp_mesh_arr2;
|
||||
|
||||
VisualServer::get_singleton()->mesh_add_surface_from_arrays(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 2), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr2);
|
||||
|
||||
if (chunk->get_library()->prop_material_get(2).is_valid())
|
||||
VisualServer::get_singleton()->mesh_surface_set_material(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 2), 0, chunk->get_library()->prop_material_get(2)->get_rid());
|
||||
}
|
||||
if (should_return()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// if (should_do()) {
|
||||
if (chunk->get_lod_num() >= 3) {
|
||||
Ref<ShaderMaterial> mat = chunk->get_library()->prop_material_get(0);
|
||||
Ref<SpatialMaterial> spmat = chunk->get_library()->prop_material_get(0);
|
||||
Ref<Texture> tex;
|
||||
|
||||
if (mat.is_valid()) {
|
||||
tex = mat->get_shader_param("texture_albedo");
|
||||
} else if (spmat.is_valid()) {
|
||||
tex = spmat->get_texture(SpatialMaterial::TEXTURE_ALBEDO);
|
||||
}
|
||||
|
||||
if (tex.is_valid()) {
|
||||
temp_mesh_arr = bake_mesh_array_uv(temp_mesh_arr, tex);
|
||||
temp_mesh_arr[VisualServer::ARRAY_TEX_UV] = Variant();
|
||||
|
||||
VisualServer::get_singleton()->mesh_add_surface_from_arrays(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 3), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
|
||||
|
||||
if (chunk->get_library()->prop_material_get(3).is_valid())
|
||||
VisualServer::get_singleton()->mesh_surface_set_material(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 3), 0, chunk->get_library()->prop_material_get(3)->get_rid());
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef MESH_UTILS_PRESENT
|
||||
if (should_do()) {
|
||||
if (chunk->get_lod_num() > 4) {
|
||||
Ref<FastQuadraticMeshSimplifier> fqms;
|
||||
fqms.instance();
|
||||
fqms->set_preserve_border_edges(true);
|
||||
fqms->initialize(temp_mesh_arr);
|
||||
|
||||
for (int i = 4; i < chunk->get_lod_num(); ++i) {
|
||||
fqms->simplify_mesh(temp_mesh_arr.size() * 0.8, 7);
|
||||
temp_mesh_arr = fqms->get_arrays();
|
||||
|
||||
VisualServer::get_singleton()->mesh_add_surface_from_arrays(
|
||||
chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_TERRARIN, TerraChunkDefault::MESH_TYPE_INDEX_MESH, i),
|
||||
VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
|
||||
|
||||
if (chunk->get_library()->prop_material_get(i).is_valid())
|
||||
VisualServer::get_singleton()->mesh_surface_set_material(
|
||||
chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_TERRARIN, TerraChunkDefault::MESH_TYPE_INDEX_MESH, i), 0,
|
||||
chunk->get_library()->prop_material_get(i)->get_rid());
|
||||
}
|
||||
}
|
||||
|
||||
if (should_return()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
*/
|
||||
set_complete(true); //So threadpool knows it's done
|
||||
finished();
|
||||
}
|
||||
|
||||
void PropInstancePropJob::_physics_process(float delta) {
|
||||
if (_phase == 0)
|
||||
phase_physics_process();
|
||||
}
|
||||
|
||||
void PropInstancePropJob::_execute_phase() {
|
||||
/*
|
||||
ERR_FAIL_COND(!_chunk.is_valid());
|
||||
|
||||
Ref<TerramanLibrary> library = _chunk->get_library();
|
||||
|
||||
ERR_FAIL_COND(!library.is_valid());
|
||||
|
||||
Ref<TerraChunkDefault> chunk = _chunk;
|
||||
|
||||
if (!chunk.is_valid()
|
||||
#ifdef MESH_DATA_RESOURCE_PRESENT
|
||||
|| chunk->mesh_data_resource_get_count() == 0
|
||||
#endif
|
||||
) {
|
||||
set_complete(true);
|
||||
finished();
|
||||
return;
|
||||
}
|
||||
*/
|
||||
if (_phase == 1) {
|
||||
//phase_prop();
|
||||
} else if (_phase > 1) {
|
||||
set_complete(true); //So threadpool knows it's done
|
||||
finished();
|
||||
ERR_FAIL_MSG("PropInstancePropJob: _phase is too high!");
|
||||
}
|
||||
|
||||
set_complete(true); //So threadpool knows it's done
|
||||
finished();
|
||||
}
|
||||
|
||||
void PropInstancePropJob::_reset() {
|
||||
PropInstanceJob::_reset();
|
||||
|
||||
_build_done = false;
|
||||
_phase = 0;
|
||||
|
||||
if (get_prop_mesher().is_valid()) {
|
||||
get_prop_mesher()->reset();
|
||||
}
|
||||
|
||||
set_build_phase_type(BUILD_PHASE_TYPE_PHYSICS_PROCESS);
|
||||
}
|
||||
|
||||
PropInstancePropJob::PropInstancePropJob() {
|
||||
set_build_phase_type(BUILD_PHASE_TYPE_PHYSICS_PROCESS);
|
||||
}
|
||||
|
||||
PropInstancePropJob::~PropInstancePropJob() {
|
||||
}
|
||||
|
||||
void PropInstancePropJob::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("get_prop_mesher"), &PropInstancePropJob::get_prop_mesher);
|
||||
ClassDB::bind_method(D_METHOD("set_prop_mesher", "mesher"), &PropInstancePropJob::set_prop_mesher);
|
||||
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "prop_mesher", PROPERTY_HINT_RESOURCE_TYPE, "PropMesher", 0), "set_prop_mesher", "get_prop_mesher");
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_physics_process", "delta"), &PropInstancePropJob::_physics_process);
|
||||
}
|
||||
61
prop_instance_prop_job.h
Normal file
61
prop_instance_prop_job.h
Normal file
@ -0,0 +1,61 @@
|
||||
/*
|
||||
Copyright (c) 2019-2021 Péter Magyar
|
||||
|
||||
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 PROP_JOB_H
|
||||
#define PROP_JOB_H
|
||||
|
||||
#include "prop_instance_job.h"
|
||||
|
||||
class PropMesher;
|
||||
class PropInstance;
|
||||
|
||||
class PropInstancePropJob : public PropInstanceJob {
|
||||
GDCLASS(PropInstancePropJob, PropInstanceJob);
|
||||
|
||||
public:
|
||||
PropInstance *get_prop_instace();
|
||||
void set_prop_instace(PropInstance *prop);
|
||||
void set_prop_instace_bind(Node *prop);
|
||||
|
||||
Ref<PropMesher> get_prop_mesher() const;
|
||||
void set_prop_mesher(const Ref<PropMesher> &mesher);
|
||||
|
||||
void phase_physics_process();
|
||||
void phase_prop();
|
||||
|
||||
void _physics_process(float delta);
|
||||
void _execute_phase();
|
||||
void _reset();
|
||||
|
||||
PropInstancePropJob();
|
||||
~PropInstancePropJob();
|
||||
|
||||
protected:
|
||||
static void _bind_methods();
|
||||
|
||||
Ref<PropMesher> _prop_mesher;
|
||||
PropInstance *_prop_instace;
|
||||
|
||||
Array temp_mesh_arr;
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -43,6 +43,7 @@ SOFTWARE.
|
||||
#include "prop_instance.h"
|
||||
|
||||
#include "prop_instance_job.h"
|
||||
#include "prop_instance_prop_job.h"
|
||||
|
||||
#include "prop_scene_instance.h"
|
||||
|
||||
@ -74,6 +75,7 @@ void register_props_types() {
|
||||
ClassDB::register_class<PropESSEntity>();
|
||||
|
||||
ClassDB::register_class<PropInstanceJob>();
|
||||
ClassDB::register_class<PropInstancePropJob>();
|
||||
|
||||
ClassDB::register_class<PropSceneInstance>();
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user