Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code-style consistency improvement:

Browse Source 
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files.
make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type.
This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
2018-09-23 14:17:31 -07:00
parent b73b05e9fb
commit ab8f16961e
1773 changed files with 1081087 additions and 474249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
examples/ThirdPartyLibs/Wavefront/main.cpp
View File

@@ -6,37 +6,31 @@
#include <iostream>
static bool
TestLoadObj(
TestLoadObj(
const char* fileName,
bool verbose
)
bool verbose)
{
const char* prefix[]={"./data/","../data/","../../data/","../../../data/","../../../../data/"};
const char* prefix[] = {"./data/", "../data/", "../../data/", "../../../data/", "../../../../data/"};
char fullPath[1024];
int index=-1;
int index = -1;
{
int numPrefixes = sizeof(prefix)/sizeof(char*);
int numPrefixes = sizeof(prefix) / sizeof(char*);
for (int i=0;i<numPrefixes;i++)
for (int i = 0; i < numPrefixes; i++)
{
sprintf(fullPath,"%s%s",prefix[i],fileName);
sprintf(fullPath, "%s%s", prefix[i], fileName);
FILE* f;
f = fopen(fullPath,"r");
f = fopen(fullPath, "r");
if (f)
{
index=i;
index = i;
fclose(f);
break;
}
}
}
if (index<0)
if (index < 0)
{
printf("file not found %s\n", fileName);
return false;
@@ -47,7 +41,8 @@ static bool
std::vector<tinyobj::shape_t> shapes;
std::string err = tinyobj::LoadObj(shapes, fullPath, prefix[index]);
if (!err.empty()) {
if (!err.empty())
{
std::cerr << err << std::endl;
return false;
}
@@ -56,21 +51,24 @@ static bool
if (verbose)
{
for (size_t i = 0; i < shapes.size(); i++) {
for (size_t i = 0; i < shapes.size(); i++)
{
printf("shape[%ld].name = %s\n", i, shapes[i].name.c_str());
printf("shape[%ld].indices: %ld\n", i, shapes[i].mesh.indices.size());
assert((shapes[i].mesh.indices.size() % 3) == 0);
for (size_t f = 0; f < shapes[i].mesh.indices.size(); f++) {
for (size_t f = 0; f < shapes[i].mesh.indices.size(); f++)
{
printf(" idx[%ld] = %d\n", f, shapes[i].mesh.indices[f]);
}
printf("shape[%ld].vertices: %ld\n", i, shapes[i].mesh.positions.size());
assert((shapes[i].mesh.positions.size() % 3) == 0);
for (size_t v = 0; v < shapes[i].mesh.positions.size() / 3; v++) {
for (size_t v = 0; v < shapes[i].mesh.positions.size() / 3; v++)
{
printf(" v[%ld] = (%f, %f, %f)\n", v,
shapes[i].mesh.positions[3*v+0],
shapes[i].mesh.positions[3*v+1],
shapes[i].mesh.positions[3*v+2]);
shapes[i].mesh.positions[3 * v + 0],
shapes[i].mesh.positions[3 * v + 1],
shapes[i].mesh.positions[3 * v + 2]);
}
printf("shape[%ld].material.name = %s\n", i, shapes[i].material.name.c_str());
@@ -86,7 +84,8 @@ static bool
printf(" material.map_Ns = %s\n", shapes[i].material.normal_texname.c_str());
std::map<std::string, std::string>::iterator it(shapes[i].material.unknown_parameter.begin());
std::map<std::string, std::string>::iterator itEnd(shapes[i].material.unknown_parameter.end());
for (; it != itEnd; it++) {
for (; it != itEnd; it++)
{
printf(" material.%s = %s\n", it->first.c_str(), it->second.c_str());
}
printf("\n");
@@ -96,12 +95,11 @@ static bool
return true;
}
int main( int argc, char **argv)
int main(int argc, char** argv)
{
// assert(true == TestLoadObj("cornell_box.obj",true));
// assert(true == TestLoadObj("cube.obj",true));
assert(true==TestLoadObj("samurai_monastry.obj",false));
assert(true==TestLoadObj("teddy2_VHACD_CHs.obj",true));
// assert(true == TestLoadObj("cornell_box.obj",true));
// assert(true == TestLoadObj("cube.obj",true));
assert(true == TestLoadObj("samurai_monastry.obj", false));
assert(true == TestLoadObj("teddy2_VHACD_CHs.obj", true));
return 0;
}

1227
examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
View File

File diff suppressed because it is too large Load Diff

50
examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.h
View File

@@ -10,40 +10,40 @@
#include <vector>
#include <map>
namespace tinyobj {
namespace tinyobj
{
typedef struct
{
std::string name;
std::string name;
float ambient[3];
float diffuse[3];
float specular[3];
float transmittance[3];
float emission[3];
float shininess;
float ambient[3];
float diffuse[3];
float specular[3];
float transmittance[3];
float emission[3];
float shininess;
float transparency;
std::string ambient_texname;
std::string diffuse_texname;
std::string specular_texname;
std::string normal_texname;
std::map<std::string, std::string> unknown_parameter;
std::string ambient_texname;
std::string diffuse_texname;
std::string specular_texname;
std::string normal_texname;
std::map<std::string, std::string> unknown_parameter;
} material_t;
typedef struct
{
std::vector<float> positions;
std::vector<float> normals;
std::vector<float> texcoords;
std::vector<unsigned int> indices;
std::vector<float> positions;
std::vector<float> normals;
std::vector<float> texcoords;
std::vector<unsigned int> indices;
} mesh_t;
typedef struct
{
std::string name;
material_t material;
mesh_t mesh;
std::string name;
material_t material;
mesh_t mesh;
} shape_t;
/// Loads .obj from a file.
@@ -52,10 +52,10 @@ typedef struct
/// Returns empty string when loading .obj success.
/// 'mtl_basepath' is optional, and used for base path for .mtl file.
std::string LoadObj(
std::vector<shape_t>& shapes, // [output]
const char* filename,
const char* mtl_basepath = NULL);
std::vector<shape_t>& shapes, // [output]
const char* filename,
const char* mtl_basepath = NULL);
};
}; // namespace tinyobj
#endif // _TINY_OBJ_LOADER_H