[Plib-cvs] plib/src/ssg Makefile.am,1.31,1.32 ssg.cxx,1.50,1.51 ssg.dsp,1.38,1.39 ssg.h,1.134,1.135

[J?rgen M. <j_m...@us...>]

Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv8560/src/ssg

Modified Files:
	Makefile.am ssg.cxx ssg.dsp ssg.h 
Log Message:

BGL loader added; should complie on MSVC


Index: Makefile.am
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile.am	17 Jan 2002 16:14:22 -0000	1.31
+++ Makefile.am	9 Jun 2002 11:25:47 -0000	1.32
@@ -21,7 +21,7 @@
 	ssgLoadOFF.cxx ssgSaveOFF.cxx ssgSaveQHI.cxx ssgLoadVRML1.cxx ssgSaveVRML1.cxx\
 	ssgLoaderWriterStuff.h ssgMSFSPalette.h ssg3ds.h ssgLoadMDL.h \
 	ssgSave3ds.cxx ssgAxisTransform.cxx ssgLoadATG.cxx ssgSaveATG.cxx\
-	ssgLoadIV.cxx ssgLoad.cxx ssgLoadVRML.h
+	ssgLoadIV.cxx ssgLoad.cxx ssgLoadVRML.h ssgLoadBGL.cxx ssgLoadMDL_BGLTexture.cxx
 
 INCLUDES = -I$(top_srcdir)/src/sg
 INCLUDES += -I$(top_srcdir)/src/util

Index: ssg.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.cxx,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- ssg.cxx	8 Jun 2002 22:49:07 -0000	1.50
+++ ssg.cxx	9 Jun 2002 11:25:48 -0000	1.51
@@ -148,6 +148,10 @@
   ssgAddModelFormat ( ".mdl",   ssgLoadMDL  , NULL       ) ;
 #endif
 
+#ifdef SSG_LOAD_BGL_SUPPORTED
+  ssgAddModelFormat ( ".bgl",   ssgLoadBGL  , NULL       ) ;
+#endif
+
 #ifdef SSG_LOAD_TGA_SUPPORTED
   ssgAddTextureFormat ( ".tga" ,   ssgLoadTGA ) ;
 #endif
@@ -168,7 +172,7 @@
   ssgAddTextureFormat ( ".bw" ,    ssgLoadSGI ) ;
 #endif
 
-#ifdef SSG_LOAD_MDL_SUPPORTED
+#ifdef SSG_LOAD_MDL_SUPPORTED || SSG_LOAD_BGL_SUPPORTED || SSG_LOAD_MDL_BGL_TEXTURE_SUPPORTED
   ssgAddTextureFormat ( ".0af" ,   ssgLoadMDLTexture ) ;
   ssgAddTextureFormat ( ".1af" ,   ssgLoadMDLTexture ) ;
   ssgAddTextureFormat ( ".2af" ,   ssgLoadMDLTexture ) ;
@@ -190,6 +194,9 @@
   ssgAddTextureFormat ( ".iaf" ,   ssgLoadMDLTexture ) ;
   ssgAddTextureFormat ( ".jaf" ,   ssgLoadMDLTexture ) ;
   ssgAddTextureFormat ( ".kaf" ,   ssgLoadMDLTexture ) ;
+  ssgAddTextureFormat ( ".pat" ,   ssgLoadMDLTexture ) ;
+  ssgAddTextureFormat ( ".r8"  ,   ssgLoadMDLTexture ) ;
+  ssgAddTextureFormat ( ".naz" ,   ssgLoadMDLTexture ) ;
 #endif
 
 }

Index: ssg.dsp
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.dsp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ssg.dsp	8 Jun 2002 22:49:07 -0000	1.38
+++ ssg.dsp	9 Jun 2002 11:25:48 -0000	1.39
@@ -1,412 +1,420 @@
-# Microsoft Developer Studio Project File - Name="ssg" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=ssg - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ssg.mak".
[...801 lines suppressed...]
+SOURCE=.\ssgTween.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=.\ssgTweenController.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=.\ssgVTable.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=.\ssgVtxArray.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=.\ssgVtxTable.cxx
+# End Source File
+# End Target
+# End Project

Index: ssg.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.h,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- ssg.h	8 Jun 2002 22:49:07 -0000	1.134
+++ ssg.h	9 Jun 2002 11:25:48 -0000	1.135
@@ -2627,7 +2627,7 @@
 ssgEntity *ssgLoadOBJ  ( const char *fname, const ssgLoaderOptions *options = NULL ) ;
 ssgEntity *ssgLoadMD2  ( const char *fname, const ssgLoaderOptions *options = NULL ) ;
 ssgEntity *ssgLoadMDL  ( const char *fname, const ssgLoaderOptions *options = NULL ) ;
-//ssgEntity *ssgLoadBGL  ( const char *fname, const ssgLoaderOptions *options = NULL ) ;
+ssgEntity *ssgLoadBGL  ( const char *fname, const ssgLoaderOptions *options = NULL ) ;
 ssgEntity *ssgLoadX    ( const char *fname, const ssgLoaderOptions *options = NULL ) ;
 ssgEntity *ssgLoadFLT  ( const char *fname, const ssgLoaderOptions *options = NULL ) ;
 ssgEntity *ssgLoadM    ( const char *fname, const ssgLoaderOptions *options = NULL ) ;