xaymar/BlitzNext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

runtime/blitz3d: Fixup C++ification

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-01-18 21:26:42 +01:00
parent 077776b704
commit 3afa84df85
71 changed files with 372 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Runtime/blitz3d/md2rep.cpp
+14 -12
View File
@@ -1,7 +1,9 @@
#include "md2rep.hpp"
#include "md2norms.hpp"
#include "std.hpp"
#include <fstream>
#include <gxruntime.hpp>
#include <gxgraphics.hpp>
extern gxRuntime* gx_runtime;
extern gxGraphics* gx_graphics;
@@ -57,12 +59,12 @@ struct t_tri {
unsigned short verts[3];
};
MD2Rep::MD2Rep(const string& f) : mesh(0), n_verts(0), n_tris(0), n_frames(0)
MD2Rep::MD2Rep(const std::string& f) : mesh(0), n_verts(0), n_tris(0), n_frames(0)
{
filebuf in;
std::filebuf in;
md2_header header;
if (!in.open(f.c_str(), ios_base::in | ios_base::binary))
if (!in.open(f.c_str(), std::ios_base::in | std::ios_base::binary))
return;
if (in.sgetn((char*)&header, sizeof(header)) != sizeof(header))
return;
@@ -73,20 +75,20 @@ MD2Rep::MD2Rep(const string& f) : mesh(0), n_verts(0), n_tris(0), n_frames(0)
n_tris = header.numTriangles;
//read in tex coords
vector<md2_uv> md2_uvs;
std::vector<md2_uv> md2_uvs;
md2_uvs.resize(header.numTexCoords);
in.pubseekpos(header.offsetTexCoords);
in.sgetn((char*)(&md2_uvs.begin()[0]), header.numTexCoords * sizeof(md2_uv));
//read in triangles
vector<md2_tri> md2_tris;
std::vector<md2_tri> md2_tris;
md2_tris.resize(n_tris);
in.pubseekpos(header.offsetTriangles);
in.sgetn((char*)(&md2_tris.begin()[0]), n_tris * sizeof(md2_tri));
vector<t_tri> t_tris;
vector<t_vert> t_verts;
map<t_vert, int> t_map;
std::vector<t_tri> t_tris;
std::vector<t_vert> t_verts;
std::map<t_vert, int> t_map;
int k;
for (k = 0; k < n_tris; ++k) {
@@ -95,7 +97,7 @@ MD2Rep::MD2Rep(const string& f) : mesh(0), n_verts(0), n_tris(0), n_frames(0)
t_vert t;
t.i = md2_tris[k].verts[j];
t.uv = md2_tris[k].uvs[j];
map<t_vert, int>::iterator it = t_map.find(t);
std::map<t_vert, int>::iterator it = t_map.find(t);
if (it == t_map.end()) {
//create new vert
tr.verts[j] = t_map[t] = t_verts.size();
@@ -117,7 +119,7 @@ MD2Rep::MD2Rep(const string& f) : mesh(0), n_verts(0), n_tris(0), n_frames(0)
frames.resize(n_frames);
in.pubseekpos(header.offsetFrames);
vector<md2_vert> md2_verts;
std::vector<md2_vert> md2_verts;
md2_verts.resize(header.numVertices);
//read in frames