mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2024-12-25 05:07:12 +01:00
Now VoxelWorld and TerrainWorld inherits from Spatial instead of Navigation, and Terrain2DWorld inherits from Node2D insteaf of Navigation2D, as there is now a proper NavigationServer. Also this will make Node hieararchies involvig them more versatile.
This commit is contained in:
parent
5861ad6485
commit
8bf5c70f50
@ -27,7 +27,7 @@ SOFTWARE.
|
|||||||
|
|
||||||
#include "../defines.h"
|
#include "../defines.h"
|
||||||
|
|
||||||
#include "scene/3d/navigation.h"
|
#include "scene/3d/spatial.h"
|
||||||
|
|
||||||
#include "../areas/terrain_world_area.h"
|
#include "../areas/terrain_world_area.h"
|
||||||
#include "../level_generator/terrain_level_generator.h"
|
#include "../level_generator/terrain_level_generator.h"
|
||||||
@ -45,8 +45,8 @@ class TerrainStructure;
|
|||||||
class TerrainChunk;
|
class TerrainChunk;
|
||||||
class PropData;
|
class PropData;
|
||||||
|
|
||||||
class TerrainWorld : public Navigation {
|
class TerrainWorld : public Spatial {
|
||||||
GDCLASS(TerrainWorld, Navigation);
|
GDCLASS(TerrainWorld, Spatial);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
enum ChannelTypeInfo {
|
enum ChannelTypeInfo {
|
||||||
|
@ -27,7 +27,7 @@ SOFTWARE.
|
|||||||
|
|
||||||
#include "../defines.h"
|
#include "../defines.h"
|
||||||
|
|
||||||
#include "scene/2d/navigation_2d.h"
|
#include "scene/2d/node_2d.h"
|
||||||
|
|
||||||
#include "../areas/terrain_2d_world_area.h"
|
#include "../areas/terrain_2d_world_area.h"
|
||||||
#include "../level_generator/terrain_2d_level_generator.h"
|
#include "../level_generator/terrain_2d_level_generator.h"
|
||||||
@ -45,8 +45,8 @@ class Terrain2DStructure;
|
|||||||
class Terrain2DChunk;
|
class Terrain2DChunk;
|
||||||
class Prop2DData;
|
class Prop2DData;
|
||||||
|
|
||||||
class Terrain2DWorld : public Navigation2D {
|
class Terrain2DWorld : public Node2D {
|
||||||
GDCLASS(Terrain2DWorld, Navigation2D);
|
GDCLASS(Terrain2DWorld, Node2D);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
enum ChannelTypeInfo {
|
enum ChannelTypeInfo {
|
||||||
|
@ -27,7 +27,7 @@ SOFTWARE.
|
|||||||
|
|
||||||
#include "../defines.h"
|
#include "../defines.h"
|
||||||
|
|
||||||
#include "scene/3d/navigation.h"
|
#include "scene/3d/spatial.h"
|
||||||
|
|
||||||
#include "../areas/world_area.h"
|
#include "../areas/world_area.h"
|
||||||
#include "../level_generator/voxel_level_generator.h"
|
#include "../level_generator/voxel_level_generator.h"
|
||||||
@ -45,8 +45,8 @@ class VoxelStructure;
|
|||||||
class VoxelChunk;
|
class VoxelChunk;
|
||||||
class PropData;
|
class PropData;
|
||||||
|
|
||||||
class VoxelWorld : public Navigation {
|
class VoxelWorld : public Spatial {
|
||||||
GDCLASS(VoxelWorld, Navigation);
|
GDCLASS(VoxelWorld, Spatial);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
enum ChannelTypeInfo {
|
enum ChannelTypeInfo {
|
||||||
|
Loading…
Reference in New Issue
Block a user