v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- compiler error fixes for sample programs 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1171 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/5/head
jonathanklein 2012-02-18 10:53:58 +00:00
parent f41e106efc
commit 6852eb6ffe
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/assimp/color4.h
View File

@ -100,4 +100,4 @@ struct aiColor4D {
#include "./Compiler/poppack1.h" #include "./Compiler/poppack1.h"
#endif // AI_VECTOR3D_H_INC #endif // AI_COLOR4D_H_INC

6
samples/SimpleOpenGL/Sample_SimpleOpenGL.c
View File

@ -13,9 +13,9 @@
#include "GL/glut.h" #include "GL/glut.h"
// assimp include files. These three are usually needed. // assimp include files. These three are usually needed.
#include "assimp.h" #include "assimp/cimport.h"
#include "aiPostProcess.h" #include "assimp/PostProcess.h"
#include "aiScene.h" #include "assimp/Scene.h"
// the global Assimp scene object // the global Assimp scene object
const struct aiScene* scene = NULL; const struct aiScene* scene = NULL;

28
samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
View File

@ -29,11 +29,11 @@
// assimp include files. These three are usually needed. // assimp include files. These three are usually needed.
#include "assimp.hpp" //OO version Header! #include "assimp/Importer.hpp" //OO version Header!
#include "aiPostProcess.h" #include "assimp/PostProcess.h"
#include "aiScene.h" #include "assimp/Scene.h"
#include "DefaultLogger.h" #include "assimp/DefaultLogger.hpp"
#include "LogStream.h" #include "assimp/LogStream.hpp"
// currently these are hardcoded // currently these are hardcoded
@ -69,7 +69,7 @@ GLfloat LightPosition[]= { 0.0f, 0.0f, 15.0f, 1.0f };
// the global Assimp scene object // the global Assimp scene object
const aiScene* scene = NULL; const aiScene* scene = NULL;
GLuint scene_list = 0; GLuint scene_list = 0;
struct aiVector3D scene_min, scene_max, scene_center; aiVector3D scene_min, scene_max, scene_center;
// images / texture // images / texture
std::map<std::string, GLuint*> textureIdMap; // map image filenames to textureIds std::map<std::string, GLuint*> textureIdMap; // map image filenames to textureIds
@ -311,7 +311,7 @@ int InitGL() // All Setup For OpenGL goes here
// Can't send color down as a pointer to aiColor4D because AI colors are ABGR. // Can't send color down as a pointer to aiColor4D because AI colors are ABGR.
void Color4f(const struct aiColor4D *color) void Color4f(const aiColor4D *color)
{ {
glColor4f(color->r, color->g, color->b, color->a); glColor4f(color->r, color->g, color->b, color->a);
} }
@ -324,7 +324,7 @@ void set_float4(float f[4], float a, float b, float c, float d)
f[3] = d; f[3] = d;
} }
void color4_to_float4(const struct aiColor4D *c, float f[4]) void color4_to_float4(const aiColor4D *c, float f[4])
{ {
f[0] = c->r; f[0] = c->r;
f[1] = c->g; f[1] = c->g;
@ -332,16 +332,16 @@ void color4_to_float4(const struct aiColor4D *c, float f[4])
f[3] = c->a; f[3] = c->a;
} }
void apply_material(const struct aiMaterial *mtl) void apply_material(const aiMaterial *mtl)
{ {
float c[4]; float c[4];
GLenum fill_mode; GLenum fill_mode;
int ret1, ret2; int ret1, ret2;
struct aiColor4D diffuse; aiColor4D diffuse;
struct aiColor4D specular; aiColor4D specular;
struct aiColor4D ambient; aiColor4D ambient;
struct aiColor4D emission; aiColor4D emission;
float shininess, strength; float shininess, strength;
int two_sided; int two_sided;
int wireframe; int wireframe;
@ -408,7 +408,7 @@ void recursive_render (const struct aiScene *sc, const struct aiNode* nd, float
{ {
unsigned int i; unsigned int i;
unsigned int n=0, t; unsigned int n=0, t;
struct aiMatrix4x4 m = nd->mTransformation; aiMatrix4x4 m = nd->mTransformation;
m.Scaling(aiVector3D(scale, scale, scale), m); m.Scaling(aiVector3D(scale, scale, scale), m);

1
tools/assimp_view/CMakeLists.txt
View File

@ -2,6 +2,7 @@
include_directories ( include_directories (
${Assimp_SOURCE_DIR}/include ${Assimp_SOURCE_DIR}/include
${Assimp_SOURCE_DIR}/code ${Assimp_SOURCE_DIR}/code
${DX9_INCLUDE_PATH}
) )
# Make sure the linker can find the Hello library once it is built. # Make sure the linker can find the Hello library once it is built.