Changeset 479 for trunk

Timestamp:

10/30/15 15:02:06 (10 years ago)

Author:

epyon

Message:

• resource system cleanups

Location:

trunk

Files:

• nv/core/resource.hh (modified) (3 diffs)
• nv/engine/resource_system.hh (modified) (3 diffs)
• nv/gfx/skeleton_instance.hh (modified) (1 diff)
• nv/stl/functional/hash.hh (modified) (1 diff)
• nv/stl/handle.hh (modified) (1 diff)
• src/engine/particle_engine.cc (modified) (1 diff)
• src/engine/program_manager.cc (modified) (1 diff)
• src/gfx/skeletal_mesh.cc (modified) (1 diff)

trunk/nv/core/resource.hh

@@ -63 +63 @@
                 template < typename T >
                 friend class resource_lock;
-                //              friend class resource_manager;
+//              friend class resource_manager;
         };
 
@@ -72 +72 @@
         public:
                 resource() : m_id(0), m_handler( nullptr ) {}
-                bool is_valid() const { return m_id.valid() && m_handler != nullptr;  }
                 resource_id id() const { return m_id; }
+                constexpr bool is_valid() const { return m_id && m_handler; }
+                constexpr explicit operator bool() const { return is_valid(); }
                 ~resource()
                 {
@@ -184 +185 @@
 //              }
 // 
-//              virtual const void* create( resource_id id, resource_type_id type_hash )
-//              {
-//                      auto handler = m_handlers.find( type_hash );
-//                      NV_ASSERT( handler != m_handlers.end(), "Handler not registered!" );
-//                      return handler->second->create( id, type_hash );
-//              }
+// //           virtual const void* create( resource_id id, resource_type_id type_hash )
+// //           {
+// //                   auto handler = m_handlers.find( type_hash );
+// //                   NV_ASSERT( handler != m_handlers.end(), "Handler not registered!" );
+// //                   return handler->second->create( id, type_hash );
+// //           }
 // 
 //              virtual void unlock( resource_id id, resource_type_id type_hash )

trunk/nv/engine/resource_system.hh

@@ -115 +115 @@
                 }
 
-
                 virtual void clear()
                 {
@@ -124 +123 @@
                         }
                         m_store.clear();
+                }
+
+                resource_type add( shash64 id, stored_type resource )
+                {
+                        m_store[id] = resource;
+                        return create< T >( id );
                 }
 
@@ -139 +144 @@
                 virtual void release( stored_type ) {}
 
-                void add( stored_type resource, shash64 id )
-                {
-                        m_store[id] = resource;
-                }
-
                 hash_store< shash64, stored_type > m_store;
         };

trunk/nv/gfx/skeleton_instance.hh

@@ -59 +59 @@
 
                 dynamic_array< mat4 > m_transform;
-};
+        };
 
 

trunk/nv/stl/functional/hash.hh

@@ -176 +176 @@
                 constexpr hash_value( const hash_value& ) = default;
 
-                constexpr bool valid() const { return m_value != 0; }
+                constexpr bool is_valid() const { return m_value != 0; }
+                constexpr explicit operator bool() const { return is_valid(); }
 
                 template < typename H2, typename Tag2 >

trunk/nv/stl/handle.hh

@@ -30 +30 @@
                 typedef T value_type;
                 typedef TAG tag_type;
-                static const int INDEX_BITS   = IBITS;
-                static const int COUNTER_BITS = IBITS;
-                static const T MAX_INDEX   = (1 << IBITS) - 1;
-                static const T MAX_COUNTER = (1 << CBITS) - 1;
-
-                handle() : m_index(0), m_counter(0) {}
-
-                inline bool operator==(const handle& rhs) const {return m_index == rhs.m_index && m_counter == rhs.m_counter; }
-                inline bool operator!=(const handle& rhs) const {return !(*this == rhs);}
-
-                bool is_nil() const { return m_index == 0 && m_counter == 0; }
-                bool is_valid() const { return !is_nil(); }
-                T index() const { return m_index; }
+                static constexpr int INDEX_BITS   = IBITS;
+                static constexpr int COUNTER_BITS = IBITS;
+                static constexpr T MAX_INDEX   = (1 << IBITS) - 1;
+                static constexpr T MAX_COUNTER = (1 << CBITS) - 1;
+
+                constexpr handle() : m_index(0), m_counter(0) {}
+
+                constexpr inline bool operator==(const handle& rhs) const {return m_index == rhs.m_index && m_counter == rhs.m_counter; }
+                constexpr inline bool operator!=(const handle& rhs) const {return !(*this == rhs);}
+
+                constexpr bool is_nil() const { return m_index == 0 && m_counter == 0; }
+                constexpr bool is_valid() const { return !is_nil(); }
+                constexpr operator bool() const { return is_valid(); }
+
+                constexpr T index() const { return m_index; }
                 //size_t hash() const { return hash<T>()( T( m_counter << IBITS | m_index ) ); }
-                size_t hash() const { NV_ASSERT( false, "UNIMPLEMENTED!" ); return 0; }
+                constexpr size_t hash() const { NV_ASSERT( false, "UNIMPLEMENTED!" ); return 0; }
         protected:
                 T m_index   : IBITS;
                 T m_counter : CBITS;
 
-                handle( T a_index, T a_counter ) : m_index( a_index ), m_counter( a_counter ) {}
+                constexpr handle( T a_index, T a_counter ) : m_index( a_index ), m_counter( a_counter ) {}
                 template < typename H >
                 friend class handle_operator;

trunk/src/engine/particle_engine.cc

@@ -303 +303 @@
 {
         shash64 id = table.get_string_hash_64( "id" );
-        if ( !id.valid() )
+        if ( !id )
         {
                 NV_LOG_ERROR( "Bad table passed to particle_engine!" )

trunk/src/engine/program_manager.cc

@@ -36 +36 @@
         }
 
-        add( m_context->get_device()->create_program( vsource, fsource ), id );
+        add( id, m_context->get_device()->create_program( vsource, fsource ) );
         return true;
 }

trunk/src/gfx/skeletal_mesh.cc

@@ -15 +15 @@
 void nv::skeletal_animation_entry::update_skeleton( skeleton_instance& data, uint32 a_ms_time ) const
 {
-        float  fframe   = ( a_ms_time * 0.001f ) * m_fps;
-        uint32 frame    = uint32( math::floor( fframe ) );
-        float  reminder = fframe - static_cast<float>( frame );
+        float  fframe = ( a_ms_time * 0.001f ) * m_fps;
+        float  nframe = nv::floor( fframe );
         uint32 duration = get_frame_count();
         if ( duration == 0 )
         {
-                frame  = get_start_frame();
-                fframe = static_cast<float>( frame );
+                fframe = static_cast<float>( get_start_frame() );
         }
-        else if ( frame >= duration )
+        else if ( nframe >= duration )
         {
                 if ( is_looping() )
-                {
-                        frame  = frame % duration;
-                        fframe = static_cast<float>( frame ) + reminder;
-                }
+                        fframe = nv::fmodf( fframe, nv::f32( duration ) );
                 else
-                {
-                        frame  = get_end_frame();
-                        fframe = static_cast<float>( frame );
-                }
+                        fframe = static_cast<float>( get_end_frame() );
         }