Update of /cvsroot/plib/plib/examples/src/ssg/water
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20455
Modified Files:
Makefile.am water.cxx water.dsp
Log Message:
improved water example, by Jan Reucker
Index: Makefile.am
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/water/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am 1 Sep 2002 05:22:26 -0000 1.4
+++ Makefile.am 27 Aug 2005 21:07:11 -0000 1.5
@@ -4,7 +4,7 @@
water_SOURCES = water.cxx
-water_LDADD = -lplibpu -lplibfnt -lplibssgaux -lplibssg -lplibsg -lplibul $(GLUT_LIBS) $(OGL_LIBS)
+water_LDADD = -lplibpw -lplibpu -lplibfnt -lplibssgaux -lplibssg -lplibsg -lplibul $(OGL_LIBS)
endif
Index: water.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/water/water.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- water.cxx 29 Dec 2004 07:19:40 -0000 1.26
+++ water.cxx 27 Aug 2005 21:07:11 -0000 1.27
@@ -21,6 +21,11 @@
$Id$
*/
+#define PU_USE_PW
+
+#ifndef GL_GLEXT_PROTOTYPES
+#define GL_GLEXT_PROTOTYPES
+#endif
#include <stdio.h>
#include <stdlib.h>
[...250 lines suppressed...]
trainDisableButton->setCallback ( trainDisableButton_cb ) ;
@@ -986,7 +971,7 @@
timeText = new puText ( 500, VIEW_GUI_BASE+80 ) ;
timeText->setColour( PUCOL_LABEL, FONT_COLOUR ) ;
-
+
window_group->close () ;
}
@@ -999,7 +984,7 @@
init_graphics () ;
load_database () ;
init_gui () ;
- glutMainLoop () ;
+ main_loop () ;
return 0 ;
}
Index: water.dsp
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/water/water.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- water.dsp 25 Mar 2004 18:26:07 -0000 1.4
+++ water.dsp 27 Aug 2005 21:07:11 -0000 1.5
@@ -23,6 +23,8 @@
# Begin Project
# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
@@ -48,7 +50,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pui.lib fnt.lib ssgAux.lib ssg.lib sg.lib ul.lib winmm.lib opengl32.lib glu32.lib glut32.lib /nologo /subsystem:console /machine:I386 /out:"water.exe" /libpath:"..\..\..\..\..\plib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pw.lib pui.lib fnt.lib ssgAux.lib ssg.lib sg.lib ul.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:console /machine:I386 /out:"water.exe" /libpath:"..\..\..\..\..\plib"
!ELSEIF "$(CFG)" == "water - Win32 Debug"
@@ -72,7 +74,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pui_d.lib fnt_d.lib ssgAux_d.lib ssg_d.lib sg_d.lib ul_d.lib winmm.lib opengl32.lib glu32.lib glut32.lib /nologo /subsystem:console /debug /machine:I386 /out:"water.exe" /pdbtype:sept /libpath:"..\..\..\..\..\plib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pw_d.lib pui_d.lib fnt_d.lib ssgAux_d.lib ssg_d.lib sg_d.lib ul_d.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:console /debug /machine:I386 /out:"water.exe" /pdbtype:sept /libpath:"..\..\..\..\..\plib"
!ENDIF
|
