fly/flightgear
1
0
Fork 0
Code Activity

Attempt to work around a problem compiling ssgEntityArray.cxx against

Browse source 
plib-1.6.0
This commit is contained in:
curt 2003-05-28 16:57:24 +00:00
parent 610aa1997e
commit 503d2839cc
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -390,6 +390,10 @@ int main() {
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
) )
AM_CONDITIONAL(HAVE_PLIB_PSL, test "x$have_plib_psl" = "xyes") AM_CONDITIONAL(HAVE_PLIB_PSL, test "x$have_plib_psl" = "xyes")
if test "x$have_plib_psl" = "xyes"; then
AC_DEFINE([HAVE_PLIB_PSL], 1,
[Define if plib version is new enough to provide "PSL"])
fi
dnl Check for MetaKit dnl Check for MetaKit
AC_CHECK_HEADER(mk4.h) AC_CHECK_HEADER(mk4.h)

5
src/Objects/ssgEntityArray.cxx
View file

@ -21,6 +21,9 @@
$Id$ $Id$
*/ */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "ssgEntityArray.hxx" #include "ssgEntityArray.hxx"
@ -179,6 +182,7 @@ void ssgEntityArray::print ( FILE *fd, char *indent, int how_much )
} }
#ifdef HAVE_PLIB_PSL
void ssgEntityArray::getStats ( int *num_branches, int *num_leaves, int *num_tris, int *num_verts ) void ssgEntityArray::getStats ( int *num_branches, int *num_leaves, int *num_tris, int *num_verts )
{ {
int nb, nl, nt, nv ; int nb, nl, nt, nv ;
@ -194,6 +198,7 @@ void ssgEntityArray::getStats ( int *num_branches, int *num_leaves, int *num_tri
*num_tris += nt * locations->getNum() ; *num_tris += nt * locations->getNum() ;
*num_verts += nv * locations->getNum() ; *num_verts += nv * locations->getNum() ;
} }
#endif
void ssgEntityArray::cull ( sgFrustum *f, sgMat4 m, int test_needed ) void ssgEntityArray::cull ( sgFrustum *f, sgMat4 m, int test_needed )

6
src/Objects/ssgEntityArray.hxx
View file

@ -1,6 +1,10 @@
#ifndef _SSG_ENTITY_ARRAY_HXX #ifndef _SSG_ENTITY_ARRAY_HXX
#define _SSG_ENTITY_ARRAY_HXX #define _SSG_ENTITY_ARRAY_HXX
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <plib/ssg.h> #include <plib/ssg.h>
@ -50,7 +54,9 @@ public:
virtual void hot ( sgVec3 s, sgMat4 m, int test_needed ) ; virtual void hot ( sgVec3 s, sgMat4 m, int test_needed ) ;
virtual void los ( sgVec3 s, sgMat4 m, int test_needed ) ; virtual void los ( sgVec3 s, sgMat4 m, int test_needed ) ;
virtual void print ( FILE *fd = stderr, char *indent = "", int how_much = 2 ) ; virtual void print ( FILE *fd = stderr, char *indent = "", int how_much = 2 ) ;
#ifdef HAVE_PLIB_PSL
virtual void getStats ( int *num_branches, int *num_leaves, int *num_tris, int *num_vertices ) ; virtual void getStats ( int *num_branches, int *num_leaves, int *num_tris, int *num_vertices ) ;
#endif
virtual int load ( FILE *fd ) ; virtual int load ( FILE *fd ) ;
virtual int save ( FILE *fd ) ; virtual int save ( FILE *fd ) ;
virtual void recalcBSphere () ; virtual void recalcBSphere () ;