Merge pull request #15 from untodesu/metavoxels

Metavoxels

1 files changed, 2 insertions, 5 deletions

diff --git a/game/shared/world/ray_dda.hh b/game/shared/world/ray_dda.hh
index 54bd48a..110e3d4 100644
--- a/game/shared/world/ray_dda.hh
+++ b/game/shared/world/ray_dda.hh
@@ -1,5 +1,3 @@
-#ifndef SHARED_RAY_DDA

-#define SHARED_RAY_DDA 1

 #pragma once

 

 #include "shared/types.hh"

@@ -7,6 +5,7 @@
 namespace world

 {

 class Dimension;

+class Voxel;

 } // namespace world

 

 namespace world

@@ -20,7 +19,7 @@ public:
     void reset(const Dimension* dimension, const chunk_pos& start_chunk, const glm::fvec3& start_fpos, const glm::fvec3& direction);

     void reset(const Dimension& dimension, const chunk_pos& start_chunk, const glm::fvec3& start_fpos, const glm::fvec3& direction);

 

-    voxel_id step(void);

+    const Voxel* step(void);

 

 public:

     const Dimension* dimension;

@@ -37,5 +36,3 @@ public:
     voxel_pos vpos;

 };

 } // namespace world

-

-#endif // SHARED_RAY_DDA