Changeset 496 for trunk

Timestamp:

05/31/16 14:04:24 (9 years ago)

Author:

epyon

Message:

• type disambiguition in handle.hh
• tweak to shadowcasting

Location:

trunk

Files:

• nv/stl/handle.hh (modified) (11 diffs)
• src/rogue/fov_recursive_shadowcasting.cc (modified) (1 diff)

trunk/nv/stl/handle.hh

@@ -78 +78 @@
         public:
 
-                typedef HANDLE handle;
+                typedef HANDLE handle_type;
                 typedef typename HANDLE::value_type value_type;
 
                 handle_manager() : m_first_free( NONE ), m_last_free( NONE ) {}
 
-                handle create_handle()
+                handle_type create_handle()
                 {
                         typedef handle_operator<HANDLE> hop;
@@ -93 +93 @@
                 }
 
-                void free_handle( handle h )
+                void free_handle( handle_type h )
                 {
                         value_type index = h.index();
@@ -108 +108 @@
                 }
 
-                bool is_valid( handle h ) const
+                bool is_valid( handle_type h ) const
                 {
                         typedef handle_operator<HANDLE> hop;
@@ -149 +149 @@
         {
         public:
-                typedef HANDLE              handle;
+                typedef HANDLE              handle_type;
                 typedef TINDEX              index_type;
                 packed_index_table() {}
@@ -157 +157 @@
                 }
 
-                index_type insert( handle h )
+                index_type insert( handle_type h )
                 {
                         NV_ASSERT( !exists( h ), "Reinserting handle!" );
@@ -167 +167 @@
                 }
 
-                bool exists( handle h )
+                bool exists( handle_type h )
                 {
                         if ( h.is_nil() || h.index() >= m_indexes.size() ) return false;
@@ -173 +173 @@
                 }
 
-                index_type get( handle h )
+                index_type get( handle_type h )
                 {
                         if ( h.is_nil() || h.index() >= m_indexes.size() ) return -1;
@@ -179 +179 @@
                 }
 
-                index_type get( handle h ) const
+                index_type get( handle_type h ) const
                 {
                         if ( h.is_nil() || h.index() >= m_indexes.size() ) return -1;
@@ -185 +185 @@
                 }
 
-                index_type remove_swap( handle h )
+                index_type remove_swap( handle_type h )
                 {
                         if ( h.is_nil() || h.index() >= m_indexes.size() || m_indexes[h.index()] == -1 )
                                 return -1;
-                        handle     swap_handle = m_handles.back();
-                        index_type dead_eindex = m_indexes[h.index()];
+                        handle_type swap_handle = m_handles.back();
+                        index_type  dead_eindex = m_indexes[h.index()];
                         if ( dead_eindex != static_cast<index_type>( m_handles.size() - 1 ) )
                         {
@@ -209 +209 @@
                 }
 
-                handle get_handle( index_type i ) const { return m_handles[unsigned( i )]; }
+                handle_type get_handle( index_type i ) const { return m_handles[unsigned( i )]; }
 
                 size_t size() const { return m_handles.size(); }
@@ -225 +225 @@
                 }
 
-                vector< handle >     m_handles;
-                vector< index_type > m_indexes;
+                vector< handle_type > m_handles;
+                vector< index_type >  m_indexes;
         };
 

trunk/src/rogue/fov_recursive_shadowcasting.cc

@@ -59 +59 @@
                                 bool transparent = m_map->is_transparent( c );
 
-                                if ( dx*dx+dy*dy <= m_radius2 && (m_light_walls || transparent)) 
+                                if ( dx*dx+dy*dy <= (m_radius2+1) && (m_light_walls || transparent)) 
                                 {
                                         m_map->set_visible( c, true );