|
From: <axl...@us...> - 2009-05-17 12:44:45
|
Revision: 261
http://hgengine.svn.sourceforge.net/hgengine/?rev=261&view=rev
Author: axlecrusher
Date: 2009-05-17 12:44:42 +0000 (Sun, 17 May 2009)
Log Message:
-----------
revert back to what it was
Modified Paths:
--------------
Mercury2/src/MercuryVertex.cpp
Mercury2/src/MercuryVertex.h
Modified: Mercury2/src/MercuryVertex.cpp
===================================================================
--- Mercury2/src/MercuryVertex.cpp 2009-05-17 12:43:56 UTC (rev 260)
+++ Mercury2/src/MercuryVertex.cpp 2009-05-17 12:44:42 UTC (rev 261)
@@ -14,13 +14,13 @@
(*this)[2] = iz;
(*this)[3] = iw;
}
-/*
+
MercuryVertex::MercuryVertex( const float * in )
{
- for (unsigned int i = 0; i < 4; ++i)
+ for (unsigned int i = 0; i < 3; ++i)
(*this)[i] = in[i];
}
-*/
+
MercuryVertex::MercuryVertex( const MercuryVertex& v)
{
for (unsigned int i = 0; i < 4; ++i)
Modified: Mercury2/src/MercuryVertex.h
===================================================================
--- Mercury2/src/MercuryVertex.h 2009-05-17 12:43:56 UTC (rev 260)
+++ Mercury2/src/MercuryVertex.h 2009-05-17 12:44:42 UTC (rev 261)
@@ -14,7 +14,7 @@
public:
MercuryVertex();
MercuryVertex( float ix, float iy, float iz, float iw = 0 );
-// MercuryVertex( const float * in );
+ MercuryVertex( const float * in );
MercuryVertex( const MercuryVertex& v);
///Direct conversion to float*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|