Changeset 3705 in orxonox.OLD for orxonox

Timestamp:

Mar 31, 2005, 11:15:02 PM (20 years ago)

Author:

dave

Message:

branches/dave: hab den Himmerl schnell Heller gemacht, kam per Zufall auf die Idee

Location:

orxonox/branches/dave/src

Files:

• Makefile.in (modified) (3 diffs)
• console/Makefile.in (modified) (2 diffs)
• gui/Makefile.in (modified) (2 diffs)
• importer/Makefile.in (modified) (2 diffs)
• shadow.cc (modified) (1 diff)
• skysphere.cc (modified) (2 diffs)

orxonox/branches/dave/src/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -551 +551 @@
         tags=; \
         here=`pwd`; \
-        if (etags --etags-include --version) >/dev/null 2>&1; then \
+        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
+          empty_fix=.; \
         else \
           include_option=--include; \
+          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test -f $$subdir/TAGS && \
+            test ! -f $$subdir/TAGS || \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -568 +570 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/dave/src/console/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -289 +289 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/dave/src/gui/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -321 +321 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/dave/src/importer/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -303 +303 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/dave/src/shadow.cc

@@ -142 +142 @@
     det-= m[8]*m[5]*m[2];
     det-= m[4]*m[1]*m[10];
-    det-= m[0]*m[9]*[6];
+    det-= m[0]*m[9]*m[6];
     
     

orxonox/branches/dave/src/skysphere.cc

@@ -81 +81 @@
 void Skysphere::draw()
 {
+    glEnable(GL_COLOR_MATERIAL);
     sky->select();
     glPushMatrix();
@@ -91 +92 @@
     gluSphere(sphereObj,200.0f,20,20);
     glPopMatrix();
+    glDisable(GL_COLOR_MATERIAL);