mirror of
https://github.com/bulletphysics/bullet3.git
synced 2026-10-24 01:30:54 +00:00
Put TinyRender functions and classes inside a TinyRender namespace. The TinyRender library defines some classes with very generic names, such as vec, Matrix, Model, which in my case, when compiling the example browser using a different library for graphics, is giving me name clashes.
This commit is contained in:
@@ -6,6 +6,9 @@
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include "Bullet3Common/b3Logging.h"
|
||||
|
||||
namespace TinyRender
|
||||
{
|
||||
Model::Model(const char *filename) : verts_(), faces_(), norms_(), uv_(), diffusemap_(), normalmap_(), specularmap_()
|
||||
{
|
||||
std::ifstream in;
|
||||
@@ -202,3 +205,4 @@ Vec3f Model::normal(int iface, int nthvert)
|
||||
int idx = faces_[iface][nthvert][2];
|
||||
return norms_[idx].normalize();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user