asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Scene: Ensure classes match their header filename

Browse source 
Also drop some unused files.

Renamed:
- `scene/2d/navigation2d.h` -> `navigation_2d.h`
- `scene/2d/screen_button.h` -> `touch_screen_button.h`
- `scene/3d/scenario_fx.h` -> `world_environment.h`
- `scene/audio/audio_player.h` -> `audio_stream_player.h`
- `scene/resources/bit_mask.h` -> `bit_map.h`
- `scene/resources/color_ramp.h` -> `gradient.h`
- `scene/resources/shape_line_2d.h` -> `line_shape_2d.h`
- `scene/resources/scene_format_text.h` -> `resource_format_text.h`
- `scene/resources/sky_box.h` -> `sky.h`

Dropped:
- `scene/resources/bounds.h`
This commit is contained in:
Rémi Verschelde 2019-02-12 17:18:13 +01:00
parent bc26d0d6cd
commit c5dcbeb160
43 changed files with 87 additions and 185 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editor/editor_export.cpp
View file

@ -42,7 +42,7 @@
#include "editor/plugins/script_editor_plugin.h"
#include "editor_node.h"
#include "editor_settings.h"
#include "scene/resources/scene_format_text.h"
#include "scene/resources/resource_format_text.h"
#include "thirdparty/misc/md5.h"
static int _get_pad(int p_alignment, int p_n) {

2
editor/import/resource_importer_bitmask.cpp
View file

@ -34,7 +34,7 @@
#include "core/io/image_loader.h"
#include "editor/editor_file_system.h"
#include "editor/editor_node.h"
#include "scene/resources/bit_mask.h"
#include "scene/resources/bit_map.h"
#include "scene/resources/texture.h"
String ResourceImporterBitMap::get_importer_name() const {

2
editor/import/resource_importer_scene.cpp
View file

@ -46,7 +46,7 @@
#include "scene/resources/box_shape.h"
#include "scene/resources/plane_shape.h"
#include "scene/resources/ray_shape.h"
#include "scene/resources/scene_format_text.h"
#include "scene/resources/resource_format_text.h"
#include "scene/resources/sphere_shape.h"
uint32_t EditorSceneImporter::get_import_flags() const {

2
editor/plugins/audio_stream_editor_plugin.h
View file

@ -33,7 +33,7 @@
#include "editor/editor_node.h"
#include "editor/editor_plugin.h"
#include "scene/audio/audio_player.h"
#include "scene/audio/audio_stream_player.h"
#include "scene/gui/color_rect.h"
#include "scene/resources/texture.h"

2
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -42,9 +42,9 @@
#include "scene/2d/light_2d.h"
#include "scene/2d/particles_2d.h"
#include "scene/2d/polygon_2d.h"
#include "scene/2d/screen_button.h"
#include "scene/2d/skeleton_2d.h"
#include "scene/2d/sprite.h"
#include "scene/2d/touch_screen_button.h"
#include "scene/gui/grid_container.h"
#include "scene/gui/nine_patch_rect.h"
#include "scene/main/canvas_layer.h"

2
editor/plugins/collision_shape_2d_editor_plugin.cpp
View file

@ -35,9 +35,9 @@
#include "scene/resources/circle_shape_2d.h"
#include "scene/resources/concave_polygon_shape_2d.h"
#include "scene/resources/convex_polygon_shape_2d.h"
#include "scene/resources/line_shape_2d.h"
#include "scene/resources/rectangle_shape_2d.h"
#include "scene/resources/segment_shape_2d.h"
#include "scene/resources/shape_line_2d.h"
Variant CollisionShape2DEditor::get_handle_value(int idx) const {

2
editor/plugins/editor_preview_plugins.cpp
View file

@ -36,7 +36,7 @@
#include "editor/editor_node.h"
#include "editor/editor_scale.h"
#include "editor/editor_settings.h"
#include "scene/resources/bit_mask.h"
#include "scene/resources/bit_map.h"
#include "scene/resources/dynamic_font.h"
#include "scene/resources/material.h"
#include "scene/resources/mesh.h"

2
modules/gdnative/nativescript/nativescript.cpp
View file

@ -39,7 +39,7 @@
#include "core/project_settings.h"
#include "scene/main/scene_tree.h"
#include "scene/resources/scene_format_text.h"
#include "scene/resources/resource_format_text.h"
#include <stdlib.h>

2
scene/2d/collision_shape_2d.cpp
View file

@ -36,9 +36,9 @@
#include "scene/resources/circle_shape_2d.h"
#include "scene/resources/concave_polygon_shape_2d.h"
#include "scene/resources/convex_polygon_shape_2d.h"
#include "scene/resources/line_shape_2d.h"
#include "scene/resources/rectangle_shape_2d.h"
#include "scene/resources/segment_shape_2d.h"
#include "scene/resources/shape_line_2d.h"
void CollisionShape2D::_shape_changed() {

2
scene/2d/line_builder.h
View file

@ -34,7 +34,7 @@
#include "core/color.h"
#include "core/math/vector2.h"
#include "line_2d.h"
#include "scene/resources/color_ramp.h"
#include "scene/resources/gradient.h"
class LineBuilder {
public:

4
scene/2d/navigation2d.cpp → scene/2d/navigation_2d.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* navigation2d.cpp */
/* navigation_2d.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "navigation2d.h"
#include "navigation_2d.h"
#define USE_ENTRY_POINT

4
scene/2d/navigation2d.h → scene/2d/navigation_2d.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* navigation2d.h */
/* navigation_2d.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -171,4 +171,4 @@ public:
Navigation2D();
};
#endif // Navigation2D2D_H
#endif // NAVIGATION_2D_H

2
scene/2d/navigation_polygon.cpp
View file

@ -32,7 +32,7 @@
#include "core/core_string_names.h"
#include "core/engine.h"
#include "navigation2d.h"
#include "navigation_2d.h"
#include "thirdparty/misc/triangulator.h"

2
scene/2d/tile_map.h
View file

@ -33,7 +33,7 @@
#include "core/self_list.h"
#include "core/vset.h"
#include "scene/2d/navigation2d.h"
#include "scene/2d/navigation_2d.h"
#include "scene/2d/node_2d.h"
#include "scene/resources/tile_set.h"

5
scene/2d/screen_button.cpp → scene/2d/touch_screen_button.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* screen_button.cpp */
/* touch_screen_button.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "screen_button.h"
#include "touch_screen_button.h"
#include "core/input_map.h"
#include "core/os/input.h"
#include "core/os/os.h"

10
scene/2d/screen_button.h → scene/2d/touch_screen_button.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* screen_button.h */
/* touch_screen_button.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef SCREEN_BUTTON_H
#define SCREEN_BUTTON_H
#ifndef TOUCH_SCREEN_BUTTON_H
#define TOUCH_SCREEN_BUTTON_H
#include "scene/2d/node_2d.h"
#include "scene/resources/bit_mask.h"
#include "scene/resources/bit_map.h"
#include "scene/resources/rectangle_shape_2d.h"
#include "scene/resources/texture.h"
@ -112,4 +112,4 @@ public:
VARIANT_ENUM_CAST(TouchScreenButton::VisibilityMode);
#endif // SCREEN_BUTTON_H
#endif // TOUCH_SCREEN_BUTTON_H

2
scene/3d/SCsub
View file

@ -7,6 +7,6 @@ if env['disable_3d']:
env.scene_sources.append("3d/skeleton.cpp")
env.scene_sources.append("3d/particles.cpp")
env.scene_sources.append("3d/visual_instance.cpp")
env.scene_sources.append("3d/scenario_fx.cpp")
env.scene_sources.append("3d/world_environment.cpp")
else:
env.add_source_files(env.scene_sources, "*.cpp")

2
scene/3d/reflection_probe.h
View file

@ -32,7 +32,7 @@
#define REFLECTIONPROBE_H
#include "scene/3d/visual_instance.h"
#include "scene/resources/sky_box.h"
#include "scene/resources/sky.h"
#include "scene/resources/texture.h"
#include "servers/visual_server.h"

4
scene/3d/scenario_fx.cpp → scene/3d/world_environment.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* scenario_fx.cpp */
/* world_environment.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "scenario_fx.h"
#include "world_environment.h"
#include "scene/main/viewport.h"
void WorldEnvironment::_notification(int p_what) {

2
scene/3d/scenario_fx.h → scene/3d/world_environment.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* scenario_fx.h */
/* world_environment.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */

4
scene/audio/audio_player.cpp → scene/audio/audio_stream_player.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* audio_player.cpp */
/* audio_stream_player.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "audio_player.h"
#include "audio_stream_player.h"
#include "core/engine.h"

9
scene/audio/audio_player.h → scene/audio/audio_stream_player.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* audio_player.h */
/* audio_stream_player.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef AUDIOPLAYER_H
#define AUDIOPLAYER_H
#ifndef AUDIO_STREAM_PLAYER_H
#define AUDIO_STREAM_PLAYER_H
#include "scene/main/node.h"
#include "servers/audio/audio_stream.h"
@ -110,4 +110,5 @@ public:
};
VARIANT_ENUM_CAST(AudioStreamPlayer::MixTarget)
#endif // AUDIOPLAYER_H
#endif // AUDIO_STREAM_PLAYER_H

2
scene/gui/gradient_edit.h
View file

@ -33,8 +33,8 @@
#include "scene/gui/color_picker.h"
#include "scene/gui/popup.h"
#include "scene/resources/color_ramp.h"
#include "scene/resources/default_theme/theme_data.h"
#include "scene/resources/gradient.h"
#define POINT_WIDTH (8 * EDSCALE)

2
scene/gui/link_button.h
View file

@ -32,7 +32,7 @@
#define LINKBUTTON_H
#include "scene/gui/base_button.h"
#include "scene/resources/bit_mask.h"
#include "scene/resources/bit_map.h"
class LinkButton : public BaseButton {

2
scene/gui/texture_button.h
View file

@ -32,7 +32,7 @@
#define TEXTURE_BUTTON_H
#include "scene/gui/base_button.h"
#include "scene/resources/bit_mask.h"
#include "scene/resources/bit_map.h"
class TextureButton : public BaseButton {
GDCLASS(TextureButton, BaseButton);

1
scene/main/scene_tree.h
View file

@ -43,7 +43,6 @@
@author Juan Linietsky <reduzio@gmail.com>
*/
class SceneTree;
class PackedScene;
class Node;
class Viewport;

2
scene/main/viewport.cpp
View file

@ -37,8 +37,8 @@
#include "scene/3d/camera.h"
#include "scene/3d/collision_object.h"
#include "scene/3d/listener.h"
#include "scene/3d/scenario_fx.h"
#include "scene/3d/spatial.h"
#include "scene/3d/world_environment.h"
#include "scene/gui/control.h"
#include "scene/gui/label.h"
#include "scene/gui/menu_button.h"

18
scene/register_scene_types.cpp
View file

@ -48,7 +48,7 @@
#include "scene/2d/light_occluder_2d.h"
#include "scene/2d/line_2d.h"
#include "scene/2d/mesh_instance_2d.h"
#include "scene/2d/navigation2d.h"
#include "scene/2d/navigation_2d.h"
#include "scene/2d/parallax_background.h"
#include "scene/2d/parallax_layer.h"
#include "scene/2d/particles_2d.h"
@ -58,10 +58,10 @@
#include "scene/2d/position_2d.h"
#include "scene/2d/ray_cast_2d.h"
#include "scene/2d/remote_transform_2d.h"
#include "scene/2d/screen_button.h"
#include "scene/2d/skeleton_2d.h"
#include "scene/2d/sprite.h"
#include "scene/2d/tile_map.h"
#include "scene/2d/touch_screen_button.h"
#include "scene/2d/visibility_notifier_2d.h"
#include "scene/2d/y_sort.h"
#include "scene/animation/animation_blend_space_1d.h"
@ -73,7 +73,7 @@
#include "scene/animation/animation_tree_player.h"
#include "scene/animation/root_motion_view.h"
#include "scene/animation/tween.h"
#include "scene/audio/audio_player.h"
#include "scene/audio/audio_stream_player.h"
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
#include "scene/gui/center_container.h"
@ -125,12 +125,11 @@
#include "scene/main/timer.h"
#include "scene/main/viewport.h"
#include "scene/resources/audio_stream_sample.h"
#include "scene/resources/bit_mask.h"
#include "scene/resources/bit_map.h"
#include "scene/resources/box_shape.h"
#include "scene/resources/capsule_shape.h"
#include "scene/resources/capsule_shape_2d.h"
#include "scene/resources/circle_shape_2d.h"
#include "scene/resources/color_ramp.h"
#include "scene/resources/concave_polygon_shape.h"
#include "scene/resources/concave_polygon_shape_2d.h"
#include "scene/resources/convex_polygon_shape.h"
@ -139,6 +138,8 @@
#include "scene/resources/default_theme/default_theme.h"
#include "scene/resources/dynamic_font.h"
#include "scene/resources/dynamic_font_stb.h"
#include "scene/resources/gradient.h"
#include "scene/resources/line_shape_2d.h"
#include "scene/resources/material.h"
#include "scene/resources/mesh.h"
#include "scene/resources/mesh_data_tool.h"
@ -151,10 +152,9 @@
#include "scene/resources/primitive_meshes.h"
#include "scene/resources/ray_shape.h"
#include "scene/resources/rectangle_shape_2d.h"
#include "scene/resources/scene_format_text.h"
#include "scene/resources/resource_format_text.h"
#include "scene/resources/segment_shape_2d.h"
#include "scene/resources/shape_line_2d.h"
#include "scene/resources/sky_box.h"
#include "scene/resources/sky.h"
#include "scene/resources/sphere_shape.h"
#include "scene/resources/surface_tool.h"
#include "scene/resources/text_file.h"
@ -167,8 +167,8 @@
#include "scene/resources/world_2d.h"
#include "scene/scene_string_names.h"
#include "scene/3d/scenario_fx.h"
#include "scene/3d/spatial.h"
#include "scene/3d/world_environment.h"
#ifndef _3D_DISABLED
#include "scene/3d/area.h"

4
scene/resources/bit_mask.cpp → scene/resources/bit_map.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* bit_mask.cpp */
/* bit_map.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "bit_mask.h"
#include "bit_map.h"
#include "core/io/image_loader.h"

8
scene/resources/bit_mask.h → scene/resources/bit_map.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* bit_mask.h */
/* bit_map.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef BIT_MASK_H
#define BIT_MASK_H
#ifndef BIT_MAP_H
#define BIT_MAP_H
#include "core/image.h"
#include "core/io/resource_loader.h"
@ -72,4 +72,4 @@ public:
BitMap();
};
#endif // BIT_MASK_H
#endif // BIT_MAP_H

52
scene/resources/bounds.cpp
View file

@ -1,52 +0,0 @@
/*************************************************************************/
/* bounds.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* 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 "bounds.h"
void Bounds::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_bsp_tree", "bsp_tree"), &Bounds::set_bsp_tree);
ClassDB::bind_method(D_METHOD("get_bsp_tree"), &Bounds::get_bsp_tree);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "bsp_tree"), "set_bsp_tree", "get_bsp_tree");
}
void Bounds::set_bsp_tree(const BSP_Tree &p_bsp_tree) {
bsp_tree = p_bsp_tree;
}
BSP_Tree Bounds::get_bsp_tree() const {
return bsp_tree;
}
Bounds::Bounds() {
}

52
scene/resources/bounds.h
View file

@ -1,52 +0,0 @@
/*************************************************************************/
/* bounds.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* 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 BOUNDS_H
#define BOUNDS_H
#include "core/math/bsp_tree.h"
#include "core/resource.h"
class Bounds : public Resource {
GDCLASS(Bounds, Resource);
BSP_Tree bsp_tree;
protected:
static void _bind_methods();
public:
void set_bsp_tree(const BSP_Tree &p_bsp_tree);
BSP_Tree get_bsp_tree() const;
Bounds();
};
#endif // BOUNDS_H

2
scene/resources/environment.h
View file

@ -32,7 +32,7 @@
#define ENVIRONMENT_H
#include "core/resource.h"
#include "scene/resources/sky_box.h"
#include "scene/resources/sky.h"
#include "scene/resources/texture.h"
#include "servers/visual_server.h"

5
scene/resources/color_ramp.cpp → scene/resources/gradient.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* color_ramp.cpp */
/* gradient.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "color_ramp.h"
#include "gradient.h"
#include "core/core_string_names.h"
//setter and getter names for property serialization

8
scene/resources/color_ramp.h → scene/resources/gradient.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* color_ramp.h */
/* gradient.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef SCENE_RESOURCES_COLOR_RAMP_H_
#define SCENE_RESOURCES_COLOR_RAMP_H_
#ifndef GRADIENT_H
#define GRADIENT_H
#include "core/resource.h"
@ -126,4 +126,4 @@ public:
int get_points_count() const;
};
#endif /* SCENE_RESOURCES_COLOR_RAMP_H_ */
#endif // GRADIENT_H

5
scene/resources/shape_line_2d.cpp → scene/resources/line_shape_2d.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* shape_line_2d.cpp */
/* line_shape_2d.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "shape_line_2d.h"
#include "line_shape_2d.h"
#include "servers/physics_2d_server.h"
#include "servers/visual_server.h"

8
scene/resources/shape_line_2d.h → scene/resources/line_shape_2d.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* shape_line_2d.h */
/* line_shape_2d.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef SHAPE_LINE_2D_H
#define SHAPE_LINE_2D_H
#ifndef LINE_SHAPE_2D_H
#define LINE_SHAPE_2D_H
#include "scene/resources/shape_2d.h"
@ -59,4 +59,4 @@ public:
LineShape2D();
};
#endif // SHAPE_LINE_2D_H
#endif // LINE_SHAPE_2D_H

5
scene/resources/scene_format_text.cpp → scene/resources/resource_format_text.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* scene_format_text.cpp */
/* resource_format_text.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "scene_format_text.h"
#include "resource_format_text.h"
#include "core/io/resource_format_binary.h"
#include "core/os/dir_access.h"
#include "core/project_settings.h"

8
scene/resources/scene_format_text.h → scene/resources/resource_format_text.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* scene_format_text.h */
/* resource_format_text.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef SCENE_FORMAT_TEXT_H
#define SCENE_FORMAT_TEXT_H
#ifndef RESOURCE_FORMAT_TEXT_H
#define RESOURCE_FORMAT_TEXT_H
#include "core/io/resource_loader.h"
#include "core/io/resource_saver.h"
@ -180,4 +180,4 @@ public:
ResourceFormatSaverText();
};
#endif // SCENE_FORMAT_TEXT_H
#endif // RESOURCE_FORMAT_TEXT_H

5
scene/resources/sky_box.cpp → scene/resources/sky.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* sky_box.cpp */
/* sky.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "sky_box.h"
#include "sky.h"
#include "core/io/image_loader.h"
void Sky::set_radiance_size(RadianceSize p_size) {

9
scene/resources/sky_box.h → scene/resources/sky.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* sky_box.h */
/* sky.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,11 +28,12 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef SKY_BOX_H
#define SKY_BOX_H
#ifndef SKY_H
#define SKY_H
#include "core/os/thread.h"
#include "scene/resources/texture.h"
class Sky : public Resource {
GDCLASS(Sky, Resource);
@ -196,4 +197,4 @@ public:
VARIANT_ENUM_CAST(ProceduralSky::TextureSize)
#endif // SKY_BOX_H
#endif // SKY_H

2
scene/resources/texture.cpp
View file

@ -34,7 +34,7 @@
#include "core/io/image_loader.h"
#include "core/method_bind_ext.gen.inc"
#include "core/os/os.h"
#include "scene/resources/bit_mask.h"
#include "scene/resources/bit_map.h"
Size2 Texture::get_size() const {

2
scene/resources/texture.h
View file

@ -37,8 +37,8 @@
#include "core/os/rw_lock.h"
#include "core/os/thread_safe.h"
#include "core/resource.h"
#include "scene/resources/color_ramp.h"
#include "scene/resources/curve.h"
#include "scene/resources/gradient.h"
#include "servers/visual_server.h"
/**