Changed MAX_NODES to FG_MAX_NODES.
This commit is contained in:
parent
4851b0f43e
commit
4202c82732
2 changed files with 4 additions and 4 deletions
|
@ -164,7 +164,7 @@
|
||||||
|
|
||||||
|
|
||||||
// Maximum nodes per tile
|
// Maximum nodes per tile
|
||||||
#define MAX_NODES 2000
|
#define FG_MAX_NODES 2000
|
||||||
|
|
||||||
|
|
||||||
#endif // _FG_CONSTANTS_H
|
#endif // _FG_CONSTANTS_H
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
FG_USING_STD(string);
|
FG_USING_STD(string);
|
||||||
|
|
||||||
|
|
||||||
static double normals[MAX_NODES][3];
|
static double normals[FG_MAX_NODES][3];
|
||||||
|
|
||||||
|
|
||||||
// given three points defining a triangle, calculate the normal
|
// given three points defining a triangle, calculate the normal
|
||||||
|
@ -259,7 +259,7 @@ int fgObjLoad( const string& path, fgTILE *t) {
|
||||||
|
|
||||||
if ( token == "vn" ) {
|
if ( token == "vn" ) {
|
||||||
// vertex normal
|
// vertex normal
|
||||||
if ( vncount < MAX_NODES ) {
|
if ( vncount < FG_MAX_NODES ) {
|
||||||
in >> normals[vncount][0]
|
in >> normals[vncount][0]
|
||||||
>> normals[vncount][1]
|
>> normals[vncount][1]
|
||||||
>> normals[vncount][2];
|
>> normals[vncount][2];
|
||||||
|
@ -271,7 +271,7 @@ int fgObjLoad( const string& path, fgTILE *t) {
|
||||||
}
|
}
|
||||||
} else if ( token == "v" ) {
|
} else if ( token == "v" ) {
|
||||||
// node (vertex)
|
// node (vertex)
|
||||||
if ( t->ncount < MAX_NODES ) {
|
if ( t->ncount < FG_MAX_NODES ) {
|
||||||
in >> t->nodes[t->ncount][0]
|
in >> t->nodes[t->ncount][0]
|
||||||
>> t->nodes[t->ncount][1]
|
>> t->nodes[t->ncount][1]
|
||||||
>> t->nodes[t->ncount][2];
|
>> t->nodes[t->ncount][2];
|
||||||
|
|
Loading…
Reference in a new issue