Compare commits
3
Commits
08e558482f
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e4dc0f4d36 | ||
|
|
e6b8c17345 | ||
|
|
1ecc6d749b |
No files matched your search
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
# vim:filetype=python
|
# vim:filetype=python
|
||||||
|
|
||||||
env = Environment(LIBS = ['GL'], CXXFLAGS = ['-Wall'])
|
env = Environment(LIBS = ['GL'], CXXFLAGS = ['-Wall', '-DGL_GLEXT_PROTOTYPES'])
|
||||||
|
|
||||||
env.Program('driver', Glob('*.cc'))
|
env.Program('driver', Glob('*.cc'))
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
|
|
||||||
#define GL_GLEXT_PROTOTYPES
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
@@ -464,6 +462,12 @@ bool WFObj::buildVBO()
|
|||||||
it != m_faces.end();
|
it != m_faces.end();
|
||||||
it++)
|
it++)
|
||||||
{
|
{
|
||||||
|
if (m_materials.find(it->first) == m_materials.end())
|
||||||
|
{
|
||||||
|
cerr << "Material '" << it->first << "' referenced in '"
|
||||||
|
<< m_path << "' is not defined." << endl;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
for (vector<Face>::iterator fit = it->second.begin();
|
for (vector<Face>::iterator fit = it->second.begin();
|
||||||
fit != it->second.end();
|
fit != it->second.end();
|
||||||
fit++)
|
fit++)
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ public:
|
|||||||
class Buffer
|
class Buffer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Buffer() : m_alloc(false) {}
|
Buffer() : m_alloc(false) {data = NULL; length = 0;}
|
||||||
~Buffer() { if (m_alloc) delete data; }
|
~Buffer() { if (m_alloc) delete data; }
|
||||||
uint8_t *data;
|
uint8_t *data;
|
||||||
size_t length;
|
size_t length;
|
||||||
|
|||||||
Reference in new issue
Block a user