Changeset 235 for trunk/nv/interface/uniform.hh

Timestamp:

05/12/14 16:52:16 (11 years ago)

Author:

epyon

Message:

• camera class extension
• additional built-in uniforms added
• support for uniform arrays
• BONEINDEX and BONEWEIGHT built in attributes added
• i16vec's added to math

File:

• trunk/nv/interface/uniform.hh (modified) (4 diffs)

trunk/nv/interface/uniform.hh

@@ -32 +32 @@
                 bool is_dirty() const { return m_dirty; }
                 void clean() { m_dirty = false; }
+                virtual ~uniform_base() {}
         protected:
                 string   m_name;
@@ -47 +48 @@
 
                 uniform( const string& name, int location, int length ) 
-                        : uniform_base( name, type_to_enum< T >::type, location, length ), m_value()
-                {}
+                        : uniform_base( name, type_to_enum< T >::type, location, length ), m_value( nullptr )
+                {
+                        m_value = new T[ m_length ];
+                }
 
                 void set_value( const T& value ) 
                 { 
-                        if ( value != m_value )
+                        NV_ASSERT( m_length == 1, "set_value on array uniform!" );
+                        if ( value != m_value[0] )
                         {
-                                m_value = value; 
+                                m_value[0] = value; 
                                 m_dirty = true;
                         }
                 }
 
-                const T& get_value() { return m_value; }
+                void set_value( const T* value, uint32 count ) 
+                { 
+                        // TODO: memcmp?
+                        std::copy( value, value + count, m_value );
+                        m_dirty = true;
+                }
+
+                const T* get_value() { return m_value; }
+                virtual ~uniform() 
+                {
+                        delete[] m_value;
+                }
         protected:
-                T m_value;
+                T* m_value;
         };
 
@@ -145 +160 @@
         };
 
+        class engine_uniform_m_model_inv : public engine_uniform< mat4 >
+        {
+        public:
+                engine_uniform_m_model_inv( uniform_base* u ) : engine_uniform( u ) {}
+                virtual void set( const context* , const scene_state* s ) { m_uniform->set_value( s->get_model_inv() ); }
+        };
+
         class engine_uniform_m_modelview : public engine_uniform< mat4 >
         {
@@ -173 +195 @@
         };
 
+        class engine_uniform_v_camera_position : public engine_uniform< vec3 >
+        {
+        public:
+                engine_uniform_v_camera_position( uniform_base* u ) : engine_uniform( u ) {}
+                virtual void set( const context* , const scene_state* s ) { m_uniform->set_value( s->get_camera().get_position() ); }
+        };
+
+        class engine_uniform_v_camera_direction : public engine_uniform< vec3 >
+        {
+        public:
+                engine_uniform_v_camera_direction( uniform_base* u ) : engine_uniform( u ) {}
+                virtual void set( const context* , const scene_state* s ) { m_uniform->set_value( s->get_camera().get_direction() ); }
+        };
+
         template< int VALUE >
         class engine_link_uniform_int : public engine_link_uniform< int >