Changeset 3357 in orxonox.OLD for orxonox/branches/parenting

Timestamp:

Jan 6, 2005, 2:30:47 PM (20 years ago)

Author:

patrick

Message:

orxonox/branches/parenting: added glmenu element imagescreen, that will display an image like the gameloadscreen. just skeleton now.

Location:

orxonox/branches/parenting/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (5 diffs)
• glmenu_imagescreen.cc (added)
• glmenu_imagescreen.h (added)

orxonox/branches/parenting/src/Makefile.am

@@ -35 +35 @@
                  track_manager.cc \
                  matrix.cc \
-                 curve.cc
+                 curve.cc \
+                 glmenu_imagescreen.cc
 
 
@@ -75 +76 @@
                  track_manager.h \
                  matrix.h \
-                 curve.h
+                 curve.h \
+                 glmenu_imagescreen.h
 
 

orxonox/branches/parenting/src/Makefile.in

@@ -63 +63 @@
         p_node.$(OBJEXT) null_parent.$(OBJEXT) base_object.$(OBJEXT) \
         helper_parent.$(OBJEXT) track_manager.$(OBJEXT) \
-        matrix.$(OBJEXT) curve.$(OBJEXT)
+        matrix.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -77 +77 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/environment.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/glmenu_imagescreen.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
@@ -232 +233 @@
                  track_manager.cc \
                  matrix.cc \
-                 curve.cc
+                 curve.cc \
+                 glmenu_imagescreen.cc
 
 noinst_HEADERS = ability.h \
@@ -271 +273 @@
                  track_manager.h \
                  matrix.h \
-                 curve.h
+                 curve.h \
+                 glmenu_imagescreen.h
 
 EXTRA_DIST = orxonox.conf
@@ -360 +363 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glmenu_imagescreen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper_parent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@