mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2025-01-24 01:57:18 +01:00
Fixed most includes.
This commit is contained in:
parent
b31e09f884
commit
cda00a7b80
@ -31,9 +31,9 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#include "core/config/engine.h"
|
||||
#include "core/io/resource.h"
|
||||
#include "scene/3d/light_3d.h"
|
||||
#include "core/engine.h"
|
||||
#include "core/resource.h"
|
||||
#include "scene/3d/light.h"
|
||||
|
||||
class GLTFLight : public Resource {
|
||||
GDCLASS(GLTFLight, Resource)
|
||||
|
@ -31,8 +31,8 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#include "core/io/image.h"
|
||||
#include "core/io/resource.h"
|
||||
#include "core/image.h"
|
||||
#include "core/resource.h"
|
||||
|
||||
class GLTFSpecGloss : public Resource {
|
||||
GDCLASS(GLTFSpecGloss, Resource);
|
||||
|
@ -50,10 +50,10 @@
|
||||
#include "core/version.h"
|
||||
#include "drivers/png/png_driver_common.h"
|
||||
#include "scene/2d/node_2d.h"
|
||||
#include "scene/3d/camera_3d.h"
|
||||
#include "scene/3d/mesh_instance_3d.h"
|
||||
#include "scene/3d/multimesh_instance_3d.h"
|
||||
#include "scene/3d/node_3d.h"
|
||||
#include "scene/3d/camera.h"
|
||||
#include "scene/3d/mesh_instance.h"
|
||||
#include "scene/3d/multimesh_instance.h"
|
||||
#include "scene/3d/spatial.h"
|
||||
#include "scene/animation/animation_player.h"
|
||||
#include "scene/resources/importer_mesh.h"
|
||||
#include "scene/resources/material.h"
|
||||
@ -63,13 +63,6 @@
|
||||
|
||||
#include "modules/modules_enabled.gen.h" // For csg, gridmap.
|
||||
|
||||
#ifdef MODULE_CSG_ENABLED
|
||||
#include "modules/csg/csg_shape.h"
|
||||
#endif // MODULE_CSG_ENABLED
|
||||
#ifdef MODULE_GRIDMAP_ENABLED
|
||||
#include "modules/gridmap/grid_map.h"
|
||||
#endif // MODULE_GRIDMAP_ENABLED
|
||||
|
||||
// FIXME: Hardcoded to avoid editor dependency.
|
||||
#define GLTF_IMPORT_USE_NAMED_SKIN_BINDS 16
|
||||
#define GLTF_IMPORT_DISCARD_MESHES_AND_MATERIALS 32
|
||||
|
@ -34,14 +34,12 @@
|
||||
#include "gltf_defines.h"
|
||||
#include "structures/gltf_animation.h"
|
||||
|
||||
#include "scene/3d/bone_attachment_3d.h"
|
||||
#include "scene/3d/importer_mesh_instance_3d.h"
|
||||
#include "scene/3d/mesh_instance_3d.h"
|
||||
#include "scene/3d/bone_attachment.h"
|
||||
#include "scene/3d/importer_mesh_instance.h"
|
||||
#include "scene/3d/mesh_instance.h"
|
||||
#include "scene/animation/animation_player.h"
|
||||
#include "scene/resources/material.h"
|
||||
|
||||
#include "modules/modules_enabled.gen.h" // For csg, gridmap.
|
||||
|
||||
class GLTFDocument : public Resource {
|
||||
GDCLASS(GLTFDocument, Resource);
|
||||
TypedArray<GLTFDocumentExtension> document_extensions;
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include "gltf_state.h"
|
||||
|
||||
#include "core/error/error_macros.h"
|
||||
#include "scene/3d/mesh_instance_3d.h"
|
||||
#include "scene/3d/mesh_instance.h"
|
||||
#include "scene/resources/importer_mesh.h"
|
||||
|
||||
void GLTFDocumentExtensionConvertImporterMesh::_bind_methods() {
|
||||
|
@ -34,7 +34,7 @@
|
||||
#include "gltf_document_extension.h"
|
||||
|
||||
#include "scene/3d/importer_mesh_instance_3d.h"
|
||||
#include "scene/3d/mesh_instance_3d.h"
|
||||
#include "scene/3d/mesh_instance.h"
|
||||
#include "scene/resources/importer_mesh.h"
|
||||
|
||||
class GLTFDocumentExtensionConvertImporterMesh : public GLTFDocumentExtension {
|
||||
|
@ -43,7 +43,7 @@
|
||||
#include "structures/gltf_skin.h"
|
||||
#include "structures/gltf_texture.h"
|
||||
|
||||
#include "core/templates/rb_map.h"
|
||||
#include "core/rb_map.h"
|
||||
#include "scene/animation/animation_player.h"
|
||||
#include "scene/resources/texture.h"
|
||||
|
||||
|
@ -31,9 +31,9 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#include "core/templates/hash_set.h"
|
||||
#include "core/variant/array.h"
|
||||
#include "core/variant/dictionary.h"
|
||||
#include "core/hash_set.h"
|
||||
#include "core/array.h"
|
||||
#include "core/dictionary.h"
|
||||
|
||||
namespace GLTFTemplateConvert {
|
||||
template <class T>
|
||||
|
@ -57,7 +57,7 @@ void unregister_gltf_types() {
|
||||
#include "structures/gltf_texture.h"
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
#include "core/config/project_settings.h"
|
||||
#include "core/project_settings.h"
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_scene_exporter_gltf_plugin.h"
|
||||
#include "editor/editor_scene_importer_blend.h"
|
||||
|
@ -66,8 +66,8 @@ void GLTFAccessor::_bind_methods() {
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "normalized"), "set_normalized", "get_normalized"); // bool
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "count"), "set_count", "get_count"); // int
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "type"), "set_type", "get_type"); // GLTFType
|
||||
ADD_PROPERTY(PropertyInfo(Variant::PACKED_FLOAT64_ARRAY, "min"), "set_min", "get_min"); // Vector<real_t>
|
||||
ADD_PROPERTY(PropertyInfo(Variant::PACKED_FLOAT64_ARRAY, "max"), "set_max", "get_max"); // Vector<real_t>
|
||||
ADD_PROPERTY(PropertyInfo(Variant::POOL_REAL_ARRAY, "min"), "set_min", "get_min"); // Vector<real_t>
|
||||
ADD_PROPERTY(PropertyInfo(Variant::POOL_REAL_ARRAY, "max"), "set_max", "get_max"); // Vector<real_t>
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "sparse_count"), "set_sparse_count", "get_sparse_count"); // int
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "sparse_indices_buffer_view"), "set_sparse_indices_buffer_view", "get_sparse_indices_buffer_view"); // int
|
||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "sparse_indices_byte_offset"), "set_sparse_indices_byte_offset", "get_sparse_indices_byte_offset"); // int
|
||||
|
@ -31,7 +31,7 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#include "core/io/resource.h"
|
||||
#include "core/resource.h"
|
||||
|
||||
#include "../gltf_defines.h"
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#include "core/io/resource.h"
|
||||
#include "core/resource.h"
|
||||
|
||||
class GLTFAnimation : public Resource {
|
||||
GDCLASS(GLTFAnimation, Resource);
|
||||
|
@ -32,7 +32,7 @@
|
||||
/*************************************************************************/
|
||||
|
||||
#include "../gltf_defines.h"
|
||||
#include "core/io/resource.h"
|
||||
#include "core/resource.h"
|
||||
|
||||
class GLTFBufferView : public Resource {
|
||||
GDCLASS(GLTFBufferView, Resource);
|
||||
|
@ -31,7 +31,7 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#include "core/io/resource.h"
|
||||
#include "core/resource.h"
|
||||
|
||||
class GLTFCamera : public Resource {
|
||||
GDCLASS(GLTFCamera, Resource);
|
||||
|
@ -31,7 +31,7 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#include "core/io/resource.h"
|
||||
#include "core/resource.h"
|
||||
#include "scene/3d/importer_mesh_instance_3d.h"
|
||||
#include "scene/resources/importer_mesh.h"
|
||||
#include "scene/resources/mesh.h"
|
||||
|
@ -32,7 +32,7 @@
|
||||
/*************************************************************************/
|
||||
|
||||
#include "../gltf_defines.h"
|
||||
#include "core/io/resource.h"
|
||||
#include "core/resource.h"
|
||||
|
||||
class GLTFNode : public Resource {
|
||||
GDCLASS(GLTFNode, Resource);
|
||||
|
@ -31,7 +31,7 @@
|
||||
#include "gltf_skeleton.h"
|
||||
|
||||
#include "../gltf_template_convert.h"
|
||||
#include "scene/3d/bone_attachment_3d.h"
|
||||
#include "scene/3d/bone_attachment.h"
|
||||
|
||||
void GLTFSkeleton::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("get_joints"), &GLTFSkeleton::get_joints);
|
||||
|
@ -32,7 +32,7 @@
|
||||
/*************************************************************************/
|
||||
|
||||
#include "../gltf_defines.h"
|
||||
#include "core/io/resource.h"
|
||||
#include "core/resource.h"
|
||||
|
||||
class GLTFSkeleton : public Resource {
|
||||
GDCLASS(GLTFSkeleton, Resource);
|
||||
|
@ -32,7 +32,7 @@
|
||||
/*************************************************************************/
|
||||
|
||||
#include "../gltf_defines.h"
|
||||
#include "core/io/resource.h"
|
||||
#include "core/resource.h"
|
||||
|
||||
class GLTFSkin : public Resource {
|
||||
GDCLASS(GLTFSkin, Resource);
|
||||
|
@ -32,7 +32,7 @@
|
||||
/*************************************************************************/
|
||||
|
||||
#include "../gltf_defines.h"
|
||||
#include "core/io/resource.h"
|
||||
#include "core/resource.h"
|
||||
|
||||
class GLTFTexture : public Resource {
|
||||
GDCLASS(GLTFTexture, Resource);
|
||||
|
Loading…
Reference in New Issue
Block a user