Changeset 298

Timestamp:

08/07/14 04:51:37 (11 years ago)

Author:

epyon

Message:

• fov_interface merged into map_area

Location:

trunk/nv

Files:

• interface/map_area.hh (modified) (2 diffs)
• rogue/fov.hh (modified) (2 diffs)
• rogue/fov_recursive_shadowcasting.hh (modified) (2 diffs)

trunk/nv/interface/map_area.hh

@@ -15 +15 @@
 #include <nv/common.hh>
 #include <nv/string.hh>
+#include <nv/array.hh>
 #include <nv/position.hh>
 
@@ -34 +35 @@
                 virtual bool is_visible( const position& ) const { return true; }
                 virtual bool is_explored( const position& ) const { return true; }
+                virtual void set_visible( const position&, bool ) {};
+                virtual bool is_transparent( const position& ) const { return true; };
                 virtual ~map_area(){}
         };

trunk/nv/rogue/fov.hh

@@ -12 +12 @@
 #include <nv/common.hh>
 #include <nv/position.hh>
+#include <nv/interface/map_area.hh>
 
 namespace nv
@@ -19 +20 @@
         {
 
-                class fov_interface
-                {
-                public:
-                        virtual void set_visible( const position& p, bool visible ) = 0;
-                        virtual bool is_visible( const position& p ) const = 0;
-                        virtual bool is_transparent( const position& p ) const = 0;
-                };
-
                 class fov_algorithm
                 {
                 public:
-                        virtual void initialize( fov_interface*, const dimension& size ) = 0;
+                        virtual void initialize( map_area*, const dimension& size ) = 0;
                         virtual void run( const position& p, uint16 radius ) = 0;
 

trunk/nv/rogue/fov_recursive_shadowcasting.hh

@@ -23 +23 @@
                         fov_recursive_shadowcasting( bool light_walls = true ) 
                                 : m_light_walls( light_walls ) {}
-                        virtual void initialize( fov_interface* map, const dimension& size )
+                        virtual void initialize( map_area* map, const dimension& size )
                         {
                                 m_map  = map;
@@ -32 +32 @@
                         void cast_light( int row,float start, float end, int oct );
 
-                        bool           m_light_walls;
-                        int            m_radius;
-                        int            m_radius2;
-                        position       m_position;
-                        dimension      m_size;
-                        fov_interface* m_map;
+                        bool      m_light_walls;
+                        int       m_radius;
+                        int       m_radius2;
+                        position  m_position;
+                        dimension m_size;
+                        map_area* m_map;
                 };