mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2024-11-22 00:48:09 +01:00
Include cleanups for resources.
This commit is contained in:
parent
49fcf7ad80
commit
f8e54698e4
@ -30,8 +30,7 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
#include "core/pair.h"
|
||||
|
||||
#include "core/io/resource_importer.h"
|
||||
#include "scene/resources/animation.h"
|
||||
|
@ -32,9 +32,6 @@
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
|
||||
|
||||
|
||||
|
||||
#include "editor/import/resource_importer_scene.h"
|
||||
|
||||
#include "gltf_document.h"
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/main/node.h"
|
||||
|
||||
class Viewport;
|
||||
|
@ -30,13 +30,10 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "node.h"
|
||||
#include "core/io/http_client.h"
|
||||
#include "core/safe_refcount.h"
|
||||
#include "core/os/thread.h"
|
||||
#include "core/safe_refcount.h"
|
||||
#include "node.h"
|
||||
|
||||
class Timer;
|
||||
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/main/node.h"
|
||||
|
||||
class PackedScene;
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "core/object.h"
|
||||
|
||||
#include "core/map.h"
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/main/node.h"
|
||||
|
||||
class ResourcePreloader : public Node {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "core/io/multiplayer_api.h"
|
||||
#include "core/os/main_loop.h"
|
||||
#include "core/os/thread_safe.h"
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/main/node.h"
|
||||
|
||||
class Timer : public Node {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "core/math/transform_2d.h"
|
||||
#include "scene/main/node.h"
|
||||
#include "scene/resources/texture.h"
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "core/resource.h"
|
||||
|
||||
#define ANIM_MIN_LENGTH 0.001
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "servers/audio/audio_stream.h"
|
||||
|
||||
class AudioStreamSample;
|
||||
|
@ -31,6 +31,7 @@
|
||||
#include "bit_map.h"
|
||||
|
||||
#include "core/io/image_loader.h"
|
||||
#include "core/io/resource_loader.h"
|
||||
|
||||
void BitMap::create(const Size2 &p_size) {
|
||||
ERR_FAIL_COND(p_size.width < 1);
|
||||
|
@ -30,11 +30,7 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "core/image.h"
|
||||
#include "core/io/resource_loader.h"
|
||||
#include "core/resource.h"
|
||||
|
||||
class BitMap : public Resource {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/shape.h"
|
||||
|
||||
class BoxShape : public Shape {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/shape.h"
|
||||
|
||||
class CapsuleShape : public Shape {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/shape_2d.h"
|
||||
|
||||
class CapsuleShape2D : public Shape2D {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/shape_2d.h"
|
||||
|
||||
class CircleShape2D : public Shape2D {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/shape.h"
|
||||
|
||||
class ConcavePolygonShape : public Shape {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/shape_2d.h"
|
||||
|
||||
class ConcavePolygonShape2D : public Shape2D {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/shape.h"
|
||||
|
||||
class ConvexPolygonShape : public Shape {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/shape_2d.h"
|
||||
|
||||
class ConvexPolygonShape2D : public Shape2D {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "core/resource.h"
|
||||
|
||||
// y(x) curve
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/shape.h"
|
||||
|
||||
class CylinderShape : public Shape {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "modules/modules_enabled.gen.h" // For freetype.
|
||||
#ifdef MODULE_FREETYPE_ENABLED
|
||||
|
||||
@ -41,6 +38,7 @@
|
||||
#include "core/os/thread_safe.h"
|
||||
#include "core/pair.h"
|
||||
#include "scene/resources/font.h"
|
||||
#include "scene/resources/texture.h"
|
||||
|
||||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
|
@ -33,6 +33,9 @@
|
||||
#include "core/project_settings.h"
|
||||
#include "servers/visual_server.h"
|
||||
#include "texture.h"
|
||||
#include "scene/resources/sky.h"
|
||||
#include "scene/resources/texture.h"
|
||||
#include "servers/visual_server.h"
|
||||
|
||||
RID Environment::get_rid() const {
|
||||
return environment;
|
||||
|
@ -30,13 +30,10 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "core/resource.h"
|
||||
#include "scene/resources/sky.h"
|
||||
#include "scene/resources/texture.h"
|
||||
#include "servers/visual_server.h"
|
||||
|
||||
class Sky;
|
||||
class Texture;
|
||||
|
||||
class Environment : public Resource {
|
||||
GDCLASS(Environment, Resource);
|
||||
|
@ -30,9 +30,9 @@
|
||||
|
||||
#include "font.h"
|
||||
|
||||
#include "core/io/resource_loader.h"
|
||||
#include "core/method_bind_ext.gen.inc"
|
||||
#include "core/os/file_access.h"
|
||||
#include "scene/resources/texture.h"
|
||||
|
||||
void Font::draw_halign(RID p_canvas_item, const Point2 &p_pos, HAlign p_align, float p_width, const String &p_text, const Color &p_modulate, const Color &p_outline_modulate) const {
|
||||
float length = get_string_size(p_text).width;
|
||||
|
@ -30,12 +30,11 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "core/map.h"
|
||||
#include "core/resource.h"
|
||||
#include "scene/resources/texture.h"
|
||||
#include "core/io/resource_loader.h"
|
||||
|
||||
class Texture;
|
||||
|
||||
class Font : public Resource {
|
||||
GDCLASS(Font, Resource);
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "core/resource.h"
|
||||
|
||||
class Gradient : public Resource {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/shape.h"
|
||||
|
||||
class HeightMapShape : public Shape {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/shape_2d.h"
|
||||
|
||||
class LineShape2D : public Shape2D {
|
||||
|
@ -33,6 +33,8 @@
|
||||
#include "core/engine.h"
|
||||
#include "core/project_settings.h"
|
||||
#include "core/version.h"
|
||||
#include "scene/resources/texture.h"
|
||||
#include "servers/visual/shader_language.h"
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
#include "editor/editor_settings.h"
|
||||
|
@ -30,15 +30,12 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "core/resource.h"
|
||||
#include "core/self_list.h"
|
||||
#include "scene/resources/shader.h"
|
||||
#include "scene/resources/texture.h"
|
||||
#include "servers/visual/shader_language.h"
|
||||
#include "core/resource.h"
|
||||
#include "servers/visual_server.h"
|
||||
#include "scene/resources/shader.h"
|
||||
|
||||
class Texture;
|
||||
|
||||
class Material : public Resource {
|
||||
GDCLASS(Material, Resource);
|
||||
|
@ -30,12 +30,10 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "core/math/face3.h"
|
||||
#include "core/math/triangle_mesh.h"
|
||||
#include "core/resource.h"
|
||||
|
||||
#include "scene/resources/material.h"
|
||||
#include "scene/resources/shape.h"
|
||||
#include "servers/visual_server.h"
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/mesh.h"
|
||||
|
||||
class MeshDataTool : public Reference {
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/mesh.h"
|
||||
#include "servers/visual_server.h"
|
||||
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "scene/resources/mesh.h"
|
||||
|
||||
class Mesh;
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "core/math/plane.h"
|
||||
#include "core/resource.h"
|
||||
#include "core/vector.h"
|
||||
|
@ -30,9 +30,6 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "occluder_shape.h"
|
||||
|
||||
class OccluderShapePolygon : public OccluderShape {
|
||||
|
Loading…
Reference in New Issue
Block a user