Correct vec2

--HG--
branch : opengl3
hg/feature/opengl3
kaetemi 10 years ago
parent 6ea037e48d
commit 4f5f779a92

@ -32,7 +32,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <nel/misc/types_nl.h> #include <nel/misc/types_nl.h>
#include <nel/misc/smart_ptr.h> #include <nel/misc/smart_ptr.h>
#include <nel/misc/vector.h> #include <nel/misc/vector.h>
#include <nel/misc/vector_2d.h> #include <nel/misc/vector_2f.h>
#include <nel/misc/vector_h.h> #include <nel/misc/vector_h.h>
#include <nel/misc/matrix.h> #include <nel/misc/matrix.h>
@ -71,7 +71,7 @@ public:
inline void set(sint offset, float f0, float f1) { float *f = reinterpret_cast<float *>(&m_HostMemory[offset]); f[0] = f0; f[1] = f1; } inline void set(sint offset, float f0, float f1) { float *f = reinterpret_cast<float *>(&m_HostMemory[offset]); f[0] = f0; f[1] = f1; }
inline void set(sint offset, float f0, float f1, float f2) { float *f = reinterpret_cast<float *>(&m_HostMemory[offset]); f[0] = f0; f[1] = f1; f[2] = f2; } inline void set(sint offset, float f0, float f1, float f2) { float *f = reinterpret_cast<float *>(&m_HostMemory[offset]); f[0] = f0; f[1] = f1; f[2] = f2; }
inline void set(sint offset, float f0, float f1, float f2, float f3) { float *f = reinterpret_cast<float *>(&m_HostMemory[offset]); f[0] = f0; f[1] = f1; f[2] = f2; f[3] = f3; } inline void set(sint offset, float f0, float f1, float f2, float f3) { float *f = reinterpret_cast<float *>(&m_HostMemory[offset]); f[0] = f0; f[1] = f1; f[2] = f2; f[3] = f3; }
inline void set(sint offset, NLMISC::CVector2d vec2) { reinterpret_cast<NLMISC::CVector2d &>(m_HostMemory[offset]) = vec2; } inline void set(sint offset, NLMISC::CVector2f vec2) { reinterpret_cast<NLMISC::CVector2f &>(m_HostMemory[offset]) = vec2; }
inline void set(sint offset, NLMISC::CVector vec3) { reinterpret_cast<NLMISC::CVector &>(m_HostMemory[offset]) = vec3; } inline void set(sint offset, NLMISC::CVector vec3) { reinterpret_cast<NLMISC::CVector &>(m_HostMemory[offset]) = vec3; }
inline void set(sint offset, NLMISC::CVectorH vec4) { reinterpret_cast<NLMISC::CVectorH &>(m_HostMemory[offset]) = vec4; } inline void set(sint offset, NLMISC::CVectorH vec4) { reinterpret_cast<NLMISC::CVectorH &>(m_HostMemory[offset]) = vec4; }
inline void set(sint offset, NLMISC::CMatrix mat4) { float *f = reinterpret_cast<float *>(&m_HostMemory[offset]); mat4.get(f); } inline void set(sint offset, NLMISC::CMatrix mat4) { float *f = reinterpret_cast<float *>(&m_HostMemory[offset]); mat4.get(f); }

@ -53,7 +53,7 @@ public:
enum TType enum TType
{ {
Float, // float Float, // float
FloatVec2, // CVector2d FloatVec2, // CVector2f
FloatVec3, // CVector FloatVec3, // CVector
FloatVec4, // CVectorH FloatVec4, // CVectorH
SInt, // sint32 SInt, // sint32

@ -35,6 +35,11 @@ namespace NL3D {
CUniformBuffer::CUniformBuffer() CUniformBuffer::CUniformBuffer()
{ {
nlctassert(sizeof(float) == 4);
nlctassert(sizeof(NLMISC::CVector2f) == 8);
nlctassert(sizeof(NLMISC::CVector) == 12);
nlctassert(sizeof(NLMISC::CVectorH) == 16);
// ... // ...
} }

Loading…
Cancel
Save