Commit f66d9308 authored by hybrid's avatar hybrid

Properly initialize vertex copies.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1418 dfc29bdd-3216-0410-991c-e03cc46cb475
parent b9c1b18f
...@@ -60,19 +60,18 @@ void CQuake3ShaderSceneNode::cloneBuffer ( scene::SMeshBufferLightMap * buffer ) ...@@ -60,19 +60,18 @@ void CQuake3ShaderSceneNode::cloneBuffer ( scene::SMeshBufferLightMap * buffer )
const u32 vsize = buffer->Vertices.size (); const u32 vsize = buffer->Vertices.size ();
Original.Vertices.set_used ( vsize ); Original.Vertices.reallocate( vsize );
MeshBuffer.Vertices.set_used ( vsize ); MeshBuffer.Vertices.reallocate( vsize );
for ( u32 i = 0; i!= vsize; ++i ) for ( u32 i = 0; i!= vsize; ++i )
{ {
const video::S3DVertex2TCoords * src = &buffer->Vertices[i]; const video::S3DVertex2TCoords& src = buffer->Vertices[i];
// Original has same Vertex Format // Original has same Vertex Format
Original.Vertices[i] = *src; Original.Vertices.push_back(src);
// we have a different vertex format // we have a different vertex format
MeshBuffer.Vertices[i].Pos = src->Pos; MeshBuffer.Vertices.push_back(src);
MeshBuffer.Vertices[i].TCoords = src->TCoords; MeshBuffer.Vertices.getLast().Color=0xFFFFFFFF;
MeshBuffer.Vertices[i].Color = 0xFFFFFFFF;
} }
MeshBuffer.recalculateBoundingBox (); MeshBuffer.recalculateBoundingBox ();
......
...@@ -31,8 +31,6 @@ namespace io ...@@ -31,8 +31,6 @@ namespace io
virtual s32 read(void* buffer, u32 sizeToRead); virtual s32 read(void* buffer, u32 sizeToRead);
//! changes position in file, returns true if successful //! changes position in file, returns true if successful
//! if relativeMovement==true, the pos is changed relative to current pos,
//! otherwise from begin of file
virtual bool seek(long finalPos, bool relativeMovement = false); virtual bool seek(long finalPos, bool relativeMovement = false);
//! returns size of file //! returns size of file
...@@ -55,9 +53,9 @@ namespace io ...@@ -55,9 +53,9 @@ namespace io
//! opens the file //! opens the file
void openFile(); void openFile();
core::stringc Filename;
FILE* File; FILE* File;
long FileSize; long FileSize;
core::stringc Filename;
}; };
} // end namespace io } // end namespace io
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment