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

Lots of work on GLTFDocument.

Browse Source
This commit is contained in:
Relintai 2022-08-08 02:53:46 +02:00
parent ffd29397f8
commit 42607ee8ca
7 changed files with 481 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -1494,7 +1494,7 @@ void AnimationPlayerEditor::_prepare_onion_layers_2() {
onion.captures_valid.write[cidx] = valid; onion.captures_valid.write[cidx] = valid;
if (valid) { if (valid) {
player->seek(pos, true); player->seek(pos, true);
get_tree()->flush_transform_notifications(); // Needed for transforms of Node3Ds. get_tree()->flush_transform_notifications(); // Needed for transforms of Spatials.
values_backup->update_skeletons(); // Needed for Skeletons (2D & 3D). values_backup->update_skeletons(); // Needed for Skeletons (2D & 3D).
VS::get_singleton()->viewport_set_active(onion.captures[cidx], true); VS::get_singleton()->viewport_set_active(onion.captures[cidx], true);

1
modules/gltf/SCsub
View File

@ -11,6 +11,7 @@ env_gltf.add_source_files(env.modules_sources, "register_types.cpp")
env_gltf.add_source_files(env.modules_sources, "gltf_state.cpp") env_gltf.add_source_files(env.modules_sources, "gltf_state.cpp")
env_gltf.add_source_files(env.modules_sources, "gltf_document_extension.cpp") env_gltf.add_source_files(env.modules_sources, "gltf_document_extension.cpp")
env_gltf.add_source_files(env.modules_sources, "gltf_document_extension_convert_importer_mesh.cpp") env_gltf.add_source_files(env.modules_sources, "gltf_document_extension_convert_importer_mesh.cpp")
env_gltf.add_source_files(env.modules_sources, "gltf_document.cpp")
#env_gltf.add_source_files(env.modules_sources, "*.cpp") #env_gltf.add_source_files(env.modules_sources, "*.cpp")

4
modules/gltf/doc_classes/GLTFDocument.xml
View File

@ -10,7 +10,7 @@
<methods> <methods>
<method name="append_from_buffer"> <method name="append_from_buffer">
<return type="int" enum="Error" /> <return type="int" enum="Error" />
<argument index="0" name="bytes" type="PackedByteArray" /> <argument index="0" name="bytes" type="PoolByteArray" />
<argument index="1" name="base_path" type="String" /> <argument index="1" name="base_path" type="String" />
<argument index="2" name="state" type="GLTFState" /> <argument index="2" name="state" type="GLTFState" />
<argument index="3" name="flags" type="int" default="0" /> <argument index="3" name="flags" type="int" default="0" />
@ -38,7 +38,7 @@
</description> </description>
</method> </method>
<method name="generate_buffer"> <method name="generate_buffer">
<return type="PackedByteArray" /> <return type="PoolByteArray" />
<argument index="0" name="state" type="GLTFState" /> <argument index="0" name="state" type="GLTFState" />
<description> <description>
</description> </description>

2
modules/gltf/doc_classes/GLTFState.xml
View File

@ -196,7 +196,7 @@
</member> </member>
<member name="buffers" type="Array" setter="set_buffers" getter="get_buffers" default="[]"> <member name="buffers" type="Array" setter="set_buffers" getter="get_buffers" default="[]">
</member> </member>
<member name="glb_data" type="PackedByteArray" setter="set_glb_data" getter="get_glb_data" default="PackedByteArray()"> <member name="glb_data" type="PoolByteArray" setter="set_glb_data" getter="get_glb_data" default="PoolByteArray()">
</member> </member>
<member name="json" type="Dictionary" setter="set_json" getter="get_json" default="{}"> <member name="json" type="Dictionary" setter="set_json" getter="get_json" default="{}">
</member> </member>

746
modules/gltf/gltf_document.cpp
View File

File diff suppressed because it is too large Load Diff

78
modules/gltf/gltf_document.h
View File

@ -39,16 +39,14 @@
#include "scene/3d/mesh_instance.h" #include "scene/3d/mesh_instance.h"
#include "scene/animation/animation_player.h" #include "scene/animation/animation_player.h"
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "core/os/file_access.h"
class Camera;
class GLTFDocument : public Resource { class GLTFDocument : public Resource {
GDCLASS(GLTFDocument, Resource); GDCLASS(GLTFDocument, Resource);
Vector<GLTFDocumentExtension> document_extensions;
private:
const float BAKE_FPS = 30.0f;
public: public:
GLTFDocument();
const int32_t JOINT_GROUP_SIZE = 4; const int32_t JOINT_GROUP_SIZE = 4;
enum { enum {
@ -70,12 +68,12 @@ public:
COMPONENT_TYPE_FLOAT = 5126, COMPONENT_TYPE_FLOAT = 5126,
}; };
protected:
static void _bind_methods();
public: public:
void set_extensions(TypedArray<GLTFDocumentExtension> p_extensions); void set_extensionsv(const Vector<Ref<GLTFDocumentExtension>> &p_extensions);
TypedArray<GLTFDocumentExtension> get_extensions() const; Vector<Ref<GLTFDocumentExtension>> get_extensionsv() const;
void set_extensions(const Vector<Variant> &p_extensions);
Vector<Variant> get_extensions() const;
private: private:
void _build_parent_hierachy(Ref<GLTFState> state); void _build_parent_hierachy(Ref<GLTFState> state);
@ -117,13 +115,13 @@ private:
Vector<float> _decode_accessor_as_floats(Ref<GLTFState> state, Vector<float> _decode_accessor_as_floats(Ref<GLTFState> state,
const GLTFAccessorIndex p_accessor, const GLTFAccessorIndex p_accessor,
const bool p_for_vertex); const bool p_for_vertex);
Vector<int> _decode_accessor_as_ints(Ref<GLTFState> state, PoolIntArray _decode_accessor_as_ints(Ref<GLTFState> state,
const GLTFAccessorIndex p_accessor, const GLTFAccessorIndex p_accessor,
const bool p_for_vertex); const bool p_for_vertex);
Vector<Vector2> _decode_accessor_as_vec2(Ref<GLTFState> state, Vector<Vector2> _decode_accessor_as_vec2(Ref<GLTFState> state,
const GLTFAccessorIndex p_accessor, const GLTFAccessorIndex p_accessor,
const bool p_for_vertex); const bool p_for_vertex);
Vector<Vector3> _decode_accessor_as_vec3(Ref<GLTFState> state, PoolVector3Array _decode_accessor_as_vec3(Ref<GLTFState> state,
const GLTFAccessorIndex p_accessor, const GLTFAccessorIndex p_accessor,
const bool p_for_vertex); const bool p_for_vertex);
Vector<Color> _decode_accessor_as_color(Ref<GLTFState> state, Vector<Color> _decode_accessor_as_color(Ref<GLTFState> state,
@ -185,9 +183,9 @@ private:
const GLTFNodeIndex node_index, const GLTFNodeIndex node_index,
const GLTFNodeIndex bone_index); const GLTFNodeIndex bone_index);
ImporterMeshInstance3D *_generate_mesh_instance(Ref<GLTFState> state, const GLTFNodeIndex node_index); ImporterMeshInstance3D *_generate_mesh_instance(Ref<GLTFState> state, const GLTFNodeIndex node_index);
Camera3D *_generate_camera(Ref<GLTFState> state, const GLTFNodeIndex node_index); Camera *_generate_camera(Ref<GLTFState> state, const GLTFNodeIndex node_index);
Node3D *_generate_light(Ref<GLTFState> state, const GLTFNodeIndex node_index); Spatial *_generate_light(Ref<GLTFState> state, const GLTFNodeIndex node_index);
Node3D *_generate_spatial(Ref<GLTFState> state, const GLTFNodeIndex node_index); Spatial *_generate_spatial(Ref<GLTFState> state, const GLTFNodeIndex node_index);
void _assign_scene_names(Ref<GLTFState> state); void _assign_scene_names(Ref<GLTFState> state);
template <class T> template <class T>
T _interpolate_track(const Vector<real_t> &p_times, const Vector<T> &p_values, T _interpolate_track(const Vector<real_t> &p_times, const Vector<T> &p_values,
@ -203,24 +201,24 @@ private:
const Vector<Color> p_attribs, const Vector<Color> p_attribs,
const bool p_for_vertex); const bool p_for_vertex);
GLTFAccessorIndex _encode_accessor_as_floats(Ref<GLTFState> state, GLTFAccessorIndex _encode_accessor_as_floats(Ref<GLTFState> state,
const Vector<real_t> p_attribs, const PoolRealArray p_attribs,
const bool p_for_vertex); const bool p_for_vertex);
GLTFAccessorIndex _encode_accessor_as_vec2(Ref<GLTFState> state, GLTFAccessorIndex _encode_accessor_as_vec2(Ref<GLTFState> state,
const Vector<Vector2> p_attribs, const Vector<Vector2> p_attribs,
const bool p_for_vertex); const bool p_for_vertex);
void _calc_accessor_vec2_min_max(int i, const int element_count, Vector<double> &type_max, Vector2 attribs, Vector<double> &type_min) { void _calc_accessor_vec2_min_max(int i, const int element_count, PoolRealArray &type_max, Vector2 attribs, PoolRealArray &type_min) {
if (i == 0) { if (i == 0) {
for (int32_t type_i = 0; type_i < element_count; type_i++) { for (int32_t type_i = 0; type_i < element_count; type_i++) {
type_max.write[type_i] = attribs[(i * element_count) + type_i]; type_max.set(type_i, attribs[(i * element_count) + type_i]);
type_min.write[type_i] = attribs[(i * element_count) + type_i]; type_min.set(type_i, attribs[(i * element_count) + type_i]);
} }
} }
for (int32_t type_i = 0; type_i < element_count; type_i++) { for (int32_t type_i = 0; type_i < element_count; type_i++) {
type_max.write[type_i] = MAX(attribs[(i * element_count) + type_i], type_max[type_i]); type_max.set(type_i, MAX(attribs[(i * element_count) + type_i], type_max[type_i]));
type_min.write[type_i] = MIN(attribs[(i * element_count) + type_i], type_min[type_i]); type_min.set(type_i, MIN(attribs[(i * element_count) + type_i], type_min[type_i]));
type_max.write[type_i] = _filter_number(type_max.write[type_i]); type_max.set(type_i, _filter_number(type_max[type_i]));
type_min.write[type_i] = _filter_number(type_min.write[type_i]); type_min.set(type_i, _filter_number(type_min[type_i]));
} }
} }
@ -231,7 +229,7 @@ private:
const Vector<Color> p_attribs, const Vector<Color> p_attribs,
const bool p_for_vertex); const bool p_for_vertex);
void _calc_accessor_min_max(int p_i, const int p_element_count, Vector<double> &p_type_max, Vector<double> p_attribs, Vector<double> &p_type_min); void _calc_accessor_min_max(int p_i, const int p_element_count, PoolRealArray &p_type_max, PoolRealArray p_attribs, PoolRealArray &p_type_min);
GLTFAccessorIndex _encode_accessor_as_ints(Ref<GLTFState> state, GLTFAccessorIndex _encode_accessor_as_ints(Ref<GLTFState> state,
const Vector<int32_t> p_attribs, const Vector<int32_t> p_attribs,
@ -239,7 +237,7 @@ private:
GLTFAccessorIndex _encode_accessor_as_xform(Ref<GLTFState> state, GLTFAccessorIndex _encode_accessor_as_xform(Ref<GLTFState> state,
const Vector<Transform> p_attribs, const Vector<Transform> p_attribs,
const bool p_for_vertex); const bool p_for_vertex);
Error _encode_buffer_view(Ref<GLTFState> state, const double *src, Error _encode_buffer_view(Ref<GLTFState> state, const float *src,
const int count, const GLTFType type, const int count, const GLTFType type,
const int component_type, const bool normalized, const int component_type, const bool normalized,
const int byte_offset, const bool for_vertex, const int byte_offset, const bool for_vertex,
@ -258,7 +256,7 @@ private:
GLTFNodeIndex p_node_i); GLTFNodeIndex p_node_i);
Error _encode_buffer_bins(Ref<GLTFState> state, const String &p_path); Error _encode_buffer_bins(Ref<GLTFState> state, const String &p_path);
Error _encode_buffer_glb(Ref<GLTFState> state, const String &p_path); Error _encode_buffer_glb(Ref<GLTFState> state, const String &p_path);
PackedByteArray _serialize_glb_buffer(Ref<GLTFState> state, Error *r_err); PoolByteArray _serialize_glb_buffer(Ref<GLTFState> state, Error *r_err);
Dictionary _serialize_texture_transform_uv1(Ref<SpatialMaterial> p_material); Dictionary _serialize_texture_transform_uv1(Ref<SpatialMaterial> p_material);
Dictionary _serialize_texture_transform_uv2(Ref<SpatialMaterial> p_material); Dictionary _serialize_texture_transform_uv2(Ref<SpatialMaterial> p_material);
Error _serialize_version(Ref<GLTFState> state); Error _serialize_version(Ref<GLTFState> state);
@ -283,12 +281,12 @@ private:
public: public:
Error append_from_file(String p_path, Ref<GLTFState> r_state, uint32_t p_flags = 0, int32_t p_bake_fps = 30, String p_base_path = String()); Error append_from_file(String p_path, Ref<GLTFState> r_state, uint32_t p_flags = 0, int32_t p_bake_fps = 30, String p_base_path = String());
Error append_from_buffer(PackedByteArray p_bytes, String p_base_path, Ref<GLTFState> r_state, uint32_t p_flags = 0, int32_t p_bake_fps = 30); Error append_from_buffer(PoolByteArray p_bytes, String p_base_path, Ref<GLTFState> r_state, uint32_t p_flags = 0, int32_t p_bake_fps = 30);
Error append_from_scene(Node *p_node, Ref<GLTFState> r_state, uint32_t p_flags = 0, int32_t p_bake_fps = 30); Error append_from_scene(Node *p_node, Ref<GLTFState> r_state, uint32_t p_flags = 0, int32_t p_bake_fps = 30);
public: public:
Node *generate_scene(Ref<GLTFState> state, int32_t p_bake_fps = 30.0f); Node *generate_scene(Ref<GLTFState> state, int32_t p_bake_fps = 30.0f);
PackedByteArray generate_buffer(Ref<GLTFState> state); PoolByteArray generate_buffer(Ref<GLTFState> state);
Error write_to_filesystem(Ref<GLTFState> state, const String &p_path); Error write_to_filesystem(Ref<GLTFState> state, const String &p_path);
public: public:
@ -296,16 +294,16 @@ public:
Error _parse_gltf_extensions(Ref<GLTFState> state); Error _parse_gltf_extensions(Ref<GLTFState> state);
void _process_mesh_instances(Ref<GLTFState> state, Node *scene_root); void _process_mesh_instances(Ref<GLTFState> state, Node *scene_root);
void _generate_scene_node(Ref<GLTFState> state, Node *scene_parent, void _generate_scene_node(Ref<GLTFState> state, Node *scene_parent,
Node3D *scene_root, Spatial *scene_root,
const GLTFNodeIndex node_index); const GLTFNodeIndex node_index);
void _generate_skeleton_bone_node(Ref<GLTFState> state, Node *scene_parent, Node3D *scene_root, const GLTFNodeIndex node_index); void _generate_skeleton_bone_node(Ref<GLTFState> state, Node *scene_parent, Spatial *scene_root, const GLTFNodeIndex node_index);
void _import_animation(Ref<GLTFState> state, AnimationPlayer *ap, void _import_animation(Ref<GLTFState> state, AnimationPlayer *ap,
const GLTFAnimationIndex index, const int bake_fps); const GLTFAnimationIndex index, const int bake_fps);
void _convert_mesh_instances(Ref<GLTFState> state); void _convert_mesh_instances(Ref<GLTFState> state);
GLTFCameraIndex _convert_camera(Ref<GLTFState> state, Camera3D *p_camera); GLTFCameraIndex _convert_camera(Ref<GLTFState> state, Camera *p_camera);
void _convert_light_to_gltf(Light *light, Ref<GLTFState> state, Ref<GLTFNode> gltf_node); void _convert_light_to_gltf(Light *light, Ref<GLTFState> state, Ref<GLTFNode> gltf_node);
GLTFLightIndex _convert_light(Ref<GLTFState> state, Light *p_light); GLTFLightIndex _convert_light(Ref<GLTFState> state, Light *p_light);
void _convert_spatial(Ref<GLTFState> state, Node3D *p_spatial, Ref<GLTFNode> p_node); void _convert_spatial(Ref<GLTFState> state, Spatial *p_spatial, Ref<GLTFNode> p_node);
void _convert_scene_node(Ref<GLTFState> state, Node *p_current, void _convert_scene_node(Ref<GLTFState> state, Node *p_current,
const GLTFNodeIndex p_gltf_current, const GLTFNodeIndex p_gltf_current,
const GLTFNodeIndex p_gltf_root); const GLTFNodeIndex p_gltf_root);
@ -322,7 +320,7 @@ public:
GLTFNodeIndex p_gltf_root_index, GLTFNodeIndex p_gltf_root_index,
Ref<GLTFNode> p_gltf_node, Node *p_scene_parent); Ref<GLTFNode> p_gltf_node, Node *p_scene_parent);
void _check_visibility(Node *p_node, bool &retflag); void _check_visibility(Node *p_node, bool &retflag);
void _convert_camera_to_gltf(Camera3D *camera, Ref<GLTFState> state, void _convert_camera_to_gltf(Camera *camera, Ref<GLTFState> state,
Ref<GLTFNode> gltf_node); Ref<GLTFNode> gltf_node);
void _convert_multi_mesh_instance_to_gltf( void _convert_multi_mesh_instance_to_gltf(
MultiMeshInstance *p_multi_mesh_instance, MultiMeshInstance *p_multi_mesh_instance,
@ -339,15 +337,25 @@ public:
GLTFNodeIndex p_parent_node_index, GLTFNodeIndex p_parent_node_index,
GLTFNodeIndex p_root_node_index, GLTFNodeIndex p_root_node_index,
Ref<GLTFNode> gltf_node); Ref<GLTFNode> gltf_node);
void _convert_mesh_instance_to_gltf(MeshInstance3D *p_mesh_instance, void _convert_mesh_instance_to_gltf(MeshInstance *p_mesh_instance,
Ref<GLTFState> state, Ref<GLTFState> state,
Ref<GLTFNode> gltf_node); Ref<GLTFNode> gltf_node);
GLTFMeshIndex _convert_mesh_to_gltf(Ref<GLTFState> state, GLTFMeshIndex _convert_mesh_to_gltf(Ref<GLTFState> state,
MeshInstance3D *p_mesh_instance); MeshInstance *p_mesh_instance);
void _convert_animation(Ref<GLTFState> state, AnimationPlayer *ap, void _convert_animation(Ref<GLTFState> state, AnimationPlayer *ap,
String p_animation_track_name); String p_animation_track_name);
Error _serialize(Ref<GLTFState> state, const String &p_path); Error _serialize(Ref<GLTFState> state, const String &p_path);
Error _parse(Ref<GLTFState> state, String p_path, FileAccess *f, int p_bake_fps); Error _parse(Ref<GLTFState> state, String p_path, FileAccess *f, int p_bake_fps);
GLTFDocument();
protected:
static void _bind_methods();
private:
const float BAKE_FPS = 30.0f;
Vector<Ref<GLTFDocumentExtension>> document_extensions;
}; };
#endif // GLTF_DOCUMENT_H #endif // GLTF_DOCUMENT_H

5
modules/gltf/register_types.cpp
View File

@ -48,6 +48,7 @@
#include "gltf_document_extension.h" #include "gltf_document_extension.h"
#include "gltf_document_extension_convert_importer_mesh.h" #include "gltf_document_extension_convert_importer_mesh.h"
#include "gltf_state.h" #include "gltf_state.h"
#include "gltf_document.h"
void register_gltf_types() { void register_gltf_types() {
ClassDB::register_class<GLTFAccessor>(); ClassDB::register_class<GLTFAccessor>();
@ -63,7 +64,7 @@ void register_gltf_types() {
ClassDB::register_class<GLTFSpecGloss>(); ClassDB::register_class<GLTFSpecGloss>();
ClassDB::register_class<GLTFLight>(); ClassDB::register_class<GLTFLight>();
//ClassDB::register_class<GLTFDocument>(); ClassDB::register_class<GLTFDocument>();
ClassDB::register_class<GLTFDocumentExtension>(); ClassDB::register_class<GLTFDocumentExtension>();
ClassDB::register_class<GLTFDocumentExtensionConvertImporterMesh>(); ClassDB::register_class<GLTFDocumentExtensionConvertImporterMesh>();
ClassDB::register_class<GLTFState>(); ClassDB::register_class<GLTFState>();
@ -74,7 +75,7 @@ void unregister_gltf_types() {
/* /*
#include "gltf_document.h"