Changeset 3238 in orxonox.OLD for orxonox/branches/sound
- Timestamp:
- Dec 20, 2004, 2:42:54 AM (21 years ago)
- Location:
- orxonox/branches/sound
- Files:
-
- 56 edited
-
CODING-STANDARDS (modified) (2 diffs)
-
Makefile.am (modified) (1 diff)
-
Makefile.in (modified) (10 diffs)
-
NEWS (modified) (1 diff)
-
config.h.in (modified) (3 diffs)
-
configure (modified) (47 diffs)
-
configure.ac (modified) (6 diffs)
-
src/Makefile (modified) (23 diffs)
-
src/Makefile.am (modified) (2 diffs)
-
src/Makefile.in (modified) (24 diffs)
-
src/ability.h (modified) (2 diffs)
-
src/ai.h (modified) (2 diffs)
-
src/base_entity.h (modified) (2 diffs)
-
src/camera.cc (modified) (15 diffs)
-
src/camera.h (modified) (5 diffs)
-
src/campaign.cc (modified) (8 diffs)
-
src/campaign.h (modified) (3 diffs)
-
src/collision.cc (modified) (19 diffs)
-
src/collision.h (modified) (4 diffs)
-
src/command_node.cc (modified) (16 diffs)
-
src/command_node.h (modified) (2 diffs)
-
src/coordinates.h (modified) (2 diffs)
-
src/data_tank.h (modified) (2 diffs)
-
src/environment.cc (modified) (5 diffs)
-
src/environment.h (modified) (2 diffs)
-
src/error.h (modified) (2 diffs)
-
src/game_loader.cc (modified) (12 diffs)
-
src/game_loader.h (modified) (4 diffs)
-
src/ini_parser.cc (modified) (3 diffs)
-
src/ini_parser.h (modified) (2 diffs)
-
src/keynames.cc (modified) (5 diffs)
-
src/keynames.h (modified) (6 diffs)
-
src/list.h (modified) (1 diff)
-
src/message_structures.h (modified) (2 diffs)
-
src/npc.h (modified) (2 diffs)
-
src/orxonox.cc (modified) (19 diffs)
-
src/orxonox.h (modified) (4 diffs)
-
src/player.cc (modified) (4 diffs)
-
src/player.h (modified) (3 diffs)
-
src/power_up.h (modified) (2 diffs)
-
src/proto_class.h (modified) (2 diffs)
-
src/shoot_laser.h (modified) (2 diffs)
-
src/shoot_rocket.h (modified) (2 diffs)
-
src/stdincl.h (modified) (1 diff)
-
src/story_def.h (modified) (2 diffs)
-
src/story_entity.cc (modified) (3 diffs)
-
src/story_entity.h (modified) (1 diff)
-
src/synchronisable.h (modified) (2 diffs)
-
src/track.cc (modified) (3 diffs)
-
src/track.h (modified) (3 diffs)
-
src/vector.cc (modified) (12 diffs)
-
src/vector.h (modified) (5 diffs)
-
src/world.cc (modified) (27 diffs)
-
src/world.h (modified) (3 diffs)
-
src/world_entity.cc (modified) (7 diffs)
-
src/world_entity.h (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/sound/CODING-STANDARDS
r1856 r3238 1 CODING-STANDARTS FOR ORXONOX 2 -==============--==---+++++- 3 In this file it is described how a orxonox-developer should structure his code. 4 Every developer has to read it and follow the rules, and orxonox will grow. 1 5 2 6 Contents: 7 --------- 8 1.Coding Conventions 9 2.How to format your Code 10 3.Example 3 11 4 12 1.Coding Conventions 5 2.How to format your Code 6 7 1.Coding Conventions 8 -------------------- 13 ==================== 9 14 ==> If you are beginning a new code-file: copy the proto_class.{cc,h} 10 15 ==> and work with these files. 11 16 12 a) in every code file, there has to be a GNU copyright header 13 b) under the (c) header write your name as main-programmer, if 14 you are just bugfixing or extending write it under co-programmer 15 c) Every function has a header with informations about it: 16 /** 17 \brief <a brief description> 18 \param <parameters the function needs> 19 \param <more parameters> 17 1.1.What has to be there: 18 ------------------------- 19 a) in every code file, there must be a GNU copyright header. 20 20 21 <more description> 22 */ 23 This makes live easier, if we want to add a documentation. 21 b) under the (c) header write your name as main-programmer, if 22 you are just bugfixing or extending write it under co-programmer. 23 24 c) Every element of the must be documented with doxygen-tags. 25 26 1.2.Doxygen Tags: 27 ----------------- 28 Doxygen tags in general are comments inside a file, that look just a bit different. 29 most of the time they extend the /* or // with a second star or a ! 30 31 a) h-files: 32 1) every h-file you want to be documented you have to tag. (tag looks like /*! \file somefile */ ) 33 2) every class has to be Documented. ( //! what it does) 34 3) special variables can be documented. ( //!< wow this member is cool because ) 35 36 b) cc-files: 37 1) all the methods must be documented, and all their parameters and return value must be covered. 38 39 c) look out for this: Doxygen parses preprocessor arguments, 40 so if some comments is excluded by a #ifdef, #endif 41 doxygen will not parse it. And ther will be nothing in the docu. 24 42 25 43 26 44 2.How to format your Code 27 ------------------------- 45 ========================= 28 46 We use the GNU conding convention (which is also used in xemacs etc.): 29 47 … … 51 69 52 70 71 72 73 3.Example 74 ========= 75 3.1.Header 76 ---------- 77 A standard header has the same name as the Class it handles. 78 79 someclass.h 80 ----------- 81 /*! 82 \file someclass.h 83 \brief Some short description of the someclass 84 \todo maybe there remains something to do in this entire file 85 86 Here comes a longer description 87 this can also be longer than one line 88 */ 89 90 #ifndef _SOMECLASS_H 91 #define _SOMECLASS_H 92 93 #include <many_headers> 94 #include "stdincl.h" 95 96 //! short description of the class 97 /** 98 \todo what remains to be done here 99 100 longer description 101 */ 102 class SomeClass 103 { 104 private: 105 int usefull_variable; 106 int cool_variable; //!< this variable is cool, because... 107 108 protected: 109 char* someOtherMember; 110 111 public: 112 SomeClass (void); 113 ~SomeClass (void); 114 115 int mightyFunction (char* name, int value); 116 //.... 117 }; 118 119 #endif /* _SOMECLASS_H */ 120 121 122 123 3.2.CC-Files 124 ------------ 125 CC-files must be named the same as the .h-files they belong to. 126 127 someclass.cc 128 ------------ 129 130 /* 131 orxonox - the future of 3D-vertical-scrollers 132 133 Copyright (C) 2004 orx 134 135 This program is free software; you can redistribute it and/or modify 136 it under the terms of the GNU General Public License as published by 137 the Free Software Foundation; either version 2, or (at your option) 138 any later version. 139 140 ### File Specific: 141 main-programmer: The Name of Myself 142 co-programmer: ... 143 */ 144 145 #include "someclass.h" 146 147 148 /** 149 \brief <a brief description> 150 \todo I think you get it. 151 152 <more description> 153 */ 154 SomeClass::SomeClass (void) 155 { 156 //constructor-stuff 157 } 158 159 /** 160 \brief <a brief description> 161 \todo if something is not destructed it will be here 162 163 <more description> 164 */ 165 ~SomeClass::~SomeClass (void) 166 { 167 //destroy all te allocated space of the Class 168 } 169 170 /** 171 \brief <a brief description> 172 \param name <what is this parameter for> 173 \param valuse <what for...> 174 \returns <what it returns> 175 176 <more description> 177 */ 178 int SomeClass::mightyFuncion (char* name, int value) 179 { 180 this->coolVariable = value; 181 // and so on..... 182 } 183 184 // ... -
orxonox/branches/sound/Makefile.am
r1956 r3238 1 SUBDIRS = src console gui 1 AUTOMAKE_OPTIONS = foreign no-installman no-installinfo 2 3 SUBDIRS = src 4 5 EXTRA_DIST = CODING-STANDARDS \ 6 IDEAS \ 7 TASKS \ 8 doc/CREDITS \ 9 doc/doxyconf/build \ 10 doc/doxyconf/confopts \ 11 doc/doxyconf/input \ 12 doc/doxyconf/preprocessor \ 13 doc/doxyconf/progress \ 14 doc/doxyconf/project 15 16 ## doxygen stuff 17 if DOXYGEN 18 DOXYGEN_INPUT = "src src/gui src/importer" 19 20 ## Exclude the application wizard templates, and some file templates 21 DOXYGEN_EXCLUDE = 22 23 DOXYGEN_EXAMPLE_PATH = 24 25 ## Use Search engine (Versions 1.3.4 and above only!) 26 DOXYGEN_SEARCHENGINE = YES 27 28 include doc/documentation.am 29 endif -
orxonox/branches/sound/Makefile.in
r2964 r3238 34 34 PRE_UNINSTALL = : 35 35 POST_UNINSTALL = : 36 subdir = . 36 host_triplet = @host@ 37 37 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ 38 38 $(srcdir)/Makefile.in $(srcdir)/config.h.in \ 39 $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ 40 depcomp install-sh missing mkinstalldirs 39 $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \ 40 COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \ 41 install-sh missing mkinstalldirs 42 subdir = . 41 43 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 42 44 am__aclocal_m4_deps = $(top_srcdir)/configure.ac … … 87 89 CXXFLAGS = @CXXFLAGS@ 88 90 CYGPATH_W = @CYGPATH_W@ 91 DEBUG = @DEBUG@ 89 92 DEFS = @DEFS@ 90 93 DEPDIR = @DEPDIR@ 94 DOXYGEN = @DOXYGEN@ 95 DOXYGEN_FALSE = @DOXYGEN_FALSE@ 96 DOXYGEN_TRUE = @DOXYGEN_TRUE@ 91 97 ECHO_C = @ECHO_C@ 92 98 ECHO_N = @ECHO_N@ … … 94 100 EGREP = @EGREP@ 95 101 EXEEXT = @EXEEXT@ 102 GTK2_CFLAGS = @GTK2_CFLAGS@ 103 GTK2_LIBS = @GTK2_LIBS@ 104 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 105 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ 96 106 INSTALL_DATA = @INSTALL_DATA@ 97 107 INSTALL_PROGRAM = @INSTALL_PROGRAM@ … … 127 137 am__quote = @am__quote@ 128 138 bindir = @bindir@ 139 build = @build@ 129 140 build_alias = @build_alias@ 141 build_cpu = @build_cpu@ 142 build_os = @build_os@ 143 build_vendor = @build_vendor@ 130 144 datadir = @datadir@ 131 145 exec_prefix = @exec_prefix@ 146 host = @host@ 132 147 host_alias = @host_alias@ 148 host_cpu = @host_cpu@ 149 host_os = @host_os@ 150 host_vendor = @host_vendor@ 133 151 includedir = @includedir@ 134 152 infodir = @infodir@ … … 145 163 sharedstatedir = @sharedstatedir@ 146 164 sysconfdir = @sysconfdir@ 165 target = @target@ 147 166 target_alias = @target_alias@ 148 SUBDIRS = src console gui 167 target_cpu = @target_cpu@ 168 target_os = @target_os@ 169 target_vendor = @target_vendor@ 170 AUTOMAKE_OPTIONS = foreign no-installman no-installinfo 171 SUBDIRS = src 172 EXTRA_DIST = CODING-STANDARDS \ 173 IDEAS \ 174 TASKS \ 175 doc/CREDITS \ 176 doc/doxyconf/build \ 177 doc/doxyconf/confopts \ 178 doc/doxyconf/input \ 179 doc/doxyconf/preprocessor \ 180 doc/doxyconf/progress \ 181 doc/doxyconf/project 182 183 @DOXYGEN_TRUE@DOXYGEN_INPUT = "src src/gui src/importer" 184 @DOXYGEN_TRUE@DOXYGEN_EXCLUDE = 185 @DOXYGEN_TRUE@DOXYGEN_EXAMPLE_PATH = 186 @DOXYGEN_TRUE@DOXYGEN_SEARCHENGINE = YES 187 @DOXYGEN_TRUE@DX_CONFIG_FILE = "$(top_srcdir)/orxodox" 188 @DOXYGEN_TRUE@DX_CONF_DIR = "$(top_srcdir)/doc/doxyconf" 149 189 all: config.h 150 190 $(MAKE) $(AM_MAKEFLAGS) all-recursive … … 153 193 am--refresh: 154 194 @: 155 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)195 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/doc/documentation.am $(am__configure_deps) 156 196 @for dep in $?; do \ 157 197 case '$(am__configure_deps)' in \ 158 198 *$$dep*) \ 159 echo ' cd $(srcdir) && $(AUTOMAKE) -- gnu'; \160 cd $(srcdir) && $(AUTOMAKE) -- gnu\199 echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ 200 cd $(srcdir) && $(AUTOMAKE) --foreign \ 161 201 && exit 0; \ 162 202 exit 1;; \ 163 203 esac; \ 164 204 done; \ 165 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnuMakefile'; \205 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ 166 206 cd $(top_srcdir) && \ 167 $(AUTOMAKE) -- gnuMakefile207 $(AUTOMAKE) --foreign Makefile 168 208 .PRECIOUS: Makefile 169 209 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 326 366 $(am__remove_distdir) 327 367 mkdir $(distdir) 368 $(mkdir_p) $(distdir)/doc $(distdir)/doc/doxyconf 328 369 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 329 370 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ … … 464 505 check-am: all-am 465 506 check: check-recursive 466 all-am: Makefile config.h 507 all-am: Makefile config.h all-local 467 508 installdirs: installdirs-recursive 468 509 installdirs-am: … … 493 534 clean: clean-recursive 494 535 495 clean-am: clean-generic mostlyclean-am536 clean-am: clean-generic clean-local mostlyclean-am 496 537 497 538 distclean: distclean-recursive 498 539 -rm -f $(am__CONFIG_DISTCLEAN_FILES) 499 540 -rm -f Makefile 500 distclean-am: clean-am distclean-generic distclean-hdr distclean-tags 541 distclean-am: clean-am distclean-generic distclean-hdr distclean-local \ 542 distclean-tags 501 543 502 544 dvi: dvi-recursive … … 538 580 ps-am: 539 581 540 uninstall-am: uninstall-info-am582 uninstall-am: 541 583 542 584 uninstall-info: uninstall-info-recursive 543 585 544 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ 545 check-am clean clean-generic clean-recursive ctags \ 546 ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ 547 dist-tarZ dist-zip distcheck distclean distclean-generic \ 548 distclean-hdr distclean-recursive distclean-tags \ 549 distcleancheck distdir distuninstallcheck dvi dvi-am html \ 550 html-am info info-am install install-am install-data \ 551 install-data-am install-exec install-exec-am install-info \ 552 install-info-am install-man install-strip installcheck \ 553 installcheck-am installdirs installdirs-am maintainer-clean \ 554 maintainer-clean-generic maintainer-clean-recursive \ 555 mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ 556 pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ 557 uninstall-info-am 558 586 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \ 587 am--refresh check check-am clean clean-generic clean-local \ 588 clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \ 589 dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ 590 distclean-generic distclean-hdr distclean-local \ 591 distclean-recursive distclean-tags distcleancheck distdir \ 592 distuninstallcheck dvi dvi-am html html-am info info-am \ 593 install install-am install-data install-data-am install-exec \ 594 install-exec-am install-info install-info-am install-man \ 595 install-strip installcheck installcheck-am installdirs \ 596 installdirs-am maintainer-clean maintainer-clean-generic \ 597 maintainer-clean-recursive mostlyclean mostlyclean-generic \ 598 mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ 599 uninstall uninstall-am uninstall-info-am 600 601 602 @DOXYGEN_TRUE@doc: 603 @DOXYGEN_TRUE@ if test ! -e $(DX_CONFIG_FILE); then \ 604 @DOXYGEN_TRUE@ make doc-config; \ 605 @DOXYGEN_TRUE@ fi 606 @DOXYGEN_TRUE@ @echo "Generating doxygen Documentation"; \ 607 @DOXYGEN_TRUE@ $(DOXYGEN) $(DX_CONFIG_FILE) 608 609 @DOXYGEN_TRUE@doc-config: 610 @DOXYGEN_TRUE@ @echo "Generationg doxygen configuration File." ; \ 611 @DOXYGEN_TRUE@ if test -e "$(top_srcdir)/orxodox"; then \ 612 @DOXYGEN_TRUE@ echo "deleting existing Configuration File" ; \ 613 @DOXYGEN_TRUE@ rm $(top_srcdir)/orxodox ; \ 614 @DOXYGEN_TRUE@ fi ; \ 615 @DOXYGEN_TRUE@ touch $(DX_CONFIG_FILE) ; \ 616 @DOXYGEN_TRUE@ $(DX_CONF_DIR)/project >> $(DX_CONFIG_FILE); \ 617 @DOXYGEN_TRUE@ echo "PROJECT_NAME = \"$(PACKAGE_NAME)\"" >> $(DX_CONFIG_FILE); \ 618 @DOXYGEN_TRUE@ echo "PROJECT_NUMBER = \"$(PACKAGE_VERSION)\"" >> $(DX_CONFIG_FILE); \ 619 @DOXYGEN_TRUE@ echo "OUTPUT_DIRECTORY = \"$(top_srcdir)/doc/\"" >> $(DX_CONFIG_FILE); \ 620 @DOXYGEN_TRUE@ echo " " >> $(DX_CONFIG_FILE); \ 621 @DOXYGEN_TRUE@\ 622 @DOXYGEN_TRUE@ $(DX_CONF_DIR)/build >> $(DX_CONFIG_FILE); \ 623 @DOXYGEN_TRUE@\ 624 @DOXYGEN_TRUE@ $(DX_CONF_DIR)/progress >> $(DX_CONFIG_FILE); \ 625 @DOXYGEN_TRUE@ if test $(DEBUG) -ge 2 ; then \ 626 @DOXYGEN_TRUE@ echo "QUIET = \"NO\"" >> $(DX_CONFIG_FILE); \ 627 @DOXYGEN_TRUE@ else \ 628 @DOXYGEN_TRUE@ echo "QUIET = \"YES\"" >> $(DX_CONFIG_FILE); \ 629 @DOXYGEN_TRUE@ fi ;\ 630 @DOXYGEN_TRUE@\ 631 @DOXYGEN_TRUE@ $(DX_CONF_DIR)/input >> $(DX_CONFIG_FILE); \ 632 @DOXYGEN_TRUE@ echo "INPUT = $(DOXYGEN_INPUT)" >> $(DX_CONFIG_FILE); \ 633 @DOXYGEN_TRUE@\ 634 @DOXYGEN_TRUE@ $(DX_CONF_DIR)/preprocessor >> $(DX_CONFIG_FILE); \ 635 @DOXYGEN_TRUE@ echo "INCLUDE_PATH = \"$(top_srcdir)\"" >> $(DX_CONFIG_FILE); \ 636 @DOXYGEN_TRUE@ echo "PREDEFINED = \"HAVE_CONFIG_H= \"" >> $(DX_CONFIG_FILE); \ 637 @DOXYGEN_TRUE@ \ 638 @DOXYGEN_TRUE@ $(DX_CONF_DIR)/confopts >> $(DX_CONFIG_FILE) 639 640 @DOXYGEN_TRUE@doc-delete: 641 @DOXYGEN_TRUE@ @echo "Deleting doxygen Documentation" 642 @DOXYGEN_TRUE@ rm -rf $(top_srcdir)/doc/html 643 @DOXYGEN_TRUE@ rm -rf $(top_srcdir)/doc/latex 644 645 @DOXYGEN_TRUE@distclean-local: doc-delete 646 @DOXYGEN_TRUE@ rm -f $(top_srcdir)/orxodox 647 648 @DOXYGEN_TRUE@clean-local: doc-delete 649 650 @DOXYGEN_TRUE@all-local: doc 651 652 @DOXYGEN_TRUE@.PHONY: doc doc-config doc-delete 653 654 # Local Variables: 655 # mode: makefile 656 # End: 559 657 # Tell versions [3.59,3.63) of GNU make to not export all variables. 560 658 # Otherwise a system limit (for SysV at least) may be exceeded. -
orxonox/branches/sound/NEWS
r2964 r3238 1 Date: December 20, 2004 2 Topic: New Webpage under construction 3 Body: I am proud to announce, that nico is currently developing our new webpage. It has a verry cool new style, and is much more easy to extend, than the old one. <a href="http://www.orxonox.ethz.ch/new">visit it</a>. 4 5 Date: December 14, 2004 6 Topic: Repository Moved 7 Body: Today we moved the repository. The new location of the repository is <A href="http://orxonox.ethz.ch/repos/reporx">http://orxonox.ethz.ch/repos/reporx</A>. 8 1 9 Date: November 16, 2004 2 10 Topic: Importer -
orxonox/branches/sound/config.h.in
r2854 r3238 1 1 /* config.h.in. Generated from configure.ac by autoheader. */ 2 3 /* in which debug mode we are */ 4 #undef DEBUG 2 5 3 6 /* Define to 1 if you have the `bzero' function. */ … … 10 13 #undef HAVE_GL_GL_H 11 14 15 /* if we have GTK2 */ 16 #undef HAVE_GTK2 17 12 18 /* Define to 1 if you have the <inttypes.h> header file. */ 13 19 #undef HAVE_INTTYPES_H 14 20 21 /* Define to 1 if you have the <jpeglib.h> header file. */ 22 #undef HAVE_JPEGLIB_H 23 15 24 /* Define to 1 if you have the `m' library (-lm). */ 16 25 #undef HAVE_LIBM 17 18 /* Define to 1 if you have the `OSMesa' library (-lOSMesa). */19 #undef HAVE_LIBOSMESA20 21 /* Define to 1 if you have the `X11' library (-lX11). */22 #undef HAVE_LIBX1123 24 /* Define to 1 if you have the `Xt' library (-lXt). */25 #undef HAVE_LIBXT26 26 27 27 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and … … 32 32 #undef HAVE_MEMORY_H 33 33 34 /* Define to 1 if you have the <OpenGL/glu.h> header file. */ 35 #undef HAVE_OPENGL_GLU_H 36 37 /* Define to 1 if you have the <OpenGL/gl.h> header file. */ 38 #undef HAVE_OPENGL_GL_H 39 40 /* Define to 1 if you have the <png.h> header file. */ 41 #undef HAVE_PNG_H 42 34 43 /* Define to 1 if you have the <SDL/SDL.h> header file. */ 35 44 #undef HAVE_SDL_SDL_H 45 46 /* Define to 1 if you have the <SDL/SDL_image.h> header file. */ 47 #undef HAVE_SDL_SDL_IMAGE_H 36 48 37 49 /* Define to 1 if you have the <SDL/SDL_mixer.h> header file. */ -
orxonox/branches/sound/configure
r2964 r3238 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.59 for orxonox 0. 1-pre-alpha.3 # Generated by GNU Autoconf 2.59 for orxonox 0.2.0_alpha-r1. 4 4 # 5 5 # Report bugs to <orxonox-dev@mail.datacore.ch>. … … 270 270 PACKAGE_NAME='orxonox' 271 271 PACKAGE_TARNAME='orxonox' 272 PACKAGE_VERSION='0. 1-pre-alpha'273 PACKAGE_STRING='orxonox 0. 1-pre-alpha'272 PACKAGE_VERSION='0.2.0_alpha-r1' 273 PACKAGE_STRING='orxonox 0.2.0_alpha-r1' 274 274 PACKAGE_BUGREPORT='orxonox-dev@mail.datacore.ch' 275 275 … … 312 312 #endif" 313 313 314 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP MSBITFIELDSLIBOBJS LTLIBOBJS'314 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE LIBOBJS LTLIBOBJS' 315 315 ac_subst_files='' 316 316 … … 789 789 # This message is too long to be a string in the A/UX 3.1 sh. 790 790 cat <<_ACEOF 791 \`configure' configures orxonox 0. 1-pre-alphato adapt to many kinds of systems.791 \`configure' configures orxonox 0.2.0_alpha-r1 to adapt to many kinds of systems. 792 792 793 793 Usage: $0 [OPTION]... [VAR=VALUE]... … … 846 846 --program-suffix=SUFFIX append SUFFIX to installed program names 847 847 --program-transform-name=PROGRAM run sed PROGRAM on installed program names 848 849 System types: 850 --build=BUILD configure for building on BUILD [guessed] 851 --host=HOST cross-compile to build programs to run on HOST [BUILD] 852 --target=TARGET configure for building compilers for TARGET [HOST] 848 853 _ACEOF 849 854 fi … … 851 856 if test -n "$ac_init_help"; then 852 857 case $ac_init_help in 853 short | recursive ) echo "Configuration of orxonox 0. 1-pre-alpha:";;858 short | recursive ) echo "Configuration of orxonox 0.2.0_alpha-r1:";; 854 859 esac 855 860 cat <<\_ACEOF … … 860 865 --disable-dependency-tracking speeds up one-time build 861 866 --enable-dependency-tracking do not reject slow dependency extractors 867 --enable-debug compiles in debug mode. Lots of debug info about the 868 game. 869 870 Optional Packages: 871 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] 872 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 873 --without-gtk Prevents GTK from being loaded 874 --without-sdl-image Prevents SDL_image from being loaded 862 875 863 876 Some influential environment variables: … … 971 984 if $ac_init_version; then 972 985 cat <<\_ACEOF 973 orxonox configure 0. 1-pre-alpha986 orxonox configure 0.2.0_alpha-r1 974 987 generated by GNU Autoconf 2.59 975 988 … … 985 998 running configure, to aid debugging if configure makes a mistake. 986 999 987 It was created by orxonox $as_me 0. 1-pre-alpha, which was1000 It was created by orxonox $as_me 0.2.0_alpha-r1, which was 988 1001 generated by GNU Autoconf 2.59. Invocation command line was 989 1002 … … 1321 1334 1322 1335 1323 am__api_version="1.8" 1336 1337 # Detect the canonical host and target build environment. 1324 1338 ac_aux_dir= 1325 1339 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do … … 1347 1361 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. 1348 1362 1363 # Make sure we can run config.sub. 1364 $ac_config_sub sun4 >/dev/null 2>&1 || 1365 { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 1366 echo "$as_me: error: cannot run $ac_config_sub" >&2;} 1367 { (exit 1); exit 1; }; } 1368 1369 echo "$as_me:$LINENO: checking build system type" >&5 1370 echo $ECHO_N "checking build system type... $ECHO_C" >&6 1371 if test "${ac_cv_build+set}" = set; then 1372 echo $ECHO_N "(cached) $ECHO_C" >&6 1373 else 1374 ac_cv_build_alias=$build_alias 1375 test -z "$ac_cv_build_alias" && 1376 ac_cv_build_alias=`$ac_config_guess` 1377 test -z "$ac_cv_build_alias" && 1378 { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 1379 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} 1380 { (exit 1); exit 1; }; } 1381 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || 1382 { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 1383 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} 1384 { (exit 1); exit 1; }; } 1385 1386 fi 1387 echo "$as_me:$LINENO: result: $ac_cv_build" >&5 1388 echo "${ECHO_T}$ac_cv_build" >&6 1389 build=$ac_cv_build 1390 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 1391 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 1392 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 1393 1394 1395 echo "$as_me:$LINENO: checking host system type" >&5 1396 echo $ECHO_N "checking host system type... $ECHO_C" >&6 1397 if test "${ac_cv_host+set}" = set; then 1398 echo $ECHO_N "(cached) $ECHO_C" >&6 1399 else 1400 ac_cv_host_alias=$host_alias 1401 test -z "$ac_cv_host_alias" && 1402 ac_cv_host_alias=$ac_cv_build_alias 1403 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || 1404 { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 1405 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} 1406 { (exit 1); exit 1; }; } 1407 1408 fi 1409 echo "$as_me:$LINENO: result: $ac_cv_host" >&5 1410 echo "${ECHO_T}$ac_cv_host" >&6 1411 host=$ac_cv_host 1412 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 1413 host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 1414 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 1415 1416 1417 echo "$as_me:$LINENO: checking target system type" >&5 1418 echo $ECHO_N "checking target system type... $ECHO_C" >&6 1419 if test "${ac_cv_target+set}" = set; then 1420 echo $ECHO_N "(cached) $ECHO_C" >&6 1421 else 1422 ac_cv_target_alias=$target_alias 1423 test "x$ac_cv_target_alias" = "x" && 1424 ac_cv_target_alias=$ac_cv_host_alias 1425 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || 1426 { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 1427 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} 1428 { (exit 1); exit 1; }; } 1429 1430 fi 1431 echo "$as_me:$LINENO: result: $ac_cv_target" >&5 1432 echo "${ECHO_T}$ac_cv_target" >&6 1433 target=$ac_cv_target 1434 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 1435 target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 1436 target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 1437 1438 1439 # The aliases save the names the user supplied, while $host etc. 1440 # will get canonicalized. 1441 test -n "$target_alias" && 1442 test "$program_prefix$program_suffix$program_transform_name" = \ 1443 NONENONEs,x,x, && 1444 program_prefix=${target_alias}- 1445 1446 1447 am__api_version="1.8" 1349 1448 # Find a good install program. We prefer a C program (faster), 1350 1449 # so one script is as good as another. But avoid the broken or … … 1620 1719 # Define the identity of the package. 1621 1720 PACKAGE='orxonox' 1622 VERSION='0. 1-pre-alpha'1721 VERSION='0.2.0_alpha-r1' 1623 1722 1624 1723 … … 3322 3421 3323 3422 3324 3325 3326 3327 3423 ac_ext=c 3328 3424 ac_cpp='$CPP $CPPFLAGS' … … 3742 3838 3743 3839 3840 ### CHECKING OPTIONAT ARGUMENTS 3841 ## DEBUG-statement 3842 DEBUG=no 3843 echo "$as_me:$LINENO: checking if DEBUG-mode should be enabled" >&5 3844 echo $ECHO_N "checking if DEBUG-mode should be enabled... $ECHO_C" >&6 3845 # Check whether --enable-debug or --disable-debug was given. 3846 if test "${enable_debug+set}" = set; then 3847 enableval="$enable_debug" 3848 DEBUG=$enableval 3849 fi; 3850 3851 if test "$DEBUG" = "no"; then 3852 echo "no" 3853 echo " -> Setting debuglevel to 1. Like this you can still see errors." 3854 DEBUG=1 3855 elif test "$DEBUG" = yes; then 3856 echo "yes" 3857 echo " -> Setting debuglevel to 3. HARD DEBUG MODE!!." 3858 DEBUG=3 3859 else 3860 echo "yes set to $DEBUG" 3861 fi 3862 3863 cat >>confdefs.h <<_ACEOF 3864 #define DEBUG $DEBUG 3865 _ACEOF 3866 3867 3868 3869 3870 ## GTK-disabled 3871 echo "$as_me:$LINENO: checking if gtk should be enabled" >&5 3872 echo $ECHO_N "checking if gtk should be enabled... $ECHO_C" >&6 3873 3874 # Check whether --with-gtk or --without-gtk was given. 3875 if test "${with_gtk+set}" = set; then 3876 withval="$with_gtk" 3877 def_gtk=no 3878 else 3879 def_gtk=yes 3880 fi; 3881 if test "$def_gtk" = yes; then 3882 echo "yes" 3883 fi 3884 if test "$def_gtk" = no; then 3885 echo "no" 3886 fi 3887 ### SDL_image-disable 3888 def_sdl_image=yes 3889 echo "$as_me:$LINENO: checking if SDL_image should be enabled" >&5 3890 echo $ECHO_N "checking if SDL_image should be enabled... $ECHO_C" >&6 3891 3892 # Check whether --with-sdl_image or --without-sdl_image was given. 3893 if test "${with_sdl_image+set}" = set; then 3894 withval="$with_sdl_image" 3895 def_sdl_image=no 3896 fi; 3897 if test "$def_sdl_image" = yes; then 3898 echo "yes" 3899 fi 3900 if test "$def_sdl_image" = no; then 3901 echo "no" 3902 fi 3903 3904 3905 ## PROGRAMM CHECKING 3906 # checking for Doxygen 3907 # Extract the first word of "doxygen", so it can be a program name with args. 3908 set dummy doxygen; ac_word=$2 3909 echo "$as_me:$LINENO: checking for $ac_word" >&5 3910 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3911 if test "${ac_cv_path_DOXYGEN+set}" = set; then 3912 echo $ECHO_N "(cached) $ECHO_C" >&6 3913 else 3914 case $DOXYGEN in 3915 [\\/]* | ?:[\\/]*) 3916 ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. 3917 ;; 3918 *) 3919 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3920 for as_dir in $PATH 3921 do 3922 IFS=$as_save_IFS 3923 test -z "$as_dir" && as_dir=. 3924 for ac_exec_ext in '' $ac_executable_extensions; do 3925 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3926 ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" 3927 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 3928 break 2 3929 fi 3930 done 3931 done 3932 3933 ;; 3934 esac 3935 fi 3936 DOXYGEN=$ac_cv_path_DOXYGEN 3937 3938 if test -n "$DOXYGEN"; then 3939 echo "$as_me:$LINENO: result: $DOXYGEN" >&5 3940 echo "${ECHO_T}$DOXYGEN" >&6 3941 else 3942 echo "$as_me:$LINENO: result: no" >&5 3943 echo "${ECHO_T}no" >&6 3944 fi 3945 3946 3947 3948 if test $DOXYGEN; then 3949 DOXYGEN_TRUE= 3950 DOXYGEN_FALSE='#' 3951 else 3952 DOXYGEN_TRUE='#' 3953 DOXYGEN_FALSE= 3954 fi 3955 3956 3744 3957 ### CHECKING FOR SYSTEM ### 3745 3958 3746 3959 echo "$as_me:$LINENO: checking for System" >&5 3747 3960 echo $ECHO_N "checking for System... $ECHO_C" >&6 3748 case `uname` in 3961 ## checking for openGL-environment and other sys-specific parameters 3962 case "$target" in 3749 3963 ### WINDOWS ### 3750 * MINGW*)3964 *-*-mingw32*) 3751 3965 echo "mingw-WINDOWS detected" 3752 3966 … … 4289 4503 fi 4290 4504 4291 4292 4505 # checking for mingw32 4293 4506 echo "$as_me:$LINENO: checking for main in -lmingw32" >&5 … … 4576 4789 4577 4790 if test "$FOUND_sdlmain" = "yes" ; then 4578 4791 LIBS="$LIBS -lsdlmain" 4579 4792 else 4580 4581 4582 4583 4584 4793 echo "------------------" 4794 echo "SDL library not found." 4795 echo "please install the SDL library, which can be found at http://www.libsdl.org" 4796 echo "------------------" 4797 exit 1 4585 4798 fi 4586 4799 echo "$as_me:$LINENO: checking for main in -lsdl" >&5 … … 4647 4860 4648 4861 if test "$FOUND_sdl" = "yes" ; then 4649 4862 LIBS="$LIBS -lsdl" 4650 4863 else 4651 4652 4653 4654 4655 4864 echo "------------------" 4865 echo "SDL library not found." 4866 echo "please install the SDL library, which can be found at http://www.libsdl.org" 4867 echo "------------------" 4868 exit -1 4656 4869 fi 4657 4870 4658 # checking for SDL-Mixer-headers 4659 4660 for ac_header in SDL/SDL_mixer.h 4871 ;; 4872 4873 ### LINUX ### 4874 *-*-linux*) 4875 echo "Linux detected" 4876 4877 Linux="yes" 4878 4879 CPPFLAGS="-I/usr/X11R6/include" 4880 LDFLAGS="-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS" 4881 # checking gl header 4882 4883 for ac_header in GL/gl.h 4661 4884 do 4662 4885 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 4804 5027 4805 5028 else 4806 { { echo "$as_me:$LINENO: error: cannot find SDLheaders" >&54807 echo "$as_me: error: cannot find SDLheaders" >&2;}5029 { { echo "$as_me:$LINENO: error: cannot find opengl headers" >&5 5030 echo "$as_me: error: cannot find opengl headers" >&2;} 4808 5031 { (exit 1); exit 1; }; } 4809 5032 fi … … 4812 5035 4813 5036 4814 # checking for libSDL_mixer4815 echo "$as_me:$LINENO: checking for main in -lSDL_mixer" >&54816 echo $ECHO_N "checking for main in -l SDL_mixer... $ECHO_C" >&64817 if test "${ac_cv_lib_ SDL_mixer_main+set}" = set; then5037 # checking for Unix GL 5038 echo "$as_me:$LINENO: checking for main in -lGL" >&5 5039 echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6 5040 if test "${ac_cv_lib_GL_main+set}" = set; then 4818 5041 echo $ECHO_N "(cached) $ECHO_C" >&6 4819 5042 else 4820 5043 ac_check_lib_save_LIBS=$LIBS 4821 LIBS="-l SDL_mixer$LIBS"5044 LIBS="-lGL $LIBS" 4822 5045 cat >conftest.$ac_ext <<_ACEOF 4823 5046 /* confdefs.h. */ … … 4858 5081 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4859 5082 (exit $ac_status); }; }; then 4860 ac_cv_lib_ SDL_mixer_main=yes5083 ac_cv_lib_GL_main=yes 4861 5084 else 4862 5085 echo "$as_me: failed program was:" >&5 4863 5086 sed 's/^/| /' conftest.$ac_ext >&5 4864 5087 4865 ac_cv_lib_ SDL_mixer_main=no5088 ac_cv_lib_GL_main=no 4866 5089 fi 4867 5090 rm -f conftest.err conftest.$ac_objext \ … … 4869 5092 LIBS=$ac_check_lib_save_LIBS 4870 5093 fi 4871 echo "$as_me:$LINENO: result: $ac_cv_lib_ SDL_mixer_main" >&54872 echo "${ECHO_T}$ac_cv_lib_ SDL_mixer_main" >&64873 if test $ac_cv_lib_ SDL_mixer_main = yes; then4874 FOUND_ SDL_mixer=yes4875 fi 4876 4877 if test "$FOUND_SDL_mixer" = "yes" ; then4878 LIBS="$LIBS -lSDL_mixer"4879 5094 echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5 5095 echo "${ECHO_T}$ac_cv_lib_GL_main" >&6 5096 if test $ac_cv_lib_GL_main = yes; then 5097 FOUND_GL=yes 5098 fi 5099 5100 if test "$FOUND_GL" = "yes" ; then 5101 LIBS="$LIBS -lGL" 5102 else 4880 5103 echo "------------------" 4881 echo " SDL Mixer librarynot found."4882 echo "please install the SDL Mixer library, which can be found at http://www.libsdl.org"5104 echo "opengl not found." 5105 echo "please install the opengl package which can be found at http://www.opengl.org" 4883 5106 echo "------------------" 4884 exit 1 4885 fi 4886 4887 4888 ;; 4889 4890 ### LINUX ### 4891 *Linux*) 4892 echo "Linux detected" 4893 4894 Linux="yes" 4895 4896 # checking gl header 4897 4898 for ac_header in GL/gl.h 5107 exit -1 5108 fi 5109 5110 # cheking for GLU-header 5111 5112 for ac_header in GL/glu.h 4899 5113 do 4900 5114 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 5050 5264 5051 5265 5052 # checking for Unix GL 5053 echo "$as_me:$LINENO: checking for main in -lGL" >&5 5054 echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6 5055 if test "${ac_cv_lib_GL_main+set}" = set; then 5266 echo "$as_me:$LINENO: checking for gluProject in -lGLU" >&5 5267 echo $ECHO_N "checking for gluProject in -lGLU... $ECHO_C" >&6 5268 if test "${ac_cv_lib_GLU_gluProject+set}" = set; then 5056 5269 echo $ECHO_N "(cached) $ECHO_C" >&6 5057 5270 else 5058 5271 ac_check_lib_save_LIBS=$LIBS 5059 LIBS="-lGL $LIBS"5272 LIBS="-lGLU $LIBS" 5060 5273 cat >conftest.$ac_ext <<_ACEOF 5061 5274 /* confdefs.h. */ … … 5065 5278 /* end confdefs.h. */ 5066 5279 5067 5280 /* Override any gcc2 internal prototype to avoid an error. */ 5281 #ifdef __cplusplus 5282 extern "C" 5283 #endif 5284 /* We use char because int might match the return type of a gcc2 5285 builtin and then its argument prototype would still apply. */ 5286 char gluProject (); 5068 5287 int 5069 5288 main () 5070 5289 { 5071 main();5290 gluProject (); 5072 5291 ; 5073 5292 return 0; … … 5096 5315 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5097 5316 (exit $ac_status); }; }; then 5098 ac_cv_lib_GL _main=yes5317 ac_cv_lib_GLU_gluProject=yes 5099 5318 else 5100 5319 echo "$as_me: failed program was:" >&5 5101 5320 sed 's/^/| /' conftest.$ac_ext >&5 5102 5321 5103 ac_cv_lib_GL _main=no5322 ac_cv_lib_GLU_gluProject=no 5104 5323 fi 5105 5324 rm -f conftest.err conftest.$ac_objext \ … … 5107 5326 LIBS=$ac_check_lib_save_LIBS 5108 5327 fi 5109 echo "$as_me:$LINENO: result: $ac_cv_lib_GL _main" >&55110 echo "${ECHO_T}$ac_cv_lib_GL _main" >&65111 if test $ac_cv_lib_GL _main= yes; then5112 FOUND_GL =yes5113 fi 5114 5115 if test "$FOUND_GL" = "yes" ; then5116 LIBS="$LIBS -lGL"5117 else5328 echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluProject" >&5 5329 echo "${ECHO_T}$ac_cv_lib_GLU_gluProject" >&6 5330 if test $ac_cv_lib_GLU_gluProject = yes; then 5331 FOUND_GLU=yes 5332 fi 5333 5334 if test "$FOUND_GLU" = "yes" ; then 5335 LIBS="$LIBS -lGLU" 5336 else 5118 5337 echo "------------------" 5119 echo " openglnot found."5120 echo "please install the opengl packagewhich can be found at http://www.opengl.org"5338 echo "GLU library not found." 5339 echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org" 5121 5340 echo "------------------" 5122 5341 exit -1 5123 fi5124 5125 # che king for GLU-header5126 5127 for ac_header in GL/glu.h5342 fi 5343 5344 # checking for SDL-headers 5345 5346 for ac_header in SDL/SDL.h 5128 5347 do 5129 5348 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 5271 5490 5272 5491 else 5273 { { echo "$as_me:$LINENO: error: cannot find openglheaders" >&55274 echo "$as_me: error: cannot find openglheaders" >&2;}5492 { { echo "$as_me:$LINENO: error: cannot find SDL headers" >&5 5493 echo "$as_me: error: cannot find SDL headers" >&2;} 5275 5494 { (exit 1); exit 1; }; } 5276 5495 fi … … 5279 5498 5280 5499 5281 echo "$as_me:$LINENO: checking for gluProject in -lGLU" >&5 5282 echo $ECHO_N "checking for gluProject in -lGLU... $ECHO_C" >&6 5283 if test "${ac_cv_lib_GLU_gluProject+set}" = set; then 5500 # checking for SDL-lib 5501 echo "$as_me:$LINENO: checking for main in -lSDL" >&5 5502 echo $ECHO_N "checking for main in -lSDL... $ECHO_C" >&6 5503 if test "${ac_cv_lib_SDL_main+set}" = set; then 5284 5504 echo $ECHO_N "(cached) $ECHO_C" >&6 5285 5505 else 5286 5506 ac_check_lib_save_LIBS=$LIBS 5287 LIBS="-l GLU$LIBS"5507 LIBS="-lSDL $LIBS" 5288 5508 cat >conftest.$ac_ext <<_ACEOF 5289 5509 /* confdefs.h. */ … … 5293 5513 /* end confdefs.h. */ 5294 5514 5295 /* Override any gcc2 internal prototype to avoid an error. */ 5296 #ifdef __cplusplus 5297 extern "C" 5298 #endif 5299 /* We use char because int might match the return type of a gcc2 5300 builtin and then its argument prototype would still apply. */ 5301 char gluProject (); 5515 5302 5516 int 5303 5517 main () 5304 5518 { 5305 gluProject();5519 main (); 5306 5520 ; 5307 5521 return 0; … … 5330 5544 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5331 5545 (exit $ac_status); }; }; then 5332 ac_cv_lib_ GLU_gluProject=yes5546 ac_cv_lib_SDL_main=yes 5333 5547 else 5334 5548 echo "$as_me: failed program was:" >&5 5335 5549 sed 's/^/| /' conftest.$ac_ext >&5 5336 5550 5337 ac_cv_lib_ GLU_gluProject=no5551 ac_cv_lib_SDL_main=no 5338 5552 fi 5339 5553 rm -f conftest.err conftest.$ac_objext \ … … 5341 5555 LIBS=$ac_check_lib_save_LIBS 5342 5556 fi 5343 echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluProject" >&5 5344 echo "${ECHO_T}$ac_cv_lib_GLU_gluProject" >&6 5345 if test $ac_cv_lib_GLU_gluProject = yes; then 5346 FOUND_GLU=yes 5347 fi 5348 5349 if test "$FOUND_GLU" = "yes" ; then 5350 LIBS="$LIBS -lGLU" 5351 else 5352 echo "------------------" 5353 echo "GLU library not found." 5354 echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org" 5355 echo "------------------" 5356 exit -1 5357 fi 5358 5359 # checking for SDL-headers 5360 5361 for ac_header in SDL/SDL.h 5557 echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_main" >&5 5558 echo "${ECHO_T}$ac_cv_lib_SDL_main" >&6 5559 if test $ac_cv_lib_SDL_main = yes; then 5560 FOUND_SDL=yes 5561 fi 5562 5563 if test "$FOUND_SDL" = "yes" ; then 5564 LIBS="$LIBS -lSDL" 5565 else 5566 echo "------------------" 5567 echo "SDL library not found." 5568 echo "please install the SDL library, which can be found at http://www.libsdl.org" 5569 echo "------------------" 5570 exit -1 5571 fi 5572 5573 5574 ## checking for SDL 5575 # SDL_VERSION=1.2.7 5576 # AM_PATH_SDL($SDL_VERSION, 5577 # :, 5578 # AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) 5579 # ) 5580 # CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" 5581 # LIBS="$LIBS $SDL_LIBS" 5582 ;; 5583 5584 ### OS X ### 5585 *darwin*) 5586 echo "OS X detected" 5587 5588 osX="yes" 5589 5590 CPPFLAGS="-I/sw/include $CPPFLAGS" 5591 # checking gl header 5592 5593 for ac_header in OpenGL/gl.h 5362 5594 do 5363 5595 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 5505 5737 5506 5738 else 5507 { { echo "$as_me:$LINENO: error: cannot find SDLheaders" >&55508 echo "$as_me: error: cannot find SDLheaders" >&2;}5739 { { echo "$as_me:$LINENO: error: cannot find opengl headers" >&5 5740 echo "$as_me: error: cannot find opengl headers" >&2;} 5509 5741 { (exit 1); exit 1; }; } 5510 5742 fi … … 5512 5744 done 5513 5745 5514 5515 echo "$as_me:$LINENO: checking for main in -lSDL" >&5 5516 echo $ECHO_N "checking for main in -lSDL... $ECHO_C" >&6 5517 if test "${ac_cv_lib_SDL_main+set}" = set; then 5518 echo $ECHO_N "(cached) $ECHO_C" >&6 5519 else 5520 ac_check_lib_save_LIBS=$LIBS 5521 LIBS="-lSDL $LIBS" 5522 cat >conftest.$ac_ext <<_ACEOF 5523 /* confdefs.h. */ 5524 _ACEOF 5525 cat confdefs.h >>conftest.$ac_ext 5526 cat >>conftest.$ac_ext <<_ACEOF 5527 /* end confdefs.h. */ 5528 5529 5530 int 5531 main () 5532 { 5533 main (); 5534 ; 5535 return 0; 5536 } 5537 _ACEOF 5538 rm -f conftest.$ac_objext conftest$ac_exeext 5539 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 5540 (eval $ac_link) 2>conftest.er1 5541 ac_status=$? 5542 grep -v '^ *+' conftest.er1 >conftest.err 5543 rm -f conftest.er1 5544 cat conftest.err >&5 5545 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5546 (exit $ac_status); } && 5547 { ac_try='test -z "$ac_c_werror_flag" 5548 || test ! -s conftest.err' 5549 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5550 (eval $ac_try) 2>&5 5551 ac_status=$? 5552 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5553 (exit $ac_status); }; } && 5554 { ac_try='test -s conftest$ac_exeext' 5555 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5556 (eval $ac_try) 2>&5 5557 ac_status=$? 5558 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5559 (exit $ac_status); }; }; then 5560 ac_cv_lib_SDL_main=yes 5561 else 5562 echo "$as_me: failed program was:" >&5 5563 sed 's/^/| /' conftest.$ac_ext >&5 5564 5565 ac_cv_lib_SDL_main=no 5566 fi 5567 rm -f conftest.err conftest.$ac_objext \ 5568 conftest$ac_exeext conftest.$ac_ext 5569 LIBS=$ac_check_lib_save_LIBS 5570 fi 5571 echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_main" >&5 5572 echo "${ECHO_T}$ac_cv_lib_SDL_main" >&6 5573 if test $ac_cv_lib_SDL_main = yes; then 5574 FOUND_SDL=yes 5575 fi 5576 5577 if test "$FOUND_SDL" = "yes" ; then 5578 LIBS="$LIBS -lSDL" 5579 else 5580 echo "------------------" 5581 echo "SDL library not found." 5582 echo "please install the SDL library, which can be found at http://www.libsdl.org" 5583 echo "------------------" 5584 exit -1 5585 fi 5586 5587 # checking for SDL-Mixer-headers 5588 5589 for ac_header in SDL/SDL_mixer.h 5746 # cheking for GLU-header 5747 5748 for ac_header in OpenGL/glu.h 5590 5749 do 5591 5750 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 5733 5892 5734 5893 else 5735 { { echo "$as_me:$LINENO: error: cannot find SDLheaders" >&55736 echo "$as_me: error: cannot find SDLheaders" >&2;}5894 { { echo "$as_me:$LINENO: error: cannot find opengl headers" >&5 5895 echo "$as_me: error: cannot find opengl headers" >&2;} 5737 5896 { (exit 1); exit 1; }; } 5738 5897 fi … … 5741 5900 5742 5901 5743 5744 #checking for libSDL_mixer 5745 echo "$as_me:$LINENO: checking for main in -lSDL_mixer" >&5 5746 echo $ECHO_N "checking for main in -lSDL_mixer... $ECHO_C" >&6 5747 if test "${ac_cv_lib_SDL_mixer_main+set}" = set; then 5748 echo $ECHO_N "(cached) $ECHO_C" >&6 5749 else 5750 ac_check_lib_save_LIBS=$LIBS 5751 LIBS="-lSDL_mixer $LIBS" 5752 cat >conftest.$ac_ext <<_ACEOF 5753 /* confdefs.h. */ 5754 _ACEOF 5755 cat confdefs.h >>conftest.$ac_ext 5756 cat >>conftest.$ac_ext <<_ACEOF 5757 /* end confdefs.h. */ 5758 5759 5760 int 5761 main () 5762 { 5763 main (); 5764 ; 5765 return 0; 5766 } 5767 _ACEOF 5768 rm -f conftest.$ac_objext conftest$ac_exeext 5769 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 5770 (eval $ac_link) 2>conftest.er1 5771 ac_status=$? 5772 grep -v '^ *+' conftest.er1 >conftest.err 5773 rm -f conftest.er1 5774 cat conftest.err >&5 5775 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5776 (exit $ac_status); } && 5777 { ac_try='test -z "$ac_c_werror_flag" 5778 || test ! -s conftest.err' 5779 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5780 (eval $ac_try) 2>&5 5781 ac_status=$? 5782 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5783 (exit $ac_status); }; } && 5784 { ac_try='test -s conftest$ac_exeext' 5785 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5786 (eval $ac_try) 2>&5 5787 ac_status=$? 5788 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5789 (exit $ac_status); }; }; then 5790 ac_cv_lib_SDL_mixer_main=yes 5791 else 5792 echo "$as_me: failed program was:" >&5 5793 sed 's/^/| /' conftest.$ac_ext >&5 5794 5795 ac_cv_lib_SDL_mixer_main=no 5796 fi 5797 rm -f conftest.err conftest.$ac_objext \ 5798 conftest$ac_exeext conftest.$ac_ext 5799 LIBS=$ac_check_lib_save_LIBS 5800 fi 5801 echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_mixer_main" >&5 5802 echo "${ECHO_T}$ac_cv_lib_SDL_mixer_main" >&6 5803 if test $ac_cv_lib_SDL_mixer_main = yes; then 5804 FOUND_SDL_mixer=yes 5805 fi 5806 5807 if test "$FOUND_SDL_mixer" = "yes" ; then 5808 LIBS="$LIBS -lSDL_mixer" 5809 else 5810 echo "------------------" 5811 echo "SDL Mixer library not found." 5812 echo "please install the SDL Mixer library, which can be found at http://www.libsdl.org" 5813 echo "------------------" 5814 exit 1 5815 fi 5902 LIBS="$LIBS -framework OpenGL" 5903 5904 # checking for SDL-headers 5905 # AC_CHECK_HEADERS(SDL/SDL.h ,, 5906 # [AC_MSG_ERROR([cannot find SDL headers]) ]) 5907 5908 ## checking for SDL 5909 # SDL_VERSION=1.2.7 5910 # AM_PATH_SDL($SDL_VERSION, 5911 # :, 5912 # AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) 5913 # ) 5914 5915 SDL_CFLAGS=`sdl-config --cflags` 5916 SDL_LIBS=`sdl-config --libs` 5917 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" 5918 LIBS="$LIBS $SDL_LIBS" 5816 5919 5817 5920 ;; 5921 5818 5922 *) 5819 mingw="no"5820 5923 ;; 5821 5924 esac 5822 echo "$as_me:$LINENO: result: $mingw" >&5 5823 echo "${ECHO_T}$mingw" >&6 5824 5825 5826 #### Checking for LIBraries. 5827 5828 # FIXME: Replace `main' with a function in `-lOSMesa': 5829 5830 echo "$as_me:$LINENO: checking for main in -lOSMesa" >&5 5831 echo $ECHO_N "checking for main in -lOSMesa... $ECHO_C" >&6 5832 if test "${ac_cv_lib_OSMesa_main+set}" = set; then 5833 echo $ECHO_N "(cached) $ECHO_C" >&6 5834 else 5835 ac_check_lib_save_LIBS=$LIBS 5836 LIBS="-lOSMesa $LIBS" 5837 cat >conftest.$ac_ext <<_ACEOF 5838 /* confdefs.h. */ 5839 _ACEOF 5840 cat confdefs.h >>conftest.$ac_ext 5841 cat >>conftest.$ac_ext <<_ACEOF 5842 /* end confdefs.h. */ 5843 5844 5845 int 5846 main () 5847 { 5848 main (); 5849 ; 5850 return 0; 5851 } 5852 _ACEOF 5853 rm -f conftest.$ac_objext conftest$ac_exeext 5854 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 5855 (eval $ac_link) 2>conftest.er1 5856 ac_status=$? 5857 grep -v '^ *+' conftest.er1 >conftest.err 5858 rm -f conftest.er1 5859 cat conftest.err >&5 5860 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5861 (exit $ac_status); } && 5862 { ac_try='test -z "$ac_c_werror_flag" 5863 || test ! -s conftest.err' 5864 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5865 (eval $ac_try) 2>&5 5866 ac_status=$? 5867 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5868 (exit $ac_status); }; } && 5869 { ac_try='test -s conftest$ac_exeext' 5870 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5871 (eval $ac_try) 2>&5 5872 ac_status=$? 5873 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5874 (exit $ac_status); }; }; then 5875 ac_cv_lib_OSMesa_main=yes 5876 else 5877 echo "$as_me: failed program was:" >&5 5878 sed 's/^/| /' conftest.$ac_ext >&5 5879 5880 ac_cv_lib_OSMesa_main=no 5881 fi 5882 rm -f conftest.err conftest.$ac_objext \ 5883 conftest$ac_exeext conftest.$ac_ext 5884 LIBS=$ac_check_lib_save_LIBS 5885 fi 5886 echo "$as_me:$LINENO: result: $ac_cv_lib_OSMesa_main" >&5 5887 echo "${ECHO_T}$ac_cv_lib_OSMesa_main" >&6 5888 if test $ac_cv_lib_OSMesa_main = yes; then 5889 cat >>confdefs.h <<_ACEOF 5890 #define HAVE_LIBOSMESA 1 5891 _ACEOF 5892 5893 LIBS="-lOSMesa $LIBS" 5894 5895 fi 5896 5897 # FIXME: Replace `main' with a function in `-lX11': 5898 5899 echo "$as_me:$LINENO: checking for main in -lX11" >&5 5900 echo $ECHO_N "checking for main in -lX11... $ECHO_C" >&6 5901 if test "${ac_cv_lib_X11_main+set}" = set; then 5902 echo $ECHO_N "(cached) $ECHO_C" >&6 5903 else 5904 ac_check_lib_save_LIBS=$LIBS 5905 LIBS="-lX11 $LIBS" 5906 cat >conftest.$ac_ext <<_ACEOF 5907 /* confdefs.h. */ 5908 _ACEOF 5909 cat confdefs.h >>conftest.$ac_ext 5910 cat >>conftest.$ac_ext <<_ACEOF 5911 /* end confdefs.h. */ 5912 5913 5914 int 5915 main () 5916 { 5917 main (); 5918 ; 5919 return 0; 5920 } 5921 _ACEOF 5922 rm -f conftest.$ac_objext conftest$ac_exeext 5923 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 5924 (eval $ac_link) 2>conftest.er1 5925 ac_status=$? 5926 grep -v '^ *+' conftest.er1 >conftest.err 5927 rm -f conftest.er1 5928 cat conftest.err >&5 5929 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5930 (exit $ac_status); } && 5931 { ac_try='test -z "$ac_c_werror_flag" 5932 || test ! -s conftest.err' 5933 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5934 (eval $ac_try) 2>&5 5935 ac_status=$? 5936 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5937 (exit $ac_status); }; } && 5938 { ac_try='test -s conftest$ac_exeext' 5939 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5940 (eval $ac_try) 2>&5 5941 ac_status=$? 5942 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5943 (exit $ac_status); }; }; then 5944 ac_cv_lib_X11_main=yes 5945 else 5946 echo "$as_me: failed program was:" >&5 5947 sed 's/^/| /' conftest.$ac_ext >&5 5948 5949 ac_cv_lib_X11_main=no 5950 fi 5951 rm -f conftest.err conftest.$ac_objext \ 5952 conftest$ac_exeext conftest.$ac_ext 5953 LIBS=$ac_check_lib_save_LIBS 5954 fi 5955 echo "$as_me:$LINENO: result: $ac_cv_lib_X11_main" >&5 5956 echo "${ECHO_T}$ac_cv_lib_X11_main" >&6 5957 if test $ac_cv_lib_X11_main = yes; then 5958 cat >>confdefs.h <<_ACEOF 5959 #define HAVE_LIBX11 1 5960 _ACEOF 5961 5962 LIBS="-lX11 $LIBS" 5963 5964 fi 5965 5966 # FIXME: Replace `main' with a function in `-lXt': 5967 5968 echo "$as_me:$LINENO: checking for main in -lXt" >&5 5969 echo $ECHO_N "checking for main in -lXt... $ECHO_C" >&6 5970 if test "${ac_cv_lib_Xt_main+set}" = set; then 5971 echo $ECHO_N "(cached) $ECHO_C" >&6 5972 else 5973 ac_check_lib_save_LIBS=$LIBS 5974 LIBS="-lXt $LIBS" 5975 cat >conftest.$ac_ext <<_ACEOF 5976 /* confdefs.h. */ 5977 _ACEOF 5978 cat confdefs.h >>conftest.$ac_ext 5979 cat >>conftest.$ac_ext <<_ACEOF 5980 /* end confdefs.h. */ 5981 5982 5983 int 5984 main () 5985 { 5986 main (); 5987 ; 5988 return 0; 5989 } 5990 _ACEOF 5991 rm -f conftest.$ac_objext conftest$ac_exeext 5992 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 5993 (eval $ac_link) 2>conftest.er1 5994 ac_status=$? 5995 grep -v '^ *+' conftest.er1 >conftest.err 5996 rm -f conftest.er1 5997 cat conftest.err >&5 5998 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5999 (exit $ac_status); } && 6000 { ac_try='test -z "$ac_c_werror_flag" 6001 || test ! -s conftest.err' 6002 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6003 (eval $ac_try) 2>&5 6004 ac_status=$? 6005 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6006 (exit $ac_status); }; } && 6007 { ac_try='test -s conftest$ac_exeext' 6008 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6009 (eval $ac_try) 2>&5 6010 ac_status=$? 6011 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6012 (exit $ac_status); }; }; then 6013 ac_cv_lib_Xt_main=yes 6014 else 6015 echo "$as_me: failed program was:" >&5 6016 sed 's/^/| /' conftest.$ac_ext >&5 6017 6018 ac_cv_lib_Xt_main=no 6019 fi 6020 rm -f conftest.err conftest.$ac_objext \ 6021 conftest$ac_exeext conftest.$ac_ext 6022 LIBS=$ac_check_lib_save_LIBS 6023 fi 6024 echo "$as_me:$LINENO: result: $ac_cv_lib_Xt_main" >&5 6025 echo "${ECHO_T}$ac_cv_lib_Xt_main" >&6 6026 if test $ac_cv_lib_Xt_main = yes; then 6027 cat >>confdefs.h <<_ACEOF 6028 #define HAVE_LIBXT 1 6029 _ACEOF 6030 6031 LIBS="-lXt $LIBS" 6032 6033 fi 6034 6035 6036 6037 #checking for pthread libs 6038 echo "$as_me:$LINENO: checking for main in -lpthread" >&5 6039 echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6 6040 if test "${ac_cv_lib_pthread_main+set}" = set; then 6041 echo $ECHO_N "(cached) $ECHO_C" >&6 6042 else 6043 ac_check_lib_save_LIBS=$LIBS 6044 LIBS="-lpthread $LIBS" 6045 cat >conftest.$ac_ext <<_ACEOF 6046 /* confdefs.h. */ 6047 _ACEOF 6048 cat confdefs.h >>conftest.$ac_ext 6049 cat >>conftest.$ac_ext <<_ACEOF 6050 /* end confdefs.h. */ 6051 6052 6053 int 6054 main () 6055 { 6056 main (); 6057 ; 6058 return 0; 6059 } 6060 _ACEOF 6061 rm -f conftest.$ac_objext conftest$ac_exeext 6062 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6063 (eval $ac_link) 2>conftest.er1 6064 ac_status=$? 6065 grep -v '^ *+' conftest.er1 >conftest.err 6066 rm -f conftest.er1 6067 cat conftest.err >&5 6068 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6069 (exit $ac_status); } && 6070 { ac_try='test -z "$ac_c_werror_flag" 6071 || test ! -s conftest.err' 6072 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6073 (eval $ac_try) 2>&5 6074 ac_status=$? 6075 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6076 (exit $ac_status); }; } && 6077 { ac_try='test -s conftest$ac_exeext' 6078 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6079 (eval $ac_try) 2>&5 6080 ac_status=$? 6081 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6082 (exit $ac_status); }; }; then 6083 ac_cv_lib_pthread_main=yes 6084 else 6085 echo "$as_me: failed program was:" >&5 6086 sed 's/^/| /' conftest.$ac_ext >&5 6087 6088 ac_cv_lib_pthread_main=no 6089 fi 6090 rm -f conftest.err conftest.$ac_objext \ 6091 conftest$ac_exeext conftest.$ac_ext 6092 LIBS=$ac_check_lib_save_LIBS 6093 fi 6094 echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5 6095 echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6 6096 if test $ac_cv_lib_pthread_main = yes; then 6097 FOUND_pthread=yes 6098 fi 6099 6100 if test "$FOUND_pthread" = "yes" ; then 6101 LIBS="$LIBS -lpthread" 6102 fi 6103 6104 6105 6106 6107 # FIXME: Replace `main' with a function in `-lm': 6108 6109 echo "$as_me:$LINENO: checking for main in -lm" >&5 6110 echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6 6111 if test "${ac_cv_lib_m_main+set}" = set; then 6112 echo $ECHO_N "(cached) $ECHO_C" >&6 6113 else 6114 ac_check_lib_save_LIBS=$LIBS 6115 LIBS="-lm $LIBS" 6116 cat >conftest.$ac_ext <<_ACEOF 6117 /* confdefs.h. */ 6118 _ACEOF 6119 cat confdefs.h >>conftest.$ac_ext 6120 cat >>conftest.$ac_ext <<_ACEOF 6121 /* end confdefs.h. */ 6122 6123 6124 int 6125 main () 6126 { 6127 main (); 6128 ; 6129 return 0; 6130 } 6131 _ACEOF 6132 rm -f conftest.$ac_objext conftest$ac_exeext 6133 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6134 (eval $ac_link) 2>conftest.er1 6135 ac_status=$? 6136 grep -v '^ *+' conftest.er1 >conftest.err 6137 rm -f conftest.er1 6138 cat conftest.err >&5 6139 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6140 (exit $ac_status); } && 6141 { ac_try='test -z "$ac_c_werror_flag" 6142 || test ! -s conftest.err' 6143 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6144 (eval $ac_try) 2>&5 6145 ac_status=$? 6146 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6147 (exit $ac_status); }; } && 6148 { ac_try='test -s conftest$ac_exeext' 6149 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6150 (eval $ac_try) 2>&5 6151 ac_status=$? 6152 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6153 (exit $ac_status); }; }; then 6154 ac_cv_lib_m_main=yes 6155 else 6156 echo "$as_me: failed program was:" >&5 6157 sed 's/^/| /' conftest.$ac_ext >&5 6158 6159 ac_cv_lib_m_main=no 6160 fi 6161 rm -f conftest.err conftest.$ac_objext \ 6162 conftest$ac_exeext conftest.$ac_ext 6163 LIBS=$ac_check_lib_save_LIBS 6164 fi 6165 echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5 6166 echo "${ECHO_T}$ac_cv_lib_m_main" >&6 6167 if test $ac_cv_lib_m_main = yes; then 6168 cat >>confdefs.h <<_ACEOF 6169 #define HAVE_LIBM 1 6170 _ACEOF 6171 6172 LIBS="-lm $LIBS" 6173 6174 fi 6175 6176 6177 LIBS="$LIBS `pkg-config --libs gtk+-2.0`" 6178 6179 6180 # Checks for header files. 6181 echo "$as_me:$LINENO: checking for ANSI C header files" >&5 6182 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 6183 if test "${ac_cv_header_stdc+set}" = set; then 6184 echo $ECHO_N "(cached) $ECHO_C" >&6 6185 else 6186 cat >conftest.$ac_ext <<_ACEOF 6187 /* confdefs.h. */ 6188 _ACEOF 6189 cat confdefs.h >>conftest.$ac_ext 6190 cat >>conftest.$ac_ext <<_ACEOF 6191 /* end confdefs.h. */ 6192 #include <stdlib.h> 6193 #include <stdarg.h> 6194 #include <string.h> 6195 #include <float.h> 6196 6197 int 6198 main () 6199 { 6200 6201 ; 6202 return 0; 6203 } 6204 _ACEOF 6205 rm -f conftest.$ac_objext 6206 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 6207 (eval $ac_compile) 2>conftest.er1 6208 ac_status=$? 6209 grep -v '^ *+' conftest.er1 >conftest.err 6210 rm -f conftest.er1 6211 cat conftest.err >&5 6212 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6213 (exit $ac_status); } && 6214 { ac_try='test -z "$ac_c_werror_flag" 6215 || test ! -s conftest.err' 6216 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6217 (eval $ac_try) 2>&5 6218 ac_status=$? 6219 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6220 (exit $ac_status); }; } && 6221 { ac_try='test -s conftest.$ac_objext' 6222 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6223 (eval $ac_try) 2>&5 6224 ac_status=$? 6225 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6226 (exit $ac_status); }; }; then 6227 ac_cv_header_stdc=yes 6228 else 6229 echo "$as_me: failed program was:" >&5 6230 sed 's/^/| /' conftest.$ac_ext >&5 6231 6232 ac_cv_header_stdc=no 6233 fi 6234 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 6235 6236 if test $ac_cv_header_stdc = yes; then 6237 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 6238 cat >conftest.$ac_ext <<_ACEOF 6239 /* confdefs.h. */ 6240 _ACEOF 6241 cat confdefs.h >>conftest.$ac_ext 6242 cat >>conftest.$ac_ext <<_ACEOF 6243 /* end confdefs.h. */ 6244 #include <string.h> 6245 6246 _ACEOF 6247 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 6248 $EGREP "memchr" >/dev/null 2>&1; then 6249 : 6250 else 6251 ac_cv_header_stdc=no 6252 fi 6253 rm -f conftest* 6254 6255 fi 6256 6257 if test $ac_cv_header_stdc = yes; then 6258 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 6259 cat >conftest.$ac_ext <<_ACEOF 6260 /* confdefs.h. */ 6261 _ACEOF 6262 cat confdefs.h >>conftest.$ac_ext 6263 cat >>conftest.$ac_ext <<_ACEOF 6264 /* end confdefs.h. */ 6265 #include <stdlib.h> 6266 6267 _ACEOF 6268 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 6269 $EGREP "free" >/dev/null 2>&1; then 6270 : 6271 else 6272 ac_cv_header_stdc=no 6273 fi 6274 rm -f conftest* 6275 6276 fi 6277 6278 if test $ac_cv_header_stdc = yes; then 6279 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 6280 if test "$cross_compiling" = yes; then 6281 : 6282 else 6283 cat >conftest.$ac_ext <<_ACEOF 6284 /* confdefs.h. */ 6285 _ACEOF 6286 cat confdefs.h >>conftest.$ac_ext 6287 cat >>conftest.$ac_ext <<_ACEOF 6288 /* end confdefs.h. */ 6289 #include <ctype.h> 6290 #if ((' ' & 0x0FF) == 0x020) 6291 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 6292 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 6293 #else 6294 # define ISLOWER(c) \ 6295 (('a' <= (c) && (c) <= 'i') \ 6296 || ('j' <= (c) && (c) <= 'r') \ 6297 || ('s' <= (c) && (c) <= 'z')) 6298 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) 6299 #endif 6300 6301 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 6302 int 6303 main () 6304 { 6305 int i; 6306 for (i = 0; i < 256; i++) 6307 if (XOR (islower (i), ISLOWER (i)) 6308 || toupper (i) != TOUPPER (i)) 6309 exit(2); 6310 exit (0); 6311 } 6312 _ACEOF 6313 rm -f conftest$ac_exeext 6314 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6315 (eval $ac_link) 2>&5 6316 ac_status=$? 6317 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6318 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 6319 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6320 (eval $ac_try) 2>&5 6321 ac_status=$? 6322 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6323 (exit $ac_status); }; }; then 6324 : 6325 else 6326 echo "$as_me: program exited with status $ac_status" >&5 6327 echo "$as_me: failed program was:" >&5 6328 sed 's/^/| /' conftest.$ac_ext >&5 6329 6330 ( exit $ac_status ) 6331 ac_cv_header_stdc=no 6332 fi 6333 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 6334 fi 6335 fi 6336 fi 6337 echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 6338 echo "${ECHO_T}$ac_cv_header_stdc" >&6 6339 if test $ac_cv_header_stdc = yes; then 6340 6341 cat >>confdefs.h <<\_ACEOF 6342 #define STDC_HEADERS 1 6343 _ACEOF 6344 6345 fi 6346 6347 6348 6349 for ac_header in stdlib.h string.h 5925 5926 5927 5928 5929 ## check for SDL_mixer 5930 # checking for SDL-Mixer-headers 5931 5932 for ac_header in SDL/SDL_mixer.h 6350 5933 do 6351 5934 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 6492 6075 _ACEOF 6493 6076 6077 else 6078 { { echo "$as_me:$LINENO: error: cannot find SDL headers" >&5 6079 echo "$as_me: error: cannot find SDL headers" >&2;} 6080 { (exit 1); exit 1; }; } 6494 6081 fi 6495 6082 … … 6497 6084 6498 6085 6499 # Checks for typedefs, structures, and compiler characteristics. 6500 echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 6501 echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6 6502 if test "${ac_cv_header_stdbool_h+set}" = set; then 6086 6087 #checking for libSDL_mixer 6088 echo "$as_me:$LINENO: checking for main in -lSDL_mixer" >&5 6089 echo $ECHO_N "checking for main in -lSDL_mixer... $ECHO_C" >&6 6090 if test "${ac_cv_lib_SDL_mixer_main+set}" = set; then 6503 6091 echo $ECHO_N "(cached) $ECHO_C" >&6 6504 6092 else 6505 cat >conftest.$ac_ext <<_ACEOF 6093 ac_check_lib_save_LIBS=$LIBS 6094 LIBS="-lSDL_mixer $LIBS" 6095 cat >conftest.$ac_ext <<_ACEOF 6506 6096 /* confdefs.h. */ 6507 6097 _ACEOF … … 6510 6100 /* end confdefs.h. */ 6511 6101 6512 #include <stdbool.h>6513 #ifndef bool6514 # error bool is not defined6515 #endif6516 #ifndef false6517 # error false is not defined6518 #endif6519 #if false6520 # error false is not 06521 #endif6522 #ifndef true6523 # error true is not defined6524 #endif6525 #if true != 16526 # error true is not 16527 #endif6528 #ifndef __bool_true_false_are_defined6529 # error __bool_true_false_are_defined is not defined6530 #endif6531 6532 struct s { _Bool s: 1; _Bool t; } s;6533 6534 char a[true == 1 ? 1 : -1];6535 char b[false == 0 ? 1 : -1];6536 char c[__bool_true_false_are_defined == 1 ? 1 : -1];6537 char d[(bool) -0.5 == true ? 1 : -1];6538 bool e = &s;6539 char f[(_Bool) -0.0 == false ? 1 : -1];6540 char g[true];6541 char h[sizeof (_Bool)];6542 char i[sizeof s.t];6543 6102 6544 6103 int 6545 6104 main () 6546 6105 { 6547 return !a + !b + !c + !d + !e + !f + !g + !h + !i;6106 main (); 6548 6107 ; 6549 6108 return 0; 6550 6109 } 6551 6110 _ACEOF 6552 rm -f conftest.$ac_objext 6553 if { (eval echo "$as_me:$LINENO: \"$ac_ compile\"") >&56554 (eval $ac_ compile) 2>conftest.er16111 rm -f conftest.$ac_objext conftest$ac_exeext 6112 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6113 (eval $ac_link) 2>conftest.er1 6555 6114 ac_status=$? 6556 6115 grep -v '^ *+' conftest.er1 >conftest.err … … 6566 6125 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6567 6126 (exit $ac_status); }; } && 6568 { ac_try='test -s conftest .$ac_objext'6127 { ac_try='test -s conftest$ac_exeext' 6569 6128 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6570 6129 (eval $ac_try) 2>&5 … … 6572 6131 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6573 6132 (exit $ac_status); }; }; then 6574 ac_cv_ header_stdbool_h=yes6133 ac_cv_lib_SDL_mixer_main=yes 6575 6134 else 6576 6135 echo "$as_me: failed program was:" >&5 6577 6136 sed 's/^/| /' conftest.$ac_ext >&5 6578 6137 6579 ac_cv_header_stdbool_h=no 6580 fi 6581 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 6582 fi 6583 echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 6584 echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6 6585 echo "$as_me:$LINENO: checking for _Bool" >&5 6586 echo $ECHO_N "checking for _Bool... $ECHO_C" >&6 6587 if test "${ac_cv_type__Bool+set}" = set; then 6588 echo $ECHO_N "(cached) $ECHO_C" >&6 6589 else 6590 cat >conftest.$ac_ext <<_ACEOF 6591 /* confdefs.h. */ 6592 _ACEOF 6593 cat confdefs.h >>conftest.$ac_ext 6594 cat >>conftest.$ac_ext <<_ACEOF 6595 /* end confdefs.h. */ 6596 $ac_includes_default 6597 int 6598 main () 6599 { 6600 if ((_Bool *) 0) 6601 return 0; 6602 if (sizeof (_Bool)) 6603 return 0; 6604 ; 6605 return 0; 6606 } 6607 _ACEOF 6608 rm -f conftest.$ac_objext 6609 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 6610 (eval $ac_compile) 2>conftest.er1 6611 ac_status=$? 6612 grep -v '^ *+' conftest.er1 >conftest.err 6613 rm -f conftest.er1 6614 cat conftest.err >&5 6615 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6616 (exit $ac_status); } && 6617 { ac_try='test -z "$ac_c_werror_flag" 6618 || test ! -s conftest.err' 6619 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6620 (eval $ac_try) 2>&5 6621 ac_status=$? 6622 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6623 (exit $ac_status); }; } && 6624 { ac_try='test -s conftest.$ac_objext' 6625 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6626 (eval $ac_try) 2>&5 6627 ac_status=$? 6628 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6629 (exit $ac_status); }; }; then 6630 ac_cv_type__Bool=yes 6631 else 6632 echo "$as_me: failed program was:" >&5 6633 sed 's/^/| /' conftest.$ac_ext >&5 6634 6635 ac_cv_type__Bool=no 6636 fi 6637 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 6638 fi 6639 echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 6640 echo "${ECHO_T}$ac_cv_type__Bool" >&6 6641 if test $ac_cv_type__Bool = yes; then 6642 6643 cat >>confdefs.h <<_ACEOF 6644 #define HAVE__BOOL 1 6645 _ACEOF 6646 6647 6648 fi 6649 6650 if test $ac_cv_header_stdbool_h = yes; then 6651 6652 cat >>confdefs.h <<\_ACEOF 6653 #define HAVE_STDBOOL_H 1 6654 _ACEOF 6655 6656 fi 6657 6658 6659 # Checks for library functions. 6660 6661 for ac_header in stdlib.h 6138 ac_cv_lib_SDL_mixer_main=no 6139 fi 6140 rm -f conftest.err conftest.$ac_objext \ 6141 conftest$ac_exeext conftest.$ac_ext 6142 LIBS=$ac_check_lib_save_LIBS 6143 fi 6144 echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_mixer_main" >&5 6145 echo "${ECHO_T}$ac_cv_lib_SDL_mixer_main" >&6 6146 if test $ac_cv_lib_SDL_mixer_main = yes; then 6147 FOUND_SDL_mixer=yes 6148 fi 6149 6150 if test "$FOUND_SDL_mixer" = "yes" ; then 6151 LIBS="$LIBS -lSDL_mixer" 6152 else 6153 echo "------------------" 6154 echo "SDL Mixer library not found." 6155 echo "please install the SDL Mixer library, which can be found at http://www.libsdl.org" 6156 echo "------------------" 6157 exit 1 6158 fi 6159 6160 6161 ## check for SDL_Image 6162 if test "$def_sdl_image" = "yes"; then 6163 # checking for SDL_image-headers 6164 6165 for ac_header in SDL/SDL_image.h 6662 6166 do 6663 6167 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 6804 6308 _ACEOF 6805 6309 6310 else 6311 echo "sdl_image not found. falling back to other options"; def_sdl_image=no 6312 fi 6313 6314 done 6315 6316 fi 6317 if test "$def_sdl_image" = "yes"; then 6318 # checking for SDL_image-lib 6319 echo "$as_me:$LINENO: checking for main in -lSDL_image" >&5 6320 echo $ECHO_N "checking for main in -lSDL_image... $ECHO_C" >&6 6321 if test "${ac_cv_lib_SDL_image_main+set}" = set; then 6322 echo $ECHO_N "(cached) $ECHO_C" >&6 6323 else 6324 ac_check_lib_save_LIBS=$LIBS 6325 LIBS="-lSDL_image $LIBS" 6326 cat >conftest.$ac_ext <<_ACEOF 6327 /* confdefs.h. */ 6328 _ACEOF 6329 cat confdefs.h >>conftest.$ac_ext 6330 cat >>conftest.$ac_ext <<_ACEOF 6331 /* end confdefs.h. */ 6332 6333 6334 int 6335 main () 6336 { 6337 main (); 6338 ; 6339 return 0; 6340 } 6341 _ACEOF 6342 rm -f conftest.$ac_objext conftest$ac_exeext 6343 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6344 (eval $ac_link) 2>conftest.er1 6345 ac_status=$? 6346 grep -v '^ *+' conftest.er1 >conftest.err 6347 rm -f conftest.er1 6348 cat conftest.err >&5 6349 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6350 (exit $ac_status); } && 6351 { ac_try='test -z "$ac_c_werror_flag" 6352 || test ! -s conftest.err' 6353 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6354 (eval $ac_try) 2>&5 6355 ac_status=$? 6356 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6357 (exit $ac_status); }; } && 6358 { ac_try='test -s conftest$ac_exeext' 6359 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6360 (eval $ac_try) 2>&5 6361 ac_status=$? 6362 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6363 (exit $ac_status); }; }; then 6364 ac_cv_lib_SDL_image_main=yes 6365 else 6366 echo "$as_me: failed program was:" >&5 6367 sed 's/^/| /' conftest.$ac_ext >&5 6368 6369 ac_cv_lib_SDL_image_main=no 6370 fi 6371 rm -f conftest.err conftest.$ac_objext \ 6372 conftest$ac_exeext conftest.$ac_ext 6373 LIBS=$ac_check_lib_save_LIBS 6374 fi 6375 echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_main" >&5 6376 echo "${ECHO_T}$ac_cv_lib_SDL_image_main" >&6 6377 if test $ac_cv_lib_SDL_image_main = yes; then 6378 FOUND_SDL_image=yes 6379 fi 6380 6381 if test "$FOUND_SDL_image" = "yes" ; then 6382 LIBS="$LIBS -lSDL_image" 6383 else 6384 echo "------------------" 6385 echo "SDL_image library not found." 6386 echo "please install the SDL_image library, which can be found at http://www.libsdl.org/projects/SDL_image/" 6387 echo "------------------" 6388 exit -1 6389 fi 6390 fi 6391 6392 6393 if test "$def_sdl_image" = "no"; then 6394 ## checking for libjpeg 6395 6396 for ac_header in jpeglib.h 6397 do 6398 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 6399 if eval "test \"\${$as_ac_Header+set}\" = set"; then 6400 echo "$as_me:$LINENO: checking for $ac_header" >&5 6401 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 6402 if eval "test \"\${$as_ac_Header+set}\" = set"; then 6403 echo $ECHO_N "(cached) $ECHO_C" >&6 6404 fi 6405 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 6406 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 6407 else 6408 # Is the header compilable? 6409 echo "$as_me:$LINENO: checking $ac_header usability" >&5 6410 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 6411 cat >conftest.$ac_ext <<_ACEOF 6412 /* confdefs.h. */ 6413 _ACEOF 6414 cat confdefs.h >>conftest.$ac_ext 6415 cat >>conftest.$ac_ext <<_ACEOF 6416 /* end confdefs.h. */ 6417 $ac_includes_default 6418 #include <$ac_header> 6419 _ACEOF 6420 rm -f conftest.$ac_objext 6421 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 6422 (eval $ac_compile) 2>conftest.er1 6423 ac_status=$? 6424 grep -v '^ *+' conftest.er1 >conftest.err 6425 rm -f conftest.er1 6426 cat conftest.err >&5 6427 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6428 (exit $ac_status); } && 6429 { ac_try='test -z "$ac_c_werror_flag" 6430 || test ! -s conftest.err' 6431 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6432 (eval $ac_try) 2>&5 6433 ac_status=$? 6434 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6435 (exit $ac_status); }; } && 6436 { ac_try='test -s conftest.$ac_objext' 6437 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6438 (eval $ac_try) 2>&5 6439 ac_status=$? 6440 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6441 (exit $ac_status); }; }; then 6442 ac_header_compiler=yes 6443 else 6444 echo "$as_me: failed program was:" >&5 6445 sed 's/^/| /' conftest.$ac_ext >&5 6446 6447 ac_header_compiler=no 6448 fi 6449 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 6450 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 6451 echo "${ECHO_T}$ac_header_compiler" >&6 6452 6453 # Is the header present? 6454 echo "$as_me:$LINENO: checking $ac_header presence" >&5 6455 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 6456 cat >conftest.$ac_ext <<_ACEOF 6457 /* confdefs.h. */ 6458 _ACEOF 6459 cat confdefs.h >>conftest.$ac_ext 6460 cat >>conftest.$ac_ext <<_ACEOF 6461 /* end confdefs.h. */ 6462 #include <$ac_header> 6463 _ACEOF 6464 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 6465 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 6466 ac_status=$? 6467 grep -v '^ *+' conftest.er1 >conftest.err 6468 rm -f conftest.er1 6469 cat conftest.err >&5 6470 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6471 (exit $ac_status); } >/dev/null; then 6472 if test -s conftest.err; then 6473 ac_cpp_err=$ac_c_preproc_warn_flag 6474 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 6475 else 6476 ac_cpp_err= 6477 fi 6478 else 6479 ac_cpp_err=yes 6480 fi 6481 if test -z "$ac_cpp_err"; then 6482 ac_header_preproc=yes 6483 else 6484 echo "$as_me: failed program was:" >&5 6485 sed 's/^/| /' conftest.$ac_ext >&5 6486 6487 ac_header_preproc=no 6488 fi 6489 rm -f conftest.err conftest.$ac_ext 6490 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 6491 echo "${ECHO_T}$ac_header_preproc" >&6 6492 6493 # So? What about this header? 6494 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 6495 yes:no: ) 6496 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 6497 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 6498 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 6499 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 6500 ac_header_preproc=yes 6501 ;; 6502 no:yes:* ) 6503 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 6504 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 6505 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 6506 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 6507 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 6508 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 6509 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 6510 echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 6511 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 6512 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 6513 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 6514 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 6515 ( 6516 cat <<\_ASBOX 6517 ## ------------------------------------------- ## 6518 ## Report this to orxonox-dev@mail.datacore.ch ## 6519 ## ------------------------------------------- ## 6520 _ASBOX 6521 ) | 6522 sed "s/^/$as_me: WARNING: /" >&2 6523 ;; 6524 esac 6525 echo "$as_me:$LINENO: checking for $ac_header" >&5 6526 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 6527 if eval "test \"\${$as_ac_Header+set}\" = set"; then 6528 echo $ECHO_N "(cached) $ECHO_C" >&6 6529 else 6530 eval "$as_ac_Header=\$ac_header_preproc" 6531 fi 6532 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 6533 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 6534 6535 fi 6536 if test `eval echo '${'$as_ac_Header'}'` = yes; then 6537 cat >>confdefs.h <<_ACEOF 6538 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 6539 _ACEOF 6540 jpegHeader="yes" 6541 else 6542 jpegHeader="no" 6543 fi 6544 6545 done 6546 6547 if test $jpegHeader = "no"; then 6548 echo " not including jpeg." 6549 else 6550 echo "$as_me:$LINENO: checking for main in -ljpeg" >&5 6551 echo $ECHO_N "checking for main in -ljpeg... $ECHO_C" >&6 6552 if test "${ac_cv_lib_jpeg_main+set}" = set; then 6553 echo $ECHO_N "(cached) $ECHO_C" >&6 6554 else 6555 ac_check_lib_save_LIBS=$LIBS 6556 LIBS="-ljpeg $LIBS" 6557 cat >conftest.$ac_ext <<_ACEOF 6558 /* confdefs.h. */ 6559 _ACEOF 6560 cat confdefs.h >>conftest.$ac_ext 6561 cat >>conftest.$ac_ext <<_ACEOF 6562 /* end confdefs.h. */ 6563 6564 6565 int 6566 main () 6567 { 6568 main (); 6569 ; 6570 return 0; 6571 } 6572 _ACEOF 6573 rm -f conftest.$ac_objext conftest$ac_exeext 6574 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6575 (eval $ac_link) 2>conftest.er1 6576 ac_status=$? 6577 grep -v '^ *+' conftest.er1 >conftest.err 6578 rm -f conftest.er1 6579 cat conftest.err >&5 6580 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6581 (exit $ac_status); } && 6582 { ac_try='test -z "$ac_c_werror_flag" 6583 || test ! -s conftest.err' 6584 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6585 (eval $ac_try) 2>&5 6586 ac_status=$? 6587 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6588 (exit $ac_status); }; } && 6589 { ac_try='test -s conftest$ac_exeext' 6590 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6591 (eval $ac_try) 2>&5 6592 ac_status=$? 6593 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6594 (exit $ac_status); }; }; then 6595 ac_cv_lib_jpeg_main=yes 6596 else 6597 echo "$as_me: failed program was:" >&5 6598 sed 's/^/| /' conftest.$ac_ext >&5 6599 6600 ac_cv_lib_jpeg_main=no 6601 fi 6602 rm -f conftest.err conftest.$ac_objext \ 6603 conftest$ac_exeext conftest.$ac_ext 6604 LIBS=$ac_check_lib_save_LIBS 6605 fi 6606 echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_main" >&5 6607 echo "${ECHO_T}$ac_cv_lib_jpeg_main" >&6 6608 if test $ac_cv_lib_jpeg_main = yes; then 6609 FOUND_jpeg=yes 6610 fi 6611 6612 if test "$FOUND_jpeg" = "yes" ; then 6613 LIBS="$LIBS -ljpeg" 6614 else 6615 echo "------------------" 6616 echo "jpeg library not found." 6617 echo "please install the jpeg library from the Independent JPEG Group, which can be found at http://www.ijg.org" 6618 echo "------------------" 6619 exit -1 6620 fi 6621 fi 6622 6623 ## checking for libpng 6624 6625 for ac_header in png.h 6626 do 6627 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 6628 if eval "test \"\${$as_ac_Header+set}\" = set"; then 6629 echo "$as_me:$LINENO: checking for $ac_header" >&5 6630 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 6631 if eval "test \"\${$as_ac_Header+set}\" = set"; then 6632 echo $ECHO_N "(cached) $ECHO_C" >&6 6633 fi 6634 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 6635 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 6636 else 6637 # Is the header compilable? 6638 echo "$as_me:$LINENO: checking $ac_header usability" >&5 6639 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 6640 cat >conftest.$ac_ext <<_ACEOF 6641 /* confdefs.h. */ 6642 _ACEOF 6643 cat confdefs.h >>conftest.$ac_ext 6644 cat >>conftest.$ac_ext <<_ACEOF 6645 /* end confdefs.h. */ 6646 $ac_includes_default 6647 #include <$ac_header> 6648 _ACEOF 6649 rm -f conftest.$ac_objext 6650 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 6651 (eval $ac_compile) 2>conftest.er1 6652 ac_status=$? 6653 grep -v '^ *+' conftest.er1 >conftest.err 6654 rm -f conftest.er1 6655 cat conftest.err >&5 6656 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6657 (exit $ac_status); } && 6658 { ac_try='test -z "$ac_c_werror_flag" 6659 || test ! -s conftest.err' 6660 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6661 (eval $ac_try) 2>&5 6662 ac_status=$? 6663 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6664 (exit $ac_status); }; } && 6665 { ac_try='test -s conftest.$ac_objext' 6666 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6667 (eval $ac_try) 2>&5 6668 ac_status=$? 6669 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6670 (exit $ac_status); }; }; then 6671 ac_header_compiler=yes 6672 else 6673 echo "$as_me: failed program was:" >&5 6674 sed 's/^/| /' conftest.$ac_ext >&5 6675 6676 ac_header_compiler=no 6677 fi 6678 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 6679 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 6680 echo "${ECHO_T}$ac_header_compiler" >&6 6681 6682 # Is the header present? 6683 echo "$as_me:$LINENO: checking $ac_header presence" >&5 6684 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 6685 cat >conftest.$ac_ext <<_ACEOF 6686 /* confdefs.h. */ 6687 _ACEOF 6688 cat confdefs.h >>conftest.$ac_ext 6689 cat >>conftest.$ac_ext <<_ACEOF 6690 /* end confdefs.h. */ 6691 #include <$ac_header> 6692 _ACEOF 6693 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 6694 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 6695 ac_status=$? 6696 grep -v '^ *+' conftest.er1 >conftest.err 6697 rm -f conftest.er1 6698 cat conftest.err >&5 6699 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6700 (exit $ac_status); } >/dev/null; then 6701 if test -s conftest.err; then 6702 ac_cpp_err=$ac_c_preproc_warn_flag 6703 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 6704 else 6705 ac_cpp_err= 6706 fi 6707 else 6708 ac_cpp_err=yes 6709 fi 6710 if test -z "$ac_cpp_err"; then 6711 ac_header_preproc=yes 6712 else 6713 echo "$as_me: failed program was:" >&5 6714 sed 's/^/| /' conftest.$ac_ext >&5 6715 6716 ac_header_preproc=no 6717 fi 6718 rm -f conftest.err conftest.$ac_ext 6719 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 6720 echo "${ECHO_T}$ac_header_preproc" >&6 6721 6722 # So? What about this header? 6723 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 6724 yes:no: ) 6725 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 6726 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 6727 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 6728 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 6729 ac_header_preproc=yes 6730 ;; 6731 no:yes:* ) 6732 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 6733 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 6734 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 6735 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 6736 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 6737 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 6738 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 6739 echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 6740 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 6741 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 6742 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 6743 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 6744 ( 6745 cat <<\_ASBOX 6746 ## ------------------------------------------- ## 6747 ## Report this to orxonox-dev@mail.datacore.ch ## 6748 ## ------------------------------------------- ## 6749 _ASBOX 6750 ) | 6751 sed "s/^/$as_me: WARNING: /" >&2 6752 ;; 6753 esac 6754 echo "$as_me:$LINENO: checking for $ac_header" >&5 6755 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 6756 if eval "test \"\${$as_ac_Header+set}\" = set"; then 6757 echo $ECHO_N "(cached) $ECHO_C" >&6 6758 else 6759 eval "$as_ac_Header=\$ac_header_preproc" 6760 fi 6761 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 6762 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 6763 6764 fi 6765 if test `eval echo '${'$as_ac_Header'}'` = yes; then 6766 cat >>confdefs.h <<_ACEOF 6767 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 6768 _ACEOF 6769 pngHeader="yes" 6770 else 6771 pngHeader="no" 6772 fi 6773 6774 done 6775 6776 if test $pngHeader = "no"; then 6777 echo " not including png." 6778 else 6779 echo "$as_me:$LINENO: checking for main in -lpng" >&5 6780 echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6 6781 if test "${ac_cv_lib_png_main+set}" = set; then 6782 echo $ECHO_N "(cached) $ECHO_C" >&6 6783 else 6784 ac_check_lib_save_LIBS=$LIBS 6785 LIBS="-lpng $LIBS" 6786 cat >conftest.$ac_ext <<_ACEOF 6787 /* confdefs.h. */ 6788 _ACEOF 6789 cat confdefs.h >>conftest.$ac_ext 6790 cat >>conftest.$ac_ext <<_ACEOF 6791 /* end confdefs.h. */ 6792 6793 6794 int 6795 main () 6796 { 6797 main (); 6798 ; 6799 return 0; 6800 } 6801 _ACEOF 6802 rm -f conftest.$ac_objext conftest$ac_exeext 6803 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6804 (eval $ac_link) 2>conftest.er1 6805 ac_status=$? 6806 grep -v '^ *+' conftest.er1 >conftest.err 6807 rm -f conftest.er1 6808 cat conftest.err >&5 6809 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6810 (exit $ac_status); } && 6811 { ac_try='test -z "$ac_c_werror_flag" 6812 || test ! -s conftest.err' 6813 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6814 (eval $ac_try) 2>&5 6815 ac_status=$? 6816 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6817 (exit $ac_status); }; } && 6818 { ac_try='test -s conftest$ac_exeext' 6819 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6820 (eval $ac_try) 2>&5 6821 ac_status=$? 6822 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6823 (exit $ac_status); }; }; then 6824 ac_cv_lib_png_main=yes 6825 else 6826 echo "$as_me: failed program was:" >&5 6827 sed 's/^/| /' conftest.$ac_ext >&5 6828 6829 ac_cv_lib_png_main=no 6830 fi 6831 rm -f conftest.err conftest.$ac_objext \ 6832 conftest$ac_exeext conftest.$ac_ext 6833 LIBS=$ac_check_lib_save_LIBS 6834 fi 6835 echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5 6836 echo "${ECHO_T}$ac_cv_lib_png_main" >&6 6837 if test $ac_cv_lib_png_main = yes; then 6838 FOUND_png=yes 6839 fi 6840 6841 if test "$FOUND_png" = "yes" ; then 6842 LIBS="$LIBS -lpng" 6843 else 6844 echo "------------------" 6845 echo "png library not found." 6846 echo "please install the png library, which can be found at http://libpng.org/pub/png/libpng.html" 6847 echo "------------------" 6848 exit -1 6849 fi 6850 fi 6851 fi 6852 6853 ## checking for GTK 6854 if test "$def_gtk" = yes; then 6855 6856 #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no) 6857 echo "$as_me:$LINENO: checking for gtk2.0" >&5 6858 echo $ECHO_N "checking for gtk2.0... $ECHO_C" >&6 6859 if `pkg-config --exists gtk+-2.0`; then 6860 echo "yes" 6861 have_gtk2=yes 6862 GTK2_LIBS=`pkg-config --libs gtk+-2.0` 6863 GTK2_CFLAGS=`pkg-config --cflags gtk+-2.0` 6864 6865 cat >>confdefs.h <<_ACEOF 6866 #define HAVE_GTK2 1 6867 _ACEOF 6868 6869 else 6870 echo "no" 6871 fi 6872 6873 fi 6874 6875 6876 6877 6878 if test x$have_gtk2 = xyes; then 6879 HAVE_GTK2_TRUE= 6880 HAVE_GTK2_FALSE='#' 6881 else 6882 HAVE_GTK2_TRUE='#' 6883 HAVE_GTK2_FALSE= 6884 fi 6885 6886 6887 6888 6889 #checking for pthread libs 6890 # AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes) 6891 # if test "$FOUND_pthread" = "yes" ; then 6892 # LIBS="$LIBS -lpthread" 6893 # fi 6894 6895 6896 # FIXME: Replace `main' with a function in `-lm': 6897 6898 echo "$as_me:$LINENO: checking for main in -lm" >&5 6899 echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6 6900 if test "${ac_cv_lib_m_main+set}" = set; then 6901 echo $ECHO_N "(cached) $ECHO_C" >&6 6902 else 6903 ac_check_lib_save_LIBS=$LIBS 6904 LIBS="-lm $LIBS" 6905 cat >conftest.$ac_ext <<_ACEOF 6906 /* confdefs.h. */ 6907 _ACEOF 6908 cat confdefs.h >>conftest.$ac_ext 6909 cat >>conftest.$ac_ext <<_ACEOF 6910 /* end confdefs.h. */ 6911 6912 6913 int 6914 main () 6915 { 6916 main (); 6917 ; 6918 return 0; 6919 } 6920 _ACEOF 6921 rm -f conftest.$ac_objext conftest$ac_exeext 6922 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6923 (eval $ac_link) 2>conftest.er1 6924 ac_status=$? 6925 grep -v '^ *+' conftest.er1 >conftest.err 6926 rm -f conftest.er1 6927 cat conftest.err >&5 6928 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6929 (exit $ac_status); } && 6930 { ac_try='test -z "$ac_c_werror_flag" 6931 || test ! -s conftest.err' 6932 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6933 (eval $ac_try) 2>&5 6934 ac_status=$? 6935 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6936 (exit $ac_status); }; } && 6937 { ac_try='test -s conftest$ac_exeext' 6938 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6939 (eval $ac_try) 2>&5 6940 ac_status=$? 6941 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6942 (exit $ac_status); }; }; then 6943 ac_cv_lib_m_main=yes 6944 else 6945 echo "$as_me: failed program was:" >&5 6946 sed 's/^/| /' conftest.$ac_ext >&5 6947 6948 ac_cv_lib_m_main=no 6949 fi 6950 rm -f conftest.err conftest.$ac_objext \ 6951 conftest$ac_exeext conftest.$ac_ext 6952 LIBS=$ac_check_lib_save_LIBS 6953 fi 6954 echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5 6955 echo "${ECHO_T}$ac_cv_lib_m_main" >&6 6956 if test $ac_cv_lib_m_main = yes; then 6957 cat >>confdefs.h <<_ACEOF 6958 #define HAVE_LIBM 1 6959 _ACEOF 6960 6961 LIBS="-lm $LIBS" 6962 6963 fi 6964 6965 6966 6967 # Checks for header files. 6968 echo "$as_me:$LINENO: checking for ANSI C header files" >&5 6969 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 6970 if test "${ac_cv_header_stdc+set}" = set; then 6971 echo $ECHO_N "(cached) $ECHO_C" >&6 6972 else 6973 cat >conftest.$ac_ext <<_ACEOF 6974 /* confdefs.h. */ 6975 _ACEOF 6976 cat confdefs.h >>conftest.$ac_ext 6977 cat >>conftest.$ac_ext <<_ACEOF 6978 /* end confdefs.h. */ 6979 #include <stdlib.h> 6980 #include <stdarg.h> 6981 #include <string.h> 6982 #include <float.h> 6983 6984 int 6985 main () 6986 { 6987 6988 ; 6989 return 0; 6990 } 6991 _ACEOF 6992 rm -f conftest.$ac_objext 6993 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 6994 (eval $ac_compile) 2>conftest.er1 6995 ac_status=$? 6996 grep -v '^ *+' conftest.er1 >conftest.err 6997 rm -f conftest.er1 6998 cat conftest.err >&5 6999 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7000 (exit $ac_status); } && 7001 { ac_try='test -z "$ac_c_werror_flag" 7002 || test ! -s conftest.err' 7003 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7004 (eval $ac_try) 2>&5 7005 ac_status=$? 7006 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7007 (exit $ac_status); }; } && 7008 { ac_try='test -s conftest.$ac_objext' 7009 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7010 (eval $ac_try) 2>&5 7011 ac_status=$? 7012 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7013 (exit $ac_status); }; }; then 7014 ac_cv_header_stdc=yes 7015 else 7016 echo "$as_me: failed program was:" >&5 7017 sed 's/^/| /' conftest.$ac_ext >&5 7018 7019 ac_cv_header_stdc=no 7020 fi 7021 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 7022 7023 if test $ac_cv_header_stdc = yes; then 7024 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 7025 cat >conftest.$ac_ext <<_ACEOF 7026 /* confdefs.h. */ 7027 _ACEOF 7028 cat confdefs.h >>conftest.$ac_ext 7029 cat >>conftest.$ac_ext <<_ACEOF 7030 /* end confdefs.h. */ 7031 #include <string.h> 7032 7033 _ACEOF 7034 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 7035 $EGREP "memchr" >/dev/null 2>&1; then 7036 : 7037 else 7038 ac_cv_header_stdc=no 7039 fi 7040 rm -f conftest* 7041 7042 fi 7043 7044 if test $ac_cv_header_stdc = yes; then 7045 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 7046 cat >conftest.$ac_ext <<_ACEOF 7047 /* confdefs.h. */ 7048 _ACEOF 7049 cat confdefs.h >>conftest.$ac_ext 7050 cat >>conftest.$ac_ext <<_ACEOF 7051 /* end confdefs.h. */ 7052 #include <stdlib.h> 7053 7054 _ACEOF 7055 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 7056 $EGREP "free" >/dev/null 2>&1; then 7057 : 7058 else 7059 ac_cv_header_stdc=no 7060 fi 7061 rm -f conftest* 7062 7063 fi 7064 7065 if test $ac_cv_header_stdc = yes; then 7066 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 7067 if test "$cross_compiling" = yes; then 7068 : 7069 else 7070 cat >conftest.$ac_ext <<_ACEOF 7071 /* confdefs.h. */ 7072 _ACEOF 7073 cat confdefs.h >>conftest.$ac_ext 7074 cat >>conftest.$ac_ext <<_ACEOF 7075 /* end confdefs.h. */ 7076 #include <ctype.h> 7077 #if ((' ' & 0x0FF) == 0x020) 7078 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 7079 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 7080 #else 7081 # define ISLOWER(c) \ 7082 (('a' <= (c) && (c) <= 'i') \ 7083 || ('j' <= (c) && (c) <= 'r') \ 7084 || ('s' <= (c) && (c) <= 'z')) 7085 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) 7086 #endif 7087 7088 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 7089 int 7090 main () 7091 { 7092 int i; 7093 for (i = 0; i < 256; i++) 7094 if (XOR (islower (i), ISLOWER (i)) 7095 || toupper (i) != TOUPPER (i)) 7096 exit(2); 7097 exit (0); 7098 } 7099 _ACEOF 7100 rm -f conftest$ac_exeext 7101 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 7102 (eval $ac_link) 2>&5 7103 ac_status=$? 7104 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7105 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 7106 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7107 (eval $ac_try) 2>&5 7108 ac_status=$? 7109 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7110 (exit $ac_status); }; }; then 7111 : 7112 else 7113 echo "$as_me: program exited with status $ac_status" >&5 7114 echo "$as_me: failed program was:" >&5 7115 sed 's/^/| /' conftest.$ac_ext >&5 7116 7117 ( exit $ac_status ) 7118 ac_cv_header_stdc=no 7119 fi 7120 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 7121 fi 7122 fi 7123 fi 7124 echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 7125 echo "${ECHO_T}$ac_cv_header_stdc" >&6 7126 if test $ac_cv_header_stdc = yes; then 7127 7128 cat >>confdefs.h <<\_ACEOF 7129 #define STDC_HEADERS 1 7130 _ACEOF 7131 7132 fi 7133 7134 7135 7136 for ac_header in stdlib.h string.h 7137 do 7138 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 7139 if eval "test \"\${$as_ac_Header+set}\" = set"; then 7140 echo "$as_me:$LINENO: checking for $ac_header" >&5 7141 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 7142 if eval "test \"\${$as_ac_Header+set}\" = set"; then 7143 echo $ECHO_N "(cached) $ECHO_C" >&6 7144 fi 7145 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 7146 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 7147 else 7148 # Is the header compilable? 7149 echo "$as_me:$LINENO: checking $ac_header usability" >&5 7150 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 7151 cat >conftest.$ac_ext <<_ACEOF 7152 /* confdefs.h. */ 7153 _ACEOF 7154 cat confdefs.h >>conftest.$ac_ext 7155 cat >>conftest.$ac_ext <<_ACEOF 7156 /* end confdefs.h. */ 7157 $ac_includes_default 7158 #include <$ac_header> 7159 _ACEOF 7160 rm -f conftest.$ac_objext 7161 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 7162 (eval $ac_compile) 2>conftest.er1 7163 ac_status=$? 7164 grep -v '^ *+' conftest.er1 >conftest.err 7165 rm -f conftest.er1 7166 cat conftest.err >&5 7167 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7168 (exit $ac_status); } && 7169 { ac_try='test -z "$ac_c_werror_flag" 7170 || test ! -s conftest.err' 7171 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7172 (eval $ac_try) 2>&5 7173 ac_status=$? 7174 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7175 (exit $ac_status); }; } && 7176 { ac_try='test -s conftest.$ac_objext' 7177 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7178 (eval $ac_try) 2>&5 7179 ac_status=$? 7180 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7181 (exit $ac_status); }; }; then 7182 ac_header_compiler=yes 7183 else 7184 echo "$as_me: failed program was:" >&5 7185 sed 's/^/| /' conftest.$ac_ext >&5 7186 7187 ac_header_compiler=no 7188 fi 7189 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 7190 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 7191 echo "${ECHO_T}$ac_header_compiler" >&6 7192 7193 # Is the header present? 7194 echo "$as_me:$LINENO: checking $ac_header presence" >&5 7195 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 7196 cat >conftest.$ac_ext <<_ACEOF 7197 /* confdefs.h. */ 7198 _ACEOF 7199 cat confdefs.h >>conftest.$ac_ext 7200 cat >>conftest.$ac_ext <<_ACEOF 7201 /* end confdefs.h. */ 7202 #include <$ac_header> 7203 _ACEOF 7204 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 7205 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 7206 ac_status=$? 7207 grep -v '^ *+' conftest.er1 >conftest.err 7208 rm -f conftest.er1 7209 cat conftest.err >&5 7210 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7211 (exit $ac_status); } >/dev/null; then 7212 if test -s conftest.err; then 7213 ac_cpp_err=$ac_c_preproc_warn_flag 7214 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 7215 else 7216 ac_cpp_err= 7217 fi 7218 else 7219 ac_cpp_err=yes 7220 fi 7221 if test -z "$ac_cpp_err"; then 7222 ac_header_preproc=yes 7223 else 7224 echo "$as_me: failed program was:" >&5 7225 sed 's/^/| /' conftest.$ac_ext >&5 7226 7227 ac_header_preproc=no 7228 fi 7229 rm -f conftest.err conftest.$ac_ext 7230 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 7231 echo "${ECHO_T}$ac_header_preproc" >&6 7232 7233 # So? What about this header? 7234 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 7235 yes:no: ) 7236 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 7237 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 7238 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 7239 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 7240 ac_header_preproc=yes 7241 ;; 7242 no:yes:* ) 7243 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 7244 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 7245 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 7246 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 7247 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 7248 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 7249 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 7250 echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 7251 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 7252 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 7253 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 7254 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 7255 ( 7256 cat <<\_ASBOX 7257 ## ------------------------------------------- ## 7258 ## Report this to orxonox-dev@mail.datacore.ch ## 7259 ## ------------------------------------------- ## 7260 _ASBOX 7261 ) | 7262 sed "s/^/$as_me: WARNING: /" >&2 7263 ;; 7264 esac 7265 echo "$as_me:$LINENO: checking for $ac_header" >&5 7266 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 7267 if eval "test \"\${$as_ac_Header+set}\" = set"; then 7268 echo $ECHO_N "(cached) $ECHO_C" >&6 7269 else 7270 eval "$as_ac_Header=\$ac_header_preproc" 7271 fi 7272 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 7273 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 7274 7275 fi 7276 if test `eval echo '${'$as_ac_Header'}'` = yes; then 7277 cat >>confdefs.h <<_ACEOF 7278 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 7279 _ACEOF 7280 7281 fi 7282 7283 done 7284 7285 7286 # Checks for typedefs, structures, and compiler characteristics. 7287 echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 7288 echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6 7289 if test "${ac_cv_header_stdbool_h+set}" = set; then 7290 echo $ECHO_N "(cached) $ECHO_C" >&6 7291 else 7292 cat >conftest.$ac_ext <<_ACEOF 7293 /* confdefs.h. */ 7294 _ACEOF 7295 cat confdefs.h >>conftest.$ac_ext 7296 cat >>conftest.$ac_ext <<_ACEOF 7297 /* end confdefs.h. */ 7298 7299 #include <stdbool.h> 7300 #ifndef bool 7301 # error bool is not defined 7302 #endif 7303 #ifndef false 7304 # error false is not defined 7305 #endif 7306 #if false 7307 # error false is not 0 7308 #endif 7309 #ifndef true 7310 # error true is not defined 7311 #endif 7312 #if true != 1 7313 # error true is not 1 7314 #endif 7315 #ifndef __bool_true_false_are_defined 7316 # error __bool_true_false_are_defined is not defined 7317 #endif 7318 7319 struct s { _Bool s: 1; _Bool t; } s; 7320 7321 char a[true == 1 ? 1 : -1]; 7322 char b[false == 0 ? 1 : -1]; 7323 char c[__bool_true_false_are_defined == 1 ? 1 : -1]; 7324 char d[(bool) -0.5 == true ? 1 : -1]; 7325 bool e = &s; 7326 char f[(_Bool) -0.0 == false ? 1 : -1]; 7327 char g[true]; 7328 char h[sizeof (_Bool)]; 7329 char i[sizeof s.t]; 7330 7331 int 7332 main () 7333 { 7334 return !a + !b + !c + !d + !e + !f + !g + !h + !i; 7335 ; 7336 return 0; 7337 } 7338 _ACEOF 7339 rm -f conftest.$ac_objext 7340 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 7341 (eval $ac_compile) 2>conftest.er1 7342 ac_status=$? 7343 grep -v '^ *+' conftest.er1 >conftest.err 7344 rm -f conftest.er1 7345 cat conftest.err >&5 7346 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7347 (exit $ac_status); } && 7348 { ac_try='test -z "$ac_c_werror_flag" 7349 || test ! -s conftest.err' 7350 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7351 (eval $ac_try) 2>&5 7352 ac_status=$? 7353 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7354 (exit $ac_status); }; } && 7355 { ac_try='test -s conftest.$ac_objext' 7356 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7357 (eval $ac_try) 2>&5 7358 ac_status=$? 7359 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7360 (exit $ac_status); }; }; then 7361 ac_cv_header_stdbool_h=yes 7362 else 7363 echo "$as_me: failed program was:" >&5 7364 sed 's/^/| /' conftest.$ac_ext >&5 7365 7366 ac_cv_header_stdbool_h=no 7367 fi 7368 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 7369 fi 7370 echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 7371 echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6 7372 echo "$as_me:$LINENO: checking for _Bool" >&5 7373 echo $ECHO_N "checking for _Bool... $ECHO_C" >&6 7374 if test "${ac_cv_type__Bool+set}" = set; then 7375 echo $ECHO_N "(cached) $ECHO_C" >&6 7376 else 7377 cat >conftest.$ac_ext <<_ACEOF 7378 /* confdefs.h. */ 7379 _ACEOF 7380 cat confdefs.h >>conftest.$ac_ext 7381 cat >>conftest.$ac_ext <<_ACEOF 7382 /* end confdefs.h. */ 7383 $ac_includes_default 7384 int 7385 main () 7386 { 7387 if ((_Bool *) 0) 7388 return 0; 7389 if (sizeof (_Bool)) 7390 return 0; 7391 ; 7392 return 0; 7393 } 7394 _ACEOF 7395 rm -f conftest.$ac_objext 7396 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 7397 (eval $ac_compile) 2>conftest.er1 7398 ac_status=$? 7399 grep -v '^ *+' conftest.er1 >conftest.err 7400 rm -f conftest.er1 7401 cat conftest.err >&5 7402 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7403 (exit $ac_status); } && 7404 { ac_try='test -z "$ac_c_werror_flag" 7405 || test ! -s conftest.err' 7406 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7407 (eval $ac_try) 2>&5 7408 ac_status=$? 7409 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7410 (exit $ac_status); }; } && 7411 { ac_try='test -s conftest.$ac_objext' 7412 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7413 (eval $ac_try) 2>&5 7414 ac_status=$? 7415 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7416 (exit $ac_status); }; }; then 7417 ac_cv_type__Bool=yes 7418 else 7419 echo "$as_me: failed program was:" >&5 7420 sed 's/^/| /' conftest.$ac_ext >&5 7421 7422 ac_cv_type__Bool=no 7423 fi 7424 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 7425 fi 7426 echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 7427 echo "${ECHO_T}$ac_cv_type__Bool" >&6 7428 if test $ac_cv_type__Bool = yes; then 7429 7430 cat >>confdefs.h <<_ACEOF 7431 #define HAVE__BOOL 1 7432 _ACEOF 7433 7434 7435 fi 7436 7437 if test $ac_cv_header_stdbool_h = yes; then 7438 7439 cat >>confdefs.h <<\_ACEOF 7440 #define HAVE_STDBOOL_H 1 7441 _ACEOF 7442 7443 fi 7444 7445 7446 # Checks for library functions. 7447 7448 for ac_header in stdlib.h 7449 do 7450 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 7451 if eval "test \"\${$as_ac_Header+set}\" = set"; then 7452 echo "$as_me:$LINENO: checking for $ac_header" >&5 7453 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 7454 if eval "test \"\${$as_ac_Header+set}\" = set"; then 7455 echo $ECHO_N "(cached) $ECHO_C" >&6 7456 fi 7457 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 7458 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 7459 else 7460 # Is the header compilable? 7461 echo "$as_me:$LINENO: checking $ac_header usability" >&5 7462 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 7463 cat >conftest.$ac_ext <<_ACEOF 7464 /* confdefs.h. */ 7465 _ACEOF 7466 cat confdefs.h >>conftest.$ac_ext 7467 cat >>conftest.$ac_ext <<_ACEOF 7468 /* end confdefs.h. */ 7469 $ac_includes_default 7470 #include <$ac_header> 7471 _ACEOF 7472 rm -f conftest.$ac_objext 7473 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 7474 (eval $ac_compile) 2>conftest.er1 7475 ac_status=$? 7476 grep -v '^ *+' conftest.er1 >conftest.err 7477 rm -f conftest.er1 7478 cat conftest.err >&5 7479 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7480 (exit $ac_status); } && 7481 { ac_try='test -z "$ac_c_werror_flag" 7482 || test ! -s conftest.err' 7483 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7484 (eval $ac_try) 2>&5 7485 ac_status=$? 7486 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7487 (exit $ac_status); }; } && 7488 { ac_try='test -s conftest.$ac_objext' 7489 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7490 (eval $ac_try) 2>&5 7491 ac_status=$? 7492 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7493 (exit $ac_status); }; }; then 7494 ac_header_compiler=yes 7495 else 7496 echo "$as_me: failed program was:" >&5 7497 sed 's/^/| /' conftest.$ac_ext >&5 7498 7499 ac_header_compiler=no 7500 fi 7501 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 7502 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 7503 echo "${ECHO_T}$ac_header_compiler" >&6 7504 7505 # Is the header present? 7506 echo "$as_me:$LINENO: checking $ac_header presence" >&5 7507 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 7508 cat >conftest.$ac_ext <<_ACEOF 7509 /* confdefs.h. */ 7510 _ACEOF 7511 cat confdefs.h >>conftest.$ac_ext 7512 cat >>conftest.$ac_ext <<_ACEOF 7513 /* end confdefs.h. */ 7514 #include <$ac_header> 7515 _ACEOF 7516 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 7517 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 7518 ac_status=$? 7519 grep -v '^ *+' conftest.er1 >conftest.err 7520 rm -f conftest.er1 7521 cat conftest.err >&5 7522 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7523 (exit $ac_status); } >/dev/null; then 7524 if test -s conftest.err; then 7525 ac_cpp_err=$ac_c_preproc_warn_flag 7526 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 7527 else 7528 ac_cpp_err= 7529 fi 7530 else 7531 ac_cpp_err=yes 7532 fi 7533 if test -z "$ac_cpp_err"; then 7534 ac_header_preproc=yes 7535 else 7536 echo "$as_me: failed program was:" >&5 7537 sed 's/^/| /' conftest.$ac_ext >&5 7538 7539 ac_header_preproc=no 7540 fi 7541 rm -f conftest.err conftest.$ac_ext 7542 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 7543 echo "${ECHO_T}$ac_header_preproc" >&6 7544 7545 # So? What about this header? 7546 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 7547 yes:no: ) 7548 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 7549 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 7550 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 7551 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 7552 ac_header_preproc=yes 7553 ;; 7554 no:yes:* ) 7555 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 7556 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 7557 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 7558 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 7559 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 7560 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 7561 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 7562 echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 7563 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 7564 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 7565 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 7566 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 7567 ( 7568 cat <<\_ASBOX 7569 ## ------------------------------------------- ## 7570 ## Report this to orxonox-dev@mail.datacore.ch ## 7571 ## ------------------------------------------- ## 7572 _ASBOX 7573 ) | 7574 sed "s/^/$as_me: WARNING: /" >&2 7575 ;; 7576 esac 7577 echo "$as_me:$LINENO: checking for $ac_header" >&5 7578 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 7579 if eval "test \"\${$as_ac_Header+set}\" = set"; then 7580 echo $ECHO_N "(cached) $ECHO_C" >&6 7581 else 7582 eval "$as_ac_Header=\$ac_header_preproc" 7583 fi 7584 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 7585 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 7586 7587 fi 7588 if test `eval echo '${'$as_ac_Header'}'` = yes; then 7589 cat >>confdefs.h <<_ACEOF 7590 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 7591 _ACEOF 7592 6806 7593 fi 6807 7594 … … 6993 7780 6994 7781 6995 ac_config_files="$ac_config_files Makefile console/Makefile gui/Makefile src/Makefileimporter/Makefile"7782 ac_config_files="$ac_config_files Makefile src/console/Makefile src/gui/Makefile src/Makefile src/importer/Makefile" 6996 7783 6997 7784 cat >confcache <<\_ACEOF … … 7104 7891 Usually this means the macro was only invoked conditionally." >&5 7105 7892 echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. 7893 Usually this means the macro was only invoked conditionally." >&2;} 7894 { (exit 1); exit 1; }; } 7895 fi 7896 if test -z "${DOXYGEN_TRUE}" && test -z "${DOXYGEN_FALSE}"; then 7897 { { echo "$as_me:$LINENO: error: conditional \"DOXYGEN\" was never defined. 7898 Usually this means the macro was only invoked conditionally." >&5 7899 echo "$as_me: error: conditional \"DOXYGEN\" was never defined. 7900 Usually this means the macro was only invoked conditionally." >&2;} 7901 { (exit 1); exit 1; }; } 7902 fi 7903 if test -z "${HAVE_GTK2_TRUE}" && test -z "${HAVE_GTK2_FALSE}"; then 7904 { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK2\" was never defined. 7905 Usually this means the macro was only invoked conditionally." >&5 7906 echo "$as_me: error: conditional \"HAVE_GTK2\" was never defined. 7106 7907 Usually this means the macro was only invoked conditionally." >&2;} 7107 7908 { (exit 1); exit 1; }; } … … 7378 8179 cat >&5 <<_CSEOF 7379 8180 7380 This file was extended by orxonox $as_me 0. 1-pre-alpha, which was8181 This file was extended by orxonox $as_me 0.2.0_alpha-r1, which was 7381 8182 generated by GNU Autoconf 2.59. Invocation command line was 7382 8183 … … 7441 8242 cat >>$CONFIG_STATUS <<_ACEOF 7442 8243 ac_cs_version="\\ 7443 orxonox config.status 0. 1-pre-alpha8244 orxonox config.status 0.2.0_alpha-r1 7444 8245 configured by $0, generated by GNU Autoconf 2.59, 7445 8246 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" … … 7552 8353 # Handling of arguments. 7553 8354 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 7554 " console/Makefile" ) CONFIG_FILES="$CONFIG_FILESconsole/Makefile" ;;7555 " gui/Makefile" ) CONFIG_FILES="$CONFIG_FILESgui/Makefile" ;;8355 "src/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;; 8356 "src/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gui/Makefile" ;; 7556 8357 "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; 7557 " importer/Makefile" ) CONFIG_FILES="$CONFIG_FILESimporter/Makefile" ;;8358 "src/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/importer/Makefile" ;; 7558 8359 "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; 7559 8360 "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; … … 7643 8444 s,@ECHO_T@,$ECHO_T,;t t 7644 8445 s,@LIBS@,$LIBS,;t t 8446 s,@build@,$build,;t t 8447 s,@build_cpu@,$build_cpu,;t t 8448 s,@build_vendor@,$build_vendor,;t t 8449 s,@build_os@,$build_os,;t t 8450 s,@host@,$host,;t t 8451 s,@host_cpu@,$host_cpu,;t t 8452 s,@host_vendor@,$host_vendor,;t t 8453 s,@host_os@,$host_os,;t t 8454 s,@target@,$target,;t t 8455 s,@target_cpu@,$target_cpu,;t t 8456 s,@target_vendor@,$target_vendor,;t t 8457 s,@target_os@,$target_os,;t t 7645 8458 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t 7646 8459 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t … … 7687 8500 s,@CPP@,$CPP,;t t 7688 8501 s,@EGREP@,$EGREP,;t t 8502 s,@DEBUG@,$DEBUG,;t t 8503 s,@DOXYGEN@,$DOXYGEN,;t t 8504 s,@DOXYGEN_TRUE@,$DOXYGEN_TRUE,;t t 8505 s,@DOXYGEN_FALSE@,$DOXYGEN_FALSE,;t t 7689 8506 s,@MSBITFIELDS@,$MSBITFIELDS,;t t 8507 s,@GTK2_LIBS@,$GTK2_LIBS,;t t 8508 s,@GTK2_CFLAGS@,$GTK2_CFLAGS,;t t 8509 s,@HAVE_GTK2_TRUE@,$HAVE_GTK2_TRUE,;t t 8510 s,@HAVE_GTK2_FALSE@,$HAVE_GTK2_FALSE,;t t 7690 8511 s,@LIBOBJS@,$LIBOBJS,;t t 7691 8512 s,@LTLIBOBJS@,$LTLIBOBJS,;t t -
orxonox/branches/sound/configure.ac
r2964 r3238 3 3 4 4 AC_PREREQ(2.56) 5 AC_INIT(orxonox, 0.1-pre-alpha, orxonox-dev@mail.datacore.ch) 5 AC_INIT(orxonox, 0.2.0_alpha-r1, orxonox-dev@mail.datacore.ch) 6 7 # Detect the canonical host and target build environment. 8 AC_CANONICAL_BUILD 9 AC_CANONICAL_HOST 10 AC_CANONICAL_TARGET 11 12 6 13 AM_INIT_AUTOMAKE 7 14 … … 12 19 # Checks for programs. 13 20 AC_PROG_CXX 14 AC_PROG_CC15 16 17 18 21 AC_HEADER_STDC 19 22 23 ### CHECKING OPTIONAT ARGUMENTS 24 ## DEBUG-statement 25 DEBUG=no 26 AC_MSG_CHECKING([if DEBUG-mode should be enabled]) 27 AC_ARG_ENABLE([debug], 28 AC_HELP_STRING( [--enable-debug], [compiles in debug mode. Lots of debug info about the game.]), 29 DEBUG=$enableval) 30 31 if test "$DEBUG" = "no"; then 32 echo "no" 33 echo " -> Setting debuglevel to 1. Like this you can still see errors." 34 DEBUG=1 35 elif test "$DEBUG" = yes; then 36 echo "yes" 37 echo " -> Setting debuglevel to 3. HARD DEBUG MODE!!." 38 DEBUG=3 39 else 40 echo "yes set to $DEBUG" 41 fi 42 AC_DEFINE_UNQUOTED(DEBUG, $DEBUG, [in which debug mode we are]) 43 44 AC_SUBST(DEBUG) 45 46 ## GTK-disabled 47 AC_MSG_CHECKING([if gtk should be enabled]) 48 AC_ARG_WITH([gtk], 49 AC_HELP_STRING( [--without-gtk], 50 [Prevents GTK from being loaded]), [def_gtk=no], [def_gtk=yes]) 51 if test "$def_gtk" = yes; then 52 echo "yes" 53 fi 54 if test "$def_gtk" = no; then 55 echo "no" 56 fi 57 ### SDL_image-disable 58 def_sdl_image=yes 59 AC_MSG_CHECKING([if SDL_image should be enabled]) 60 AC_ARG_WITH([sdl_image], 61 AC_HELP_STRING( [--without-sdl-image], 62 [Prevents SDL_image from being loaded]), [def_sdl_image=no]) 63 if test "$def_sdl_image" = yes; then 64 echo "yes" 65 fi 66 if test "$def_sdl_image" = no; then 67 echo "no" 68 fi 69 70 71 ## PROGRAMM CHECKING 72 # checking for Doxygen 73 AC_PATH_PROG(DOXYGEN, doxygen) 74 AM_CONDITIONAL(DOXYGEN, test $DOXYGEN) 75 20 76 ### CHECKING FOR SYSTEM ### 21 77 22 78 AC_MSG_CHECKING([for System]) 23 case `uname` in 79 ## checking for openGL-environment and other sys-specific parameters 80 case "$target" in 24 81 ### WINDOWS ### 25 * MINGW*)82 *-*-mingw32*) 26 83 echo "mingw-WINDOWS detected" 27 84 … … 64 121 fi 65 122 66 67 123 # checking for mingw32 68 124 AC_CHECK_LIB([mingw32], [main], FOUND_mingw32=yes) … … 77 133 AC_CHECK_LIB([sdlmain], [main], FOUND_sdlmain=yes) 78 134 if test "$FOUND_sdlmain" = "yes" ; then 79 80 else 81 82 83 84 85 135 LIBS="$LIBS -lsdlmain" 136 else 137 echo "------------------" 138 echo "SDL library not found." 139 echo "please install the SDL library, which can be found at http://www.libsdl.org" 140 echo "------------------" 141 exit 1 86 142 fi 87 143 AC_CHECK_LIB([sdl], [main], FOUND_sdl=yes) 88 144 if test "$FOUND_sdl" = "yes" ; then 89 LIBS="$LIBS -lsdl" 90 else 91 echo "------------------" 92 echo "SDL library not found." 93 echo "please install the SDL library, which can be found at http://www.libsdl.org" 94 echo "------------------" 95 exit -1 96 fi 97 98 # checking for SDL-Mixer-headers 99 AC_CHECK_HEADERS(SDL/SDL_mixer.h ,, 100 [AC_MSG_ERROR([cannot find SDL headers]) ]) 101 102 #checking for libSDL_mixer 103 AC_CHECK_LIB([SDL_mixer], [main], FOUND_SDL_mixer=yes) 104 if test "$FOUND_SDL_mixer" = "yes" ; then 105 LIBS="$LIBS -lSDL_mixer" 106 else 107 echo "------------------" 108 echo "SDL Mixer library not found." 109 echo "please install the SDL Mixer library, which can be found at http://www.libsdl.org" 110 echo "------------------" 111 exit 1 112 fi 113 145 LIBS="$LIBS -lsdl" 146 else 147 echo "------------------" 148 echo "SDL library not found." 149 echo "please install the SDL library, which can be found at http://www.libsdl.org" 150 echo "------------------" 151 exit -1 152 fi 114 153 115 154 ;; 116 155 117 156 ### LINUX ### 118 * Linux*)157 *-*-linux*) 119 158 echo "Linux detected" 120 159 121 160 Linux="yes" 122 161 162 CPPFLAGS="-I/usr/X11R6/include" 163 LDFLAGS="-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS" 123 164 # checking gl header 124 165 AC_CHECK_HEADERS(GL/gl.h ,, … … 156 197 [AC_MSG_ERROR([cannot find SDL headers]) ]) 157 198 199 # checking for SDL-lib 158 200 AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes) 159 201 if test "$FOUND_SDL" = "yes" ; then 160 202 LIBS="$LIBS -lSDL" 161 203 else 162 163 164 165 166 204 echo "------------------" 205 echo "SDL library not found." 206 echo "please install the SDL library, which can be found at http://www.libsdl.org" 207 echo "------------------" 208 exit -1 167 209 fi 168 210 211 212 ## checking for SDL 213 # SDL_VERSION=1.2.7 214 # AM_PATH_SDL($SDL_VERSION, 215 # :, 216 # AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) 217 # ) 218 # CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" 219 # LIBS="$LIBS $SDL_LIBS" 220 ;; 221 222 ### OS X ### 223 *darwin*) 224 echo "OS X detected" 225 226 osX="yes" 227 228 CPPFLAGS="-I/sw/include $CPPFLAGS" 229 # checking gl header 230 AC_CHECK_HEADERS(OpenGL/gl.h ,, 231 [AC_MSG_ERROR([cannot find opengl headers]) ]) 232 # cheking for GLU-header 233 AC_CHECK_HEADERS(OpenGL/glu.h ,, 234 [AC_MSG_ERROR([cannot find opengl headers]) ]) 235 236 LIBS="$LIBS -framework OpenGL" 237 238 # checking for SDL-headers 239 # AC_CHECK_HEADERS(SDL/SDL.h ,, 240 # [AC_MSG_ERROR([cannot find SDL headers]) ]) 241 242 ## checking for SDL 243 # SDL_VERSION=1.2.7 244 # AM_PATH_SDL($SDL_VERSION, 245 # :, 246 # AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) 247 # ) 248 249 SDL_CFLAGS=`sdl-config --cflags` 250 SDL_LIBS=`sdl-config --libs` 251 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" 252 LIBS="$LIBS $SDL_LIBS" 253 254 ;; 255 256 *) 257 ;; 258 esac 259 260 AC_SUBST(MSBITFIELDS) 261 262 263 ## check for SDL_mixer 169 264 # checking for SDL-Mixer-headers 170 265 AC_CHECK_HEADERS(SDL/SDL_mixer.h ,, 171 266 [AC_MSG_ERROR([cannot find SDL headers]) ]) 172 173 267 268 174 269 #checking for libSDL_mixer 175 270 AC_CHECK_LIB([SDL_mixer], [main], FOUND_SDL_mixer=yes) 176 271 if test "$FOUND_SDL_mixer" = "yes" ; then 177 LIBS="$LIBS -lSDL_mixer" 178 else 179 echo "------------------" 180 echo "SDL Mixer library not found." 181 echo "please install the SDL Mixer library, which can be found at http://www.libsdl.org" 182 echo "------------------" 183 exit 1 184 fi 185 186 ;; 187 *) 188 mingw="no" 189 ;; 190 esac 191 AC_MSG_RESULT([$mingw]) 192 AC_SUBST(MSBITFIELDS) 193 194 #### Checking for LIBraries. 195 196 # FIXME: Replace `main' with a function in `-lOSMesa': 197 AC_CHECK_LIB([OSMesa], [main]) 198 # FIXME: Replace `main' with a function in `-lX11': 199 AC_CHECK_LIB([X11], [main]) 200 # FIXME: Replace `main' with a function in `-lXt': 201 AC_CHECK_LIB([Xt], [main]) 272 LIBS="$LIBS -lSDL_mixer" 273 else 274 echo "------------------" 275 echo "SDL Mixer library not found." 276 echo "please install the SDL Mixer library, which can be found at http://www.libsdl.org" 277 echo "------------------" 278 exit 1 279 fi 280 281 282 ## check for SDL_Image 283 if test "$def_sdl_image" = "yes"; then 284 # checking for SDL_image-headers 285 AC_CHECK_HEADERS(SDL/SDL_image.h ,, 286 [echo "sdl_image not found. falling back to other options"; def_sdl_image=no ]) 287 fi 288 if test "$def_sdl_image" = "yes"; then 289 # checking for SDL_image-lib 290 AC_CHECK_LIB([SDL_image], [main], FOUND_SDL_image=yes) 291 if test "$FOUND_SDL_image" = "yes" ; then 292 LIBS="$LIBS -lSDL_image" 293 else 294 echo "------------------" 295 echo "SDL_image library not found." 296 echo "please install the SDL_image library, which can be found at http://www.libsdl.org/projects/SDL_image/" 297 echo "------------------" 298 exit -1 299 fi 300 fi 301 302 303 if test "$def_sdl_image" = "no"; then 304 ## checking for libjpeg 305 AC_CHECK_HEADERS(jpeglib.h ,jpegHeader="yes", 306 jpegHeader="no") 307 if test $jpegHeader = "no"; then 308 echo " not including jpeg." 309 else 310 AC_CHECK_LIB([jpeg], [main], FOUND_jpeg=yes) 311 if test "$FOUND_jpeg" = "yes" ; then 312 LIBS="$LIBS -ljpeg" 313 else 314 echo "------------------" 315 echo "jpeg library not found." 316 echo "please install the jpeg library from the Independent JPEG Group, which can be found at http://www.ijg.org" 317 echo "------------------" 318 exit -1 319 fi 320 fi 321 322 ## checking for libpng 323 AC_CHECK_HEADERS(png.h ,pngHeader="yes", 324 pngHeader="no") 325 if test $pngHeader = "no"; then 326 echo " not including png." 327 else 328 AC_CHECK_LIB([png], [main], FOUND_png=yes) 329 if test "$FOUND_png" = "yes" ; then 330 LIBS="$LIBS -lpng" 331 else 332 echo "------------------" 333 echo "png library not found." 334 echo "please install the png library, which can be found at http://libpng.org/pub/png/libpng.html" 335 echo "------------------" 336 exit -1 337 fi 338 fi 339 fi 340 341 ## checking for GTK 342 if test "$def_gtk" = yes; then 343 344 #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no) 345 AC_MSG_CHECKING([for gtk2.0]) 346 if `pkg-config --exists gtk+-2.0`; then 347 echo "yes" 348 have_gtk2=yes 349 GTK2_LIBS=`pkg-config --libs gtk+-2.0` 350 GTK2_CFLAGS=`pkg-config --cflags gtk+-2.0` 351 AC_DEFINE_UNQUOTED(HAVE_GTK2, 1, [if we have GTK2]) 352 else 353 echo "no" 354 fi 355 356 fi 357 AC_SUBST(GTK2_LIBS) 358 AC_SUBST(GTK2_CFLAGS) 359 AM_CONDITIONAL(HAVE_GTK2, test x$have_gtk2 = xyes) 360 202 361 203 362 204 363 #checking for pthread libs 205 AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes) 206 if test "$FOUND_pthread" = "yes" ; then 207 LIBS="$LIBS -lpthread" 208 fi 209 210 364 # AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes) 365 # if test "$FOUND_pthread" = "yes" ; then 366 # LIBS="$LIBS -lpthread" 367 # fi 211 368 212 369 213 370 # FIXME: Replace `main' with a function in `-lm': 214 AC_CHECK_LIB([m], [main]) 215 216 LIBS="$LIBS `pkg-config --libs gtk+-2.0`" 217 218 371 AC_CHECK_LIB([m], [main]) 372 373 219 374 # Checks for header files. 220 375 AC_HEADER_STDC … … 229 384 230 385 AC_CONFIG_FILES([Makefile 231 console/Makefile232 gui/Makefile386 src/console/Makefile 387 src/gui/Makefile 233 388 src/Makefile 234 importer/Makefile])389 src/importer/Makefile]) 235 390 AC_OUTPUT -
orxonox/branches/sound/src/Makefile
r3179 r3238 1 # Makefile.in generated by automake 1.8. 2from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # src/Makefile. Generated from Makefile.in by configure. 3 3 … … 38 38 PRE_UNINSTALL = : 39 39 POST_UNINSTALL = : 40 host_triplet = i686-pc-linux-gnu 40 41 bin_PROGRAMS = orxonox$(EXEEXT) sound$(EXEEXT) 41 42 subdir = src … … 49 50 CONFIG_HEADER = $(top_builddir)/config.h 50 51 CONFIG_CLEAN_FILES = 51 am__installdirs = $(DESTDIR)$(bindir)52 am__installdirs = "$(DESTDIR)$(bindir)" 52 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 53 54 PROGRAMS = $(bin_PROGRAMS) 54 55 am_orxonox_OBJECTS = orxonox.$(OBJEXT) world.$(OBJEXT) \ 55 player.$(OBJEXT) data_tank.$(OBJEXT) world_entity.$(OBJEXT) \56 vector.$(OBJEXT) camera.$(OBJEXT) collision.$(OBJEXT) \56 player.$(OBJEXT) collision.$(OBJEXT) data_tank.$(OBJEXT) \ 57 world_entity.$(OBJEXT) vector.$(OBJEXT) camera.$(OBJEXT) \ 57 58 command_node.$(OBJEXT) ini_parser.$(OBJEXT) keynames.$(OBJEXT) \ 58 59 track.$(OBJEXT) base_entity.$(OBJEXT) game_loader.$(OBJEXT) \ 59 campaign.$(OBJEXT) story_entity.$(OBJEXT) 60 campaign.$(OBJEXT) story_entity.$(OBJEXT) \ 61 environment.$(OBJEXT) object.$(OBJEXT) array.$(OBJEXT) \ 62 material.$(OBJEXT) list.$(OBJEXT) 60 63 orxonox_OBJECTS = $(am_orxonox_OBJECTS) 61 64 orxonox_LDADD = $(LDADD) … … 66 69 depcomp = $(SHELL) $(top_srcdir)/depcomp 67 70 am__depfiles_maybe = depfiles 68 DEP_FILES = ./$(DEPDIR)/ base_entity.Po \69 ./$(DEPDIR)/ camera.Po ./$(DEPDIR)/campaign.Po \70 ./$(DEPDIR)/c ollision.Po \71 DEP_FILES = ./$(DEPDIR)/array.Po \ 72 ./$(DEPDIR)/base_entity.Po ./$(DEPDIR)/camera.Po \ 73 ./$(DEPDIR)/campaign.Po ./$(DEPDIR)/collision.Po \ 71 74 ./$(DEPDIR)/command_node.Po \ 72 75 ./$(DEPDIR)/data_tank.Po \ 76 ./$(DEPDIR)/environment.Po \ 73 77 ./$(DEPDIR)/game_loader.Po \ 74 78 ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \ 75 ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/player.Po \ 76 ./$(DEPDIR)/sound_control.Po \ 79 ./$(DEPDIR)/list.Po ./$(DEPDIR)/material.Po \ 80 ./$(DEPDIR)/object.Po ./$(DEPDIR)/orxonox.Po \ 81 ./$(DEPDIR)/player.Po ./$(DEPDIR)/sound_control.Po \ 77 82 ./$(DEPDIR)/sound_test.Po \ 78 83 ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/track.Po \ … … 86 91 SOURCES = $(orxonox_SOURCES) $(sound_SOURCES) 87 92 DIST_SOURCES = $(orxonox_SOURCES) $(sound_SOURCES) 93 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ 94 html-recursive info-recursive install-data-recursive \ 95 install-exec-recursive install-info-recursive \ 96 install-recursive installcheck-recursive installdirs-recursive \ 97 pdf-recursive ps-recursive uninstall-info-recursive \ 98 uninstall-recursive 88 99 HEADERS = $(noinst_HEADERS) 89 100 ETAGS = etags 90 101 CTAGS = ctags 102 DIST_SUBDIRS = . importer gui console 91 103 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 92 ACLOCAL = aclocal-1.8104 ACLOCAL = ${SHELL} /home/bensch/svn/orxonox/branches/sound/missing --run aclocal-1.8 93 105 AMDEP_FALSE = # 94 106 AMDEP_TRUE = 95 AMTAR = tar96 AUTOCONF = autoconf97 AUTOHEADER = autoheader98 AUTOMAKE = automake-1.8107 AMTAR = ${SHELL} /home/bensch/svn/orxonox/branches/sound/missing --run tar 108 AUTOCONF = ${SHELL} /home/bensch/svn/orxonox/branches/sound/missing --run autoconf 109 AUTOHEADER = ${SHELL} /home/bensch/svn/orxonox/branches/sound/missing --run autoheader 110 AUTOMAKE = ${SHELL} /home/bensch/svn/orxonox/branches/sound/missing --run automake-1.8 99 111 AWK = gawk 100 112 CC = gcc … … 102 114 CFLAGS = -g -O2 103 115 CPP = gcc -E 104 CPPFLAGS = 116 CPPFLAGS = -I/usr/X11R6/include 105 117 CXX = g++ 106 118 CXXDEPMODE = depmode=gcc3 107 119 CXXFLAGS = -g -O2 108 120 CYGPATH_W = echo 121 DEBUG = 1 109 122 DEFS = -DHAVE_CONFIG_H 110 123 DEPDIR = .deps 124 DOXYGEN = /usr/bin/doxygen 125 DOXYGEN_FALSE = # 126 DOXYGEN_TRUE = 111 127 ECHO_C = 112 128 ECHO_N = -n 113 129 ECHO_T = 114 130 EGREP = grep -E 115 EXEEXT = .exe 131 EXEEXT = 132 GTK2_CFLAGS = -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include 133 GTK2_LIBS = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 134 HAVE_GTK2_FALSE = # 135 HAVE_GTK2_TRUE = 116 136 INSTALL_DATA = ${INSTALL} -m 644 117 137 INSTALL_PROGRAM = ${INSTALL} 118 138 INSTALL_SCRIPT = ${INSTALL} 119 139 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s 120 LDFLAGS = 140 LDFLAGS = -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib 121 141 LIBOBJS = 122 LIBS = -lm -l opengl32 -lGLU32 -lmingw32 -lsdlmain -lsdl -lSDL_mixer -Lc:/Prog/Utils/MinGW/lib -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv142 LIBS = -lm -lGL -lGLU -lSDL -lSDL_mixer -lSDL_image 123 143 LTLIBOBJS = 124 MAKEINFO = makeinfo125 MSBITFIELDS = -mms-bitfields144 MAKEINFO = ${SHELL} /home/bensch/svn/orxonox/branches/sound/missing --run makeinfo 145 MSBITFIELDS = 126 146 OBJEXT = o 127 147 PACKAGE = orxonox 128 148 PACKAGE_BUGREPORT = orxonox-dev@mail.datacore.ch 129 149 PACKAGE_NAME = orxonox 130 PACKAGE_STRING = orxonox 0. 1-pre-alpha150 PACKAGE_STRING = orxonox 0.2.0_alpha-r1 131 151 PACKAGE_TARNAME = orxonox 132 PACKAGE_VERSION = 0. 1-pre-alpha152 PACKAGE_VERSION = 0.2.0_alpha-r1 133 153 PATH_SEPARATOR = : 134 154 SET_MAKE = 135 155 SHELL = /bin/sh 136 156 STRIP = 137 VERSION = 0. 1-pre-alpha157 VERSION = 0.2.0_alpha-r1 138 158 ac_ct_CC = gcc 139 ac_ct_CXX = g++159 ac_ct_CXX = 140 160 ac_ct_STRIP = 141 161 am__fastdepCC_FALSE = # … … 147 167 am__quote = 148 168 bindir = ${exec_prefix}/bin 169 build = i686-pc-linux-gnu 149 170 build_alias = 171 build_cpu = i686 172 build_os = linux-gnu 173 build_vendor = pc 150 174 datadir = ${prefix}/share 151 175 exec_prefix = ${prefix} 176 host = i686-pc-linux-gnu 152 177 host_alias = 178 host_cpu = i686 179 host_os = linux-gnu 180 host_vendor = pc 153 181 includedir = ${prefix}/include 154 182 infodir = ${prefix}/info 155 install_sh = / c/Documents and Settings/bensch/Desktop/svn/orxonox/branches/sound/install-sh183 install_sh = /home/bensch/svn/orxonox/branches/sound/install-sh 156 184 libdir = ${exec_prefix}/lib 157 185 libexecdir = ${exec_prefix}/libexec … … 165 193 sharedstatedir = ${prefix}/com 166 194 sysconfdir = ${prefix}/etc 195 target = i686-pc-linux-gnu 167 196 target_alias = 168 AM_CXXFLAGS = "-I/usr/X11R6/include" 169 AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS) 170 orxonox_SOURCES = orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc game_loader.cc campaign.cc story_entity.cc 197 target_cpu = i686 198 target_os = linux-gnu 199 target_vendor = pc 200 201 #AM_CXXFLAGS="" 202 AM_LDFLAGS = $(MWINDOWS) 171 203 sound_SOURCES = sound_test.cc sound_control.cc 172 noinst_HEADERS = ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h 173 all: all-am 204 orxonox_SOURCES = orxonox.cc \ 205 world.cc \ 206 player.cc \ 207 collision.cc \ 208 data_tank.cc \ 209 world_entity.cc \ 210 vector.cc \ 211 camera.cc \ 212 command_node.cc \ 213 ini_parser.cc \ 214 keynames.cc \ 215 track.cc \ 216 base_entity.cc \ 217 game_loader.cc \ 218 campaign.cc \ 219 story_entity.cc \ 220 environment.cc \ 221 importer/object.cc \ 222 importer/array.cc \ 223 importer/material.cc \ 224 list.cc 225 226 noinst_HEADERS = ability.h \ 227 data_tank.h \ 228 collision.h \ 229 npc.h \ 230 stdincl.h \ 231 ai.h \ 232 environment.h \ 233 orxonox.h \ 234 synchronisable.h \ 235 base_entity.h \ 236 error.h \ 237 player.h \ 238 track.h \ 239 camera.h \ 240 ini_parser.h \ 241 power_up.h \ 242 vector.h \ 243 keynames.h \ 244 proto_class.h \ 245 world.h \ 246 command_node.h \ 247 list.h \ 248 shoot_laser.h \ 249 world_entity.h \ 250 coordinates.h \ 251 message_structures.h \ 252 shoot_rocket.h \ 253 list_template.h \ 254 story_entity.h \ 255 story_def.h \ 256 game_loader.h \ 257 campaign.h 258 259 EXTRA_DIST = orxonox.conf 260 #GTK_PROGS = 261 262 ### GTK_RELATED 263 GTK_PROGS = console 264 SUBDIRS = . \ 265 importer \ 266 gui \ 267 $(GTK_PROGS) 268 269 all: all-recursive 174 270 175 271 .SUFFIXES: … … 184 280 esac; \ 185 281 done; \ 186 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/Makefile'; \282 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ 187 283 cd $(top_srcdir) && \ 188 $(AUTOMAKE) -- gnusrc/Makefile284 $(AUTOMAKE) --foreign src/Makefile 189 285 .PRECIOUS: Makefile 190 286 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 206 302 install-binPROGRAMS: $(bin_PROGRAMS) 207 303 @$(NORMAL_INSTALL) 208 $(mkdir_p) $(DESTDIR)$(bindir)304 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" 209 305 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 210 306 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 212 308 ; then \ 213 309 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 214 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \215 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f|| exit 1; \310 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ 311 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ 216 312 else :; fi; \ 217 313 done … … 221 317 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 222 318 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 223 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \224 rm -f $(DESTDIR)$(bindir)/$$f; \319 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ 320 rm -f "$(DESTDIR)$(bindir)/$$f"; \ 225 321 done 226 322 … … 240 336 -rm -f *.tab.c 241 337 338 include ./$(DEPDIR)/array.Po 242 339 include ./$(DEPDIR)/base_entity.Po 243 340 include ./$(DEPDIR)/camera.Po … … 246 343 include ./$(DEPDIR)/command_node.Po 247 344 include ./$(DEPDIR)/data_tank.Po 345 include ./$(DEPDIR)/environment.Po 248 346 include ./$(DEPDIR)/game_loader.Po 249 347 include ./$(DEPDIR)/ini_parser.Po 250 348 include ./$(DEPDIR)/keynames.Po 349 include ./$(DEPDIR)/list.Po 350 include ./$(DEPDIR)/material.Po 351 include ./$(DEPDIR)/object.Po 251 352 include ./$(DEPDIR)/orxonox.Po 252 353 include ./$(DEPDIR)/player.Po … … 274 375 # $(CXXDEPMODE) $(depcomp) \ 275 376 # $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` 377 378 object.o: importer/object.cc 379 if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object.o -MD -MP -MF "$(DEPDIR)/object.Tpo" -c -o object.o `test -f 'importer/object.cc' || echo '$(srcdir)/'`importer/object.cc; \ 380 then mv -f "$(DEPDIR)/object.Tpo" "$(DEPDIR)/object.Po"; else rm -f "$(DEPDIR)/object.Tpo"; exit 1; fi 381 # source='importer/object.cc' object='object.o' libtool=no \ 382 # depfile='$(DEPDIR)/object.Po' tmpdepfile='$(DEPDIR)/object.TPo' \ 383 # $(CXXDEPMODE) $(depcomp) \ 384 # $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o object.o `test -f 'importer/object.cc' || echo '$(srcdir)/'`importer/object.cc 385 386 object.obj: importer/object.cc 387 if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object.obj -MD -MP -MF "$(DEPDIR)/object.Tpo" -c -o object.obj `if test -f 'importer/object.cc'; then $(CYGPATH_W) 'importer/object.cc'; else $(CYGPATH_W) '$(srcdir)/importer/object.cc'; fi`; \ 388 then mv -f "$(DEPDIR)/object.Tpo" "$(DEPDIR)/object.Po"; else rm -f "$(DEPDIR)/object.Tpo"; exit 1; fi 389 # source='importer/object.cc' object='object.obj' libtool=no \ 390 # depfile='$(DEPDIR)/object.Po' tmpdepfile='$(DEPDIR)/object.TPo' \ 391 # $(CXXDEPMODE) $(depcomp) \ 392 # $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o object.obj `if test -f 'importer/object.cc'; then $(CYGPATH_W) 'importer/object.cc'; else $(CYGPATH_W) '$(srcdir)/importer/object.cc'; fi` 393 394 array.o: importer/array.cc 395 if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT array.o -MD -MP -MF "$(DEPDIR)/array.Tpo" -c -o array.o `test -f 'importer/array.cc' || echo '$(srcdir)/'`importer/array.cc; \ 396 then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi 397 # source='importer/array.cc' object='array.o' libtool=no \ 398 # depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' \ 399 # $(CXXDEPMODE) $(depcomp) \ 400 # $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.o `test -f 'importer/array.cc' || echo '$(srcdir)/'`importer/array.cc 401 402 array.obj: importer/array.cc 403 if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT array.obj -MD -MP -MF "$(DEPDIR)/array.Tpo" -c -o array.obj `if test -f 'importer/array.cc'; then $(CYGPATH_W) 'importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/importer/array.cc'; fi`; \ 404 then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi 405 # source='importer/array.cc' object='array.obj' libtool=no \ 406 # depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' \ 407 # $(CXXDEPMODE) $(depcomp) \ 408 # $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.obj `if test -f 'importer/array.cc'; then $(CYGPATH_W) 'importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/importer/array.cc'; fi` 409 410 material.o: importer/material.cc 411 if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT material.o -MD -MP -MF "$(DEPDIR)/material.Tpo" -c -o material.o `test -f 'importer/material.cc' || echo '$(srcdir)/'`importer/material.cc; \ 412 then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi 413 # source='importer/material.cc' object='material.o' libtool=no \ 414 # depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' \ 415 # $(CXXDEPMODE) $(depcomp) \ 416 # $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.o `test -f 'importer/material.cc' || echo '$(srcdir)/'`importer/material.cc 417 418 material.obj: importer/material.cc 419 if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT material.obj -MD -MP -MF "$(DEPDIR)/material.Tpo" -c -o material.obj `if test -f 'importer/material.cc'; then $(CYGPATH_W) 'importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/importer/material.cc'; fi`; \ 420 then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi 421 # source='importer/material.cc' object='material.obj' libtool=no \ 422 # depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' \ 423 # $(CXXDEPMODE) $(depcomp) \ 424 # $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.obj `if test -f 'importer/material.cc'; then $(CYGPATH_W) 'importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/importer/material.cc'; fi` 276 425 uninstall-info-am: 426 427 # This directory's subdirectories are mostly independent; you can cd 428 # into them and run `make' without going through this Makefile. 429 # To change the values of `make' variables: instead of editing Makefiles, 430 # (1) if the variable is set in `config.status', edit `config.status' 431 # (which will cause the Makefiles to be regenerated when you run `make'); 432 # (2) otherwise, pass the desired values on the `make' command line. 433 $(RECURSIVE_TARGETS): 434 @set fnord $$MAKEFLAGS; amf=$$2; \ 435 dot_seen=no; \ 436 target=`echo $@ | sed s/-recursive//`; \ 437 list='$(SUBDIRS)'; for subdir in $$list; do \ 438 echo "Making $$target in $$subdir"; \ 439 if test "$$subdir" = "."; then \ 440 dot_seen=yes; \ 441 local_target="$$target-am"; \ 442 else \ 443 local_target="$$target"; \ 444 fi; \ 445 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 446 || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ 447 done; \ 448 if test "$$dot_seen" = "no"; then \ 449 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ 450 fi; test -z "$$fail" 451 452 mostlyclean-recursive clean-recursive distclean-recursive \ 453 maintainer-clean-recursive: 454 @set fnord $$MAKEFLAGS; amf=$$2; \ 455 dot_seen=no; \ 456 case "$@" in \ 457 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ 458 *) list='$(SUBDIRS)' ;; \ 459 esac; \ 460 rev=''; for subdir in $$list; do \ 461 if test "$$subdir" = "."; then :; else \ 462 rev="$$subdir $$rev"; \ 463 fi; \ 464 done; \ 465 rev="$$rev ."; \ 466 target=`echo $@ | sed s/-recursive//`; \ 467 for subdir in $$rev; do \ 468 echo "Making $$target in $$subdir"; \ 469 if test "$$subdir" = "."; then \ 470 local_target="$$target-am"; \ 471 else \ 472 local_target="$$target"; \ 473 fi; \ 474 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 475 || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ 476 done && test -z "$$fail" 477 tags-recursive: 478 list='$(SUBDIRS)'; for subdir in $$list; do \ 479 test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ 480 done 481 ctags-recursive: 482 list='$(SUBDIRS)'; for subdir in $$list; do \ 483 test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ 484 done 277 485 278 486 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) … … 286 494 tags: TAGS 287 495 288 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \496 TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ 289 497 $(TAGS_FILES) $(LISP) 290 498 tags=; \ 291 499 here=`pwd`; \ 500 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ 501 include_option=--etags-include; \ 502 empty_fix=.; \ 503 else \ 504 include_option=--include; \ 505 empty_fix=; \ 506 fi; \ 507 list='$(SUBDIRS)'; for subdir in $$list; do \ 508 if test "$$subdir" = .; then :; else \ 509 test ! -f $$subdir/TAGS || \ 510 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 511 fi; \ 512 done; \ 292 513 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ 293 514 unique=`for i in $$list; do \ … … 296 517 $(AWK) ' { files[$$0] = 1; } \ 297 518 END { for (i in files) print i; }'`; \ 298 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 299 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 300 $$tags $$unique 519 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 520 test -n "$$unique" || unique=$$empty_fix; \ 521 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 522 $$tags $$unique; \ 523 fi 301 524 ctags: CTAGS 302 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \525 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ 303 526 $(TAGS_FILES) $(LISP) 304 527 tags=; \ … … 349 572 fi; \ 350 573 done 574 list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ 575 if test "$$subdir" = .; then :; else \ 576 test -d "$(distdir)/$$subdir" \ 577 || mkdir "$(distdir)/$$subdir" \ 578 || exit 1; \ 579 (cd $$subdir && \ 580 $(MAKE) $(AM_MAKEFLAGS) \ 581 top_distdir="../$(top_distdir)" \ 582 distdir="../$(distdir)/$$subdir" \ 583 distdir) \ 584 || exit 1; \ 585 fi; \ 586 done 351 587 check-am: all-am 352 check: check- am588 check: check-recursive 353 589 all-am: Makefile $(PROGRAMS) $(HEADERS) 354 installdirs: 355 $(mkdir_p) $(DESTDIR)$(bindir) 356 install: install-am 357 install-exec: install-exec-am 358 install-data: install-data-am 359 uninstall: uninstall-am 590 installdirs: installdirs-recursive 591 installdirs-am: 592 for dir in "$(DESTDIR)$(bindir)"; do \ 593 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 594 done 595 install: install-recursive 596 install-exec: install-exec-recursive 597 install-data: install-data-recursive 598 uninstall: uninstall-recursive 360 599 361 600 install-am: all-am 362 601 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am 363 602 364 installcheck: installcheck- am603 installcheck: installcheck-recursive 365 604 install-strip: 366 605 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ … … 378 617 @echo "This command is intended for maintainers to use" 379 618 @echo "it deletes files that may require special tools to rebuild." 380 clean: clean- am619 clean: clean-recursive 381 620 382 621 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am 383 622 384 distclean: distclean- am623 distclean: distclean-recursive 385 624 -rm -rf ./$(DEPDIR) 386 625 -rm -f Makefile … … 388 627 distclean-tags 389 628 390 dvi: dvi- am629 dvi: dvi-recursive 391 630 392 631 dvi-am: 393 632 394 html: html- am395 396 info: info- am633 html: html-recursive 634 635 info: info-recursive 397 636 398 637 info-am: … … 402 641 install-exec-am: install-binPROGRAMS 403 642 404 install-info: install-info- am643 install-info: install-info-recursive 405 644 406 645 install-man: … … 408 647 installcheck-am: 409 648 410 maintainer-clean: maintainer-clean- am649 maintainer-clean: maintainer-clean-recursive 411 650 -rm -rf ./$(DEPDIR) 412 651 -rm -f Makefile 413 652 maintainer-clean-am: distclean-am maintainer-clean-generic 414 653 415 mostlyclean: mostlyclean- am654 mostlyclean: mostlyclean-recursive 416 655 417 656 mostlyclean-am: mostlyclean-compile mostlyclean-generic 418 657 419 pdf: pdf- am658 pdf: pdf-recursive 420 659 421 660 pdf-am: 422 661 423 ps: ps- am662 ps: ps-recursive 424 663 425 664 ps-am: … … 427 666 uninstall-am: uninstall-binPROGRAMS uninstall-info-am 428 667 429 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ 430 clean-generic ctags distclean distclean-compile \ 431 distclean-generic distclean-tags distdir dvi dvi-am html \ 668 uninstall-info: uninstall-info-recursive 669 670 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ 671 clean clean-binPROGRAMS clean-generic clean-recursive ctags \ 672 ctags-recursive distclean distclean-compile distclean-generic \ 673 distclean-recursive distclean-tags distdir dvi dvi-am html \ 432 674 html-am info info-am install install-am install-binPROGRAMS \ 433 675 install-data install-data-am install-exec install-exec-am \ 434 676 install-info install-info-am install-man install-strip \ 435 installcheck installcheck-am installdirs maintainer-clean \ 436 maintainer-clean-generic mostlyclean mostlyclean-compile \ 437 mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ 438 uninstall-am uninstall-binPROGRAMS uninstall-info-am 439 440 441 # uncomment the following if bencoder requires the math library 677 installcheck installcheck-am installdirs installdirs-am \ 678 maintainer-clean maintainer-clean-generic \ 679 maintainer-clean-recursive mostlyclean mostlyclean-compile \ 680 mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \ 681 tags tags-recursive uninstall uninstall-am \ 682 uninstall-binPROGRAMS uninstall-info-am 683 684 685 # uncomment the following if orxonox requires the math library 442 686 #orxonox_LDADD=-lm 443 687 -
orxonox/branches/sound/src/Makefile.am
r2854 r3238 1 AM_CXXFLAGS="-I/usr/X11R6/include"2 AM_LDFLAGS= "-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib -lXt -lX11"$(MWINDOWS)1 #AM_CXXFLAGS="" 2 AM_LDFLAGS= $(MWINDOWS) 3 3 4 4 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include" … … 6 6 7 7 bin_PROGRAMS=orxonox sound 8 orxonox_SOURCES=orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc game_loader.cc campaign.cc story_entity.cc9 8 10 9 sound_SOURCES=sound_test.cc sound_control.cc 11 10 12 noinst_HEADERS=ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h 11 orxonox_SOURCES= orxonox.cc \ 12 world.cc \ 13 player.cc \ 14 collision.cc \ 15 data_tank.cc \ 16 world_entity.cc \ 17 vector.cc \ 18 camera.cc \ 19 command_node.cc \ 20 ini_parser.cc \ 21 keynames.cc \ 22 track.cc \ 23 base_entity.cc \ 24 game_loader.cc \ 25 campaign.cc \ 26 story_entity.cc \ 27 environment.cc \ 28 importer/object.cc \ 29 importer/array.cc \ 30 importer/material.cc \ 31 list.cc 13 32 33 noinst_HEADERS = ability.h \ 34 data_tank.h \ 35 collision.h \ 36 npc.h \ 37 stdincl.h \ 38 ai.h \ 39 environment.h \ 40 orxonox.h \ 41 synchronisable.h \ 42 base_entity.h \ 43 error.h \ 44 player.h \ 45 track.h \ 46 camera.h \ 47 ini_parser.h \ 48 power_up.h \ 49 vector.h \ 50 keynames.h \ 51 proto_class.h \ 52 world.h \ 53 command_node.h \ 54 list.h \ 55 shoot_laser.h \ 56 world_entity.h \ 57 coordinates.h \ 58 message_structures.h \ 59 shoot_rocket.h \ 60 list_template.h \ 61 story_entity.h \ 62 story_def.h \ 63 game_loader.h \ 64 campaign.h 14 65 15 # uncomment the following if bencoder requires the math library 66 ## orxonox.conf will be used from home-dir instead. 67 EXTRA_DIST = orxonox.conf 68 69 ### GTK_RELATED 70 if HAVE_GTK2 71 GTK_PROGS =console 72 else 73 GTK_PROGS = 74 endif 75 76 SUBDIRS = . \ 77 importer \ 78 gui \ 79 $(GTK_PROGS) 80 81 # uncomment the following if orxonox requires the math library 16 82 #orxonox_LDADD=-lm 17 83 -
orxonox/branches/sound/src/Makefile.in
r3179 r3238 1 # Makefile.in generated by automake 1.8. 2from Makefile.am.1 # Makefile.in generated by automake 1.8.5 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 38 38 PRE_UNINSTALL = : 39 39 POST_UNINSTALL = : 40 host_triplet = @host@ 40 41 bin_PROGRAMS = orxonox$(EXEEXT) sound$(EXEEXT) 41 42 subdir = src … … 49 50 CONFIG_HEADER = $(top_builddir)/config.h 50 51 CONFIG_CLEAN_FILES = 51 am__installdirs = $(DESTDIR)$(bindir)52 am__installdirs = "$(DESTDIR)$(bindir)" 52 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 53 54 PROGRAMS = $(bin_PROGRAMS) 54 55 am_orxonox_OBJECTS = orxonox.$(OBJEXT) world.$(OBJEXT) \ 55 player.$(OBJEXT) data_tank.$(OBJEXT) world_entity.$(OBJEXT) \56 vector.$(OBJEXT) camera.$(OBJEXT) collision.$(OBJEXT) \56 player.$(OBJEXT) collision.$(OBJEXT) data_tank.$(OBJEXT) \ 57 world_entity.$(OBJEXT) vector.$(OBJEXT) camera.$(OBJEXT) \ 57 58 command_node.$(OBJEXT) ini_parser.$(OBJEXT) keynames.$(OBJEXT) \ 58 59 track.$(OBJEXT) base_entity.$(OBJEXT) game_loader.$(OBJEXT) \ 59 campaign.$(OBJEXT) story_entity.$(OBJEXT) 60 campaign.$(OBJEXT) story_entity.$(OBJEXT) \ 61 environment.$(OBJEXT) object.$(OBJEXT) array.$(OBJEXT) \ 62 material.$(OBJEXT) list.$(OBJEXT) 60 63 orxonox_OBJECTS = $(am_orxonox_OBJECTS) 61 64 orxonox_LDADD = $(LDADD) … … 66 69 depcomp = $(SHELL) $(top_srcdir)/depcomp 67 70 am__depfiles_maybe = depfiles 68 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ base_entity.Po \69 @AMDEP_TRUE@ ./$(DEPDIR)/ camera.Po ./$(DEPDIR)/campaign.Po \70 @AMDEP_TRUE@ ./$(DEPDIR)/c ollision.Po \71 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po \ 72 @AMDEP_TRUE@ ./$(DEPDIR)/base_entity.Po ./$(DEPDIR)/camera.Po \ 73 @AMDEP_TRUE@ ./$(DEPDIR)/campaign.Po ./$(DEPDIR)/collision.Po \ 71 74 @AMDEP_TRUE@ ./$(DEPDIR)/command_node.Po \ 72 75 @AMDEP_TRUE@ ./$(DEPDIR)/data_tank.Po \ 76 @AMDEP_TRUE@ ./$(DEPDIR)/environment.Po \ 73 77 @AMDEP_TRUE@ ./$(DEPDIR)/game_loader.Po \ 74 78 @AMDEP_TRUE@ ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \ 75 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/player.Po \ 76 @AMDEP_TRUE@ ./$(DEPDIR)/sound_control.Po \ 79 @AMDEP_TRUE@ ./$(DEPDIR)/list.Po ./$(DEPDIR)/material.Po \ 80 @AMDEP_TRUE@ ./$(DEPDIR)/object.Po ./$(DEPDIR)/orxonox.Po \ 81 @AMDEP_TRUE@ ./$(DEPDIR)/player.Po ./$(DEPDIR)/sound_control.Po \ 77 82 @AMDEP_TRUE@ ./$(DEPDIR)/sound_test.Po \ 78 83 @AMDEP_TRUE@ ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/track.Po \ … … 86 91 SOURCES = $(orxonox_SOURCES) $(sound_SOURCES) 87 92 DIST_SOURCES = $(orxonox_SOURCES) $(sound_SOURCES) 93 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ 94 html-recursive info-recursive install-data-recursive \ 95 install-exec-recursive install-info-recursive \ 96 install-recursive installcheck-recursive installdirs-recursive \ 97 pdf-recursive ps-recursive uninstall-info-recursive \ 98 uninstall-recursive 88 99 HEADERS = $(noinst_HEADERS) 89 100 ETAGS = etags 90 101 CTAGS = ctags 102 DIST_SUBDIRS = . importer gui console 91 103 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 92 104 ACLOCAL = @ACLOCAL@ … … 107 119 CXXFLAGS = @CXXFLAGS@ 108 120 CYGPATH_W = @CYGPATH_W@ 121 DEBUG = @DEBUG@ 109 122 DEFS = @DEFS@ 110 123 DEPDIR = @DEPDIR@ 124 DOXYGEN = @DOXYGEN@ 125 DOXYGEN_FALSE = @DOXYGEN_FALSE@ 126 DOXYGEN_TRUE = @DOXYGEN_TRUE@ 111 127 ECHO_C = @ECHO_C@ 112 128 ECHO_N = @ECHO_N@ … … 114 130 EGREP = @EGREP@ 115 131 EXEEXT = @EXEEXT@ 132 GTK2_CFLAGS = @GTK2_CFLAGS@ 133 GTK2_LIBS = @GTK2_LIBS@ 134 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 135 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ 116 136 INSTALL_DATA = @INSTALL_DATA@ 117 137 INSTALL_PROGRAM = @INSTALL_PROGRAM@ … … 147 167 am__quote = @am__quote@ 148 168 bindir = @bindir@ 169 build = @build@ 149 170 build_alias = @build_alias@ 171 build_cpu = @build_cpu@ 172 build_os = @build_os@ 173 build_vendor = @build_vendor@ 150 174 datadir = @datadir@ 151 175 exec_prefix = @exec_prefix@ 176 host = @host@ 152 177 host_alias = @host_alias@ 178 host_cpu = @host_cpu@ 179 host_os = @host_os@ 180 host_vendor = @host_vendor@ 153 181 includedir = @includedir@ 154 182 infodir = @infodir@ … … 165 193 sharedstatedir = @sharedstatedir@ 166 194 sysconfdir = @sysconfdir@ 195 target = @target@ 167 196 target_alias = @target_alias@ 168 AM_CXXFLAGS = "-I/usr/X11R6/include" 169 AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS) 170 orxonox_SOURCES = orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc game_loader.cc campaign.cc story_entity.cc 197 target_cpu = @target_cpu@ 198 target_os = @target_os@ 199 target_vendor = @target_vendor@ 200 201 #AM_CXXFLAGS="" 202 AM_LDFLAGS = $(MWINDOWS) 171 203 sound_SOURCES = sound_test.cc sound_control.cc 172 noinst_HEADERS = ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h 173 all: all-am 204 orxonox_SOURCES = orxonox.cc \ 205 world.cc \ 206 player.cc \ 207 collision.cc \ 208 data_tank.cc \ 209 world_entity.cc \ 210 vector.cc \ 211 camera.cc \ 212 command_node.cc \ 213 ini_parser.cc \ 214 keynames.cc \ 215 track.cc \ 216 base_entity.cc \ 217 game_loader.cc \ 218 campaign.cc \ 219 story_entity.cc \ 220 environment.cc \ 221 importer/object.cc \ 222 importer/array.cc \ 223 importer/material.cc \ 224 list.cc 225 226 noinst_HEADERS = ability.h \ 227 data_tank.h \ 228 collision.h \ 229 npc.h \ 230 stdincl.h \ 231 ai.h \ 232 environment.h \ 233 orxonox.h \ 234 synchronisable.h \ 235 base_entity.h \ 236 error.h \ 237 player.h \ 238 track.h \ 239 camera.h \ 240 ini_parser.h \ 241 power_up.h \ 242 vector.h \ 243 keynames.h \ 244 proto_class.h \ 245 world.h \ 246 command_node.h \ 247 list.h \ 248 shoot_laser.h \ 249 world_entity.h \ 250 coordinates.h \ 251 message_structures.h \ 252 shoot_rocket.h \ 253 list_template.h \ 254 story_entity.h \ 255 story_def.h \ 256 game_loader.h \ 257 campaign.h 258 259 EXTRA_DIST = orxonox.conf 260 @HAVE_GTK2_FALSE@GTK_PROGS = 261 262 ### GTK_RELATED 263 @HAVE_GTK2_TRUE@GTK_PROGS = console 264 SUBDIRS = . \ 265 importer \ 266 gui \ 267 $(GTK_PROGS) 268 269 all: all-recursive 174 270 175 271 .SUFFIXES: … … 184 280 esac; \ 185 281 done; \ 186 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/Makefile'; \282 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ 187 283 cd $(top_srcdir) && \ 188 $(AUTOMAKE) -- gnusrc/Makefile284 $(AUTOMAKE) --foreign src/Makefile 189 285 .PRECIOUS: Makefile 190 286 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 206 302 install-binPROGRAMS: $(bin_PROGRAMS) 207 303 @$(NORMAL_INSTALL) 208 $(mkdir_p) $(DESTDIR)$(bindir)304 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" 209 305 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 210 306 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 212 308 ; then \ 213 309 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 214 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \215 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f|| exit 1; \310 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ 311 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ 216 312 else :; fi; \ 217 313 done … … 221 317 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 222 318 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 223 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \224 rm -f $(DESTDIR)$(bindir)/$$f; \319 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ 320 rm -f "$(DESTDIR)$(bindir)/$$f"; \ 225 321 done 226 322 … … 240 336 -rm -f *.tab.c 241 337 338 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@ 242 339 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_entity.Po@am__quote@ 243 340 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@ … … 246 343 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command_node.Po@am__quote@ 247 344 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_tank.Po@am__quote@ 345 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@ 248 346 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@ 249 347 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@ 250 348 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keynames.Po@am__quote@ 349 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@ 350 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@ 351 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@ 251 352 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@ 252 353 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@ … … 274 375 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 275 376 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` 377 378 object.o: importer/object.cc 379 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object.o -MD -MP -MF "$(DEPDIR)/object.Tpo" -c -o object.o `test -f 'importer/object.cc' || echo '$(srcdir)/'`importer/object.cc; \ 380 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/object.Tpo" "$(DEPDIR)/object.Po"; else rm -f "$(DEPDIR)/object.Tpo"; exit 1; fi 381 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='importer/object.cc' object='object.o' libtool=no @AMDEPBACKSLASH@ 382 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/object.Po' tmpdepfile='$(DEPDIR)/object.TPo' @AMDEPBACKSLASH@ 383 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 384 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o object.o `test -f 'importer/object.cc' || echo '$(srcdir)/'`importer/object.cc 385 386 object.obj: importer/object.cc 387 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object.obj -MD -MP -MF "$(DEPDIR)/object.Tpo" -c -o object.obj `if test -f 'importer/object.cc'; then $(CYGPATH_W) 'importer/object.cc'; else $(CYGPATH_W) '$(srcdir)/importer/object.cc'; fi`; \ 388 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/object.Tpo" "$(DEPDIR)/object.Po"; else rm -f "$(DEPDIR)/object.Tpo"; exit 1; fi 389 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='importer/object.cc' object='object.obj' libtool=no @AMDEPBACKSLASH@ 390 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/object.Po' tmpdepfile='$(DEPDIR)/object.TPo' @AMDEPBACKSLASH@ 391 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 392 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o object.obj `if test -f 'importer/object.cc'; then $(CYGPATH_W) 'importer/object.cc'; else $(CYGPATH_W) '$(srcdir)/importer/object.cc'; fi` 393 394 array.o: importer/array.cc 395 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT array.o -MD -MP -MF "$(DEPDIR)/array.Tpo" -c -o array.o `test -f 'importer/array.cc' || echo '$(srcdir)/'`importer/array.cc; \ 396 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi 397 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='importer/array.cc' object='array.o' libtool=no @AMDEPBACKSLASH@ 398 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@ 399 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 400 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.o `test -f 'importer/array.cc' || echo '$(srcdir)/'`importer/array.cc 401 402 array.obj: importer/array.cc 403 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT array.obj -MD -MP -MF "$(DEPDIR)/array.Tpo" -c -o array.obj `if test -f 'importer/array.cc'; then $(CYGPATH_W) 'importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/importer/array.cc'; fi`; \ 404 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi 405 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='importer/array.cc' object='array.obj' libtool=no @AMDEPBACKSLASH@ 406 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@ 407 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 408 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.obj `if test -f 'importer/array.cc'; then $(CYGPATH_W) 'importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/importer/array.cc'; fi` 409 410 material.o: importer/material.cc 411 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT material.o -MD -MP -MF "$(DEPDIR)/material.Tpo" -c -o material.o `test -f 'importer/material.cc' || echo '$(srcdir)/'`importer/material.cc; \ 412 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi 413 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='importer/material.cc' object='material.o' libtool=no @AMDEPBACKSLASH@ 414 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' @AMDEPBACKSLASH@ 415 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 416 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.o `test -f 'importer/material.cc' || echo '$(srcdir)/'`importer/material.cc 417 418 material.obj: importer/material.cc 419 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT material.obj -MD -MP -MF "$(DEPDIR)/material.Tpo" -c -o material.obj `if test -f 'importer/material.cc'; then $(CYGPATH_W) 'importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/importer/material.cc'; fi`; \ 420 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi 421 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='importer/material.cc' object='material.obj' libtool=no @AMDEPBACKSLASH@ 422 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' @AMDEPBACKSLASH@ 423 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 424 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.obj `if test -f 'importer/material.cc'; then $(CYGPATH_W) 'importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/importer/material.cc'; fi` 276 425 uninstall-info-am: 426 427 # This directory's subdirectories are mostly independent; you can cd 428 # into them and run `make' without going through this Makefile. 429 # To change the values of `make' variables: instead of editing Makefiles, 430 # (1) if the variable is set in `config.status', edit `config.status' 431 # (which will cause the Makefiles to be regenerated when you run `make'); 432 # (2) otherwise, pass the desired values on the `make' command line. 433 $(RECURSIVE_TARGETS): 434 @set fnord $$MAKEFLAGS; amf=$$2; \ 435 dot_seen=no; \ 436 target=`echo $@ | sed s/-recursive//`; \ 437 list='$(SUBDIRS)'; for subdir in $$list; do \ 438 echo "Making $$target in $$subdir"; \ 439 if test "$$subdir" = "."; then \ 440 dot_seen=yes; \ 441 local_target="$$target-am"; \ 442 else \ 443 local_target="$$target"; \ 444 fi; \ 445 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 446 || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ 447 done; \ 448 if test "$$dot_seen" = "no"; then \ 449 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ 450 fi; test -z "$$fail" 451 452 mostlyclean-recursive clean-recursive distclean-recursive \ 453 maintainer-clean-recursive: 454 @set fnord $$MAKEFLAGS; amf=$$2; \ 455 dot_seen=no; \ 456 case "$@" in \ 457 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ 458 *) list='$(SUBDIRS)' ;; \ 459 esac; \ 460 rev=''; for subdir in $$list; do \ 461 if test "$$subdir" = "."; then :; else \ 462 rev="$$subdir $$rev"; \ 463 fi; \ 464 done; \ 465 rev="$$rev ."; \ 466 target=`echo $@ | sed s/-recursive//`; \ 467 for subdir in $$rev; do \ 468 echo "Making $$target in $$subdir"; \ 469 if test "$$subdir" = "."; then \ 470 local_target="$$target-am"; \ 471 else \ 472 local_target="$$target"; \ 473 fi; \ 474 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 475 || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ 476 done && test -z "$$fail" 477 tags-recursive: 478 list='$(SUBDIRS)'; for subdir in $$list; do \ 479 test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ 480 done 481 ctags-recursive: 482 list='$(SUBDIRS)'; for subdir in $$list; do \ 483 test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ 484 done 277 485 278 486 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) … … 286 494 tags: TAGS 287 495 288 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \496 TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ 289 497 $(TAGS_FILES) $(LISP) 290 498 tags=; \ 291 499 here=`pwd`; \ 500 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ 501 include_option=--etags-include; \ 502 empty_fix=.; \ 503 else \ 504 include_option=--include; \ 505 empty_fix=; \ 506 fi; \ 507 list='$(SUBDIRS)'; for subdir in $$list; do \ 508 if test "$$subdir" = .; then :; else \ 509 test ! -f $$subdir/TAGS || \ 510 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 511 fi; \ 512 done; \ 292 513 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ 293 514 unique=`for i in $$list; do \ … … 296 517 $(AWK) ' { files[$$0] = 1; } \ 297 518 END { for (i in files) print i; }'`; \ 298 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 299 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 300 $$tags $$unique 519 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 520 test -n "$$unique" || unique=$$empty_fix; \ 521 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 522 $$tags $$unique; \ 523 fi 301 524 ctags: CTAGS 302 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \525 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ 303 526 $(TAGS_FILES) $(LISP) 304 527 tags=; \ … … 349 572 fi; \ 350 573 done 574 list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ 575 if test "$$subdir" = .; then :; else \ 576 test -d "$(distdir)/$$subdir" \ 577 || mkdir "$(distdir)/$$subdir" \ 578 || exit 1; \ 579 (cd $$subdir && \ 580 $(MAKE) $(AM_MAKEFLAGS) \ 581 top_distdir="../$(top_distdir)" \ 582 distdir="../$(distdir)/$$subdir" \ 583 distdir) \ 584 || exit 1; \ 585 fi; \ 586 done 351 587 check-am: all-am 352 check: check- am588 check: check-recursive 353 589 all-am: Makefile $(PROGRAMS) $(HEADERS) 354 installdirs: 355 $(mkdir_p) $(DESTDIR)$(bindir) 356 install: install-am 357 install-exec: install-exec-am 358 install-data: install-data-am 359 uninstall: uninstall-am 590 installdirs: installdirs-recursive 591 installdirs-am: 592 for dir in "$(DESTDIR)$(bindir)"; do \ 593 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 594 done 595 install: install-recursive 596 install-exec: install-exec-recursive 597 install-data: install-data-recursive 598 uninstall: uninstall-recursive 360 599 361 600 install-am: all-am 362 601 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am 363 602 364 installcheck: installcheck- am603 installcheck: installcheck-recursive 365 604 install-strip: 366 605 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ … … 378 617 @echo "This command is intended for maintainers to use" 379 618 @echo "it deletes files that may require special tools to rebuild." 380 clean: clean- am619 clean: clean-recursive 381 620 382 621 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am 383 622 384 distclean: distclean- am623 distclean: distclean-recursive 385 624 -rm -rf ./$(DEPDIR) 386 625 -rm -f Makefile … … 388 627 distclean-tags 389 628 390 dvi: dvi- am629 dvi: dvi-recursive 391 630 392 631 dvi-am: 393 632 394 html: html- am395 396 info: info- am633 html: html-recursive 634 635 info: info-recursive 397 636 398 637 info-am: … … 402 641 install-exec-am: install-binPROGRAMS 403 642 404 install-info: install-info- am643 install-info: install-info-recursive 405 644 406 645 install-man: … … 408 647 installcheck-am: 409 648 410 maintainer-clean: maintainer-clean- am649 maintainer-clean: maintainer-clean-recursive 411 650 -rm -rf ./$(DEPDIR) 412 651 -rm -f Makefile 413 652 maintainer-clean-am: distclean-am maintainer-clean-generic 414 653 415 mostlyclean: mostlyclean- am654 mostlyclean: mostlyclean-recursive 416 655 417 656 mostlyclean-am: mostlyclean-compile mostlyclean-generic 418 657 419 pdf: pdf- am658 pdf: pdf-recursive 420 659 421 660 pdf-am: 422 661 423 ps: ps- am662 ps: ps-recursive 424 663 425 664 ps-am: … … 427 666 uninstall-am: uninstall-binPROGRAMS uninstall-info-am 428 667 429 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ 430 clean-generic ctags distclean distclean-compile \ 431 distclean-generic distclean-tags distdir dvi dvi-am html \ 668 uninstall-info: uninstall-info-recursive 669 670 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ 671 clean clean-binPROGRAMS clean-generic clean-recursive ctags \ 672 ctags-recursive distclean distclean-compile distclean-generic \ 673 distclean-recursive distclean-tags distdir dvi dvi-am html \ 432 674 html-am info info-am install install-am install-binPROGRAMS \ 433 675 install-data install-data-am install-exec install-exec-am \ 434 676 install-info install-info-am install-man install-strip \ 435 installcheck installcheck-am installdirs maintainer-clean \ 436 maintainer-clean-generic mostlyclean mostlyclean-compile \ 437 mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ 438 uninstall-am uninstall-binPROGRAMS uninstall-info-am 439 440 441 # uncomment the following if bencoder requires the math library 677 installcheck installcheck-am installdirs installdirs-am \ 678 maintainer-clean maintainer-clean-generic \ 679 maintainer-clean-recursive mostlyclean mostlyclean-compile \ 680 mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \ 681 tags tags-recursive uninstall uninstall-am \ 682 uninstall-binPROGRAMS uninstall-info-am 683 684 685 # uncomment the following if orxonox requires the math library 442 686 #orxonox_LDADD=-lm 443 687 -
orxonox/branches/sound/src/ability.h
r2043 r3238 1 1 2 #ifndef ABILITY_H3 #define ABILITY_H2 #ifndef _ABILITY_H 3 #define _ABILITY_H 4 4 5 5 #include "data_tank.h" … … 14 14 }; 15 15 16 #endif 16 #endif /* _ABILITY_H */ -
orxonox/branches/sound/src/ai.h
r1956 r3238 1 1 2 #ifndef AI_H3 #define AI_H2 #ifndef _AI_H 3 #define _AI_H 4 4 5 5 #include "data_tank.h" … … 13 13 }; 14 14 15 #endif 15 #endif /* _AI_H */ -
orxonox/branches/sound/src/base_entity.h
r2551 r3238 1 1 2 #ifndef BASE_ENTITY_H3 #define BASE_ENTITY_H2 #ifndef _BASE_ENTITY_H 3 #define _BASE_ENTITY_H 4 4 5 5 #include "stdincl.h" … … 14 14 }; 15 15 16 #endif 16 #endif /* _BASE_ENTITY_H */ -
orxonox/branches/sound/src/camera.cc
r2636 r3238 30 30 { 31 31 this->world = world; 32 bound = NULL;32 this->bound = NULL; 33 33 /* give it some physical live */ 34 m = 10;35 a = new Vector(0.0, 0.0, 0.0);36 v = new Vector(0.0, 0.0, 0.0);37 fs = new Vector(0.0, 0.0, 0.0);38 cameraMode = NORMAL;39 deltaTime = 3000.0;40 cameraOffset = 1.0;41 cameraOffsetZ = 10.0;42 t = 0.0;43 44 actual_place.r.x = 0.0;45 actual_place.r.y = 10.0;46 actual_place.r.z = -5.0;34 this->m = 10; 35 this->a = new Vector(0.0, 0.0, 0.0); 36 this->v = new Vector(0.0, 0.0, 0.0); 37 this->fs = new Vector(0.0, 0.0, 0.0); 38 this->cameraMode = NORMAL; 39 this->deltaTime = 3000.0; 40 this->cameraOffset = 1.0; 41 this->cameraOffsetZ = 10.0; 42 this->t = 0.0; 43 44 this->actualPlace.r.x = 0.0; 45 this->actualPlace.r.y = 10.0; 46 this->actualPlace.r.z = -5.0; 47 47 } 48 48 … … 61 61 as smooth camera movement or swaying). 62 62 */ 63 void Camera::time _slice (Uint32 deltaT)64 { 65 if( t <= deltaTime)66 {t += deltaT;}63 void Camera::timeSlice (Uint32 deltaT) 64 { 65 if( this->t <= deltaTime) 66 {this->t += deltaT;} 67 67 //printf("time is: t=%f\n", t ); 68 update _desired_place();69 jump 68 updateDesiredPlace(); 69 jump(NULL); 70 70 } 71 71 … … 76 76 bound entity's position on the track. 77 77 */ 78 void Camera::update _desired_place ()78 void Camera::updateDesiredPlace () 79 79 { 80 80 switch(cameraMode) … … 89 89 if( bound != NULL) 90 90 { 91 bound->get _lookat (&lookat);92 orx->get _world()->calc_camera_pos (&lookat, &plFocus);91 bound->getLookat (&lookat); 92 orx->getWorld()->calcCameraPos (&lookat, &plFocus); 93 93 Quaternion *fr; 94 94 if(t < 20.0) … … 101 101 102 102 Vector op(1.0, 0.0, 0.0); 103 float angle = angle _deg(op, *start);103 float angle = angleDeg(op, *start); 104 104 printf("angle is: %f\n", angle); 105 105 … … 144 144 145 145 Vector ursp(0.0, 0.0, 0.0); 146 desired _place.r = /*plFocus.r -*/ ursp - res->apply(r);147 148 printf("desired place is: %f, %f, %f\n", desired _place.r.x, desired_place.r.y, desired_place.r.z);146 desiredPlace.r = /*plFocus.r -*/ ursp - res->apply(r); 147 148 printf("desired place is: %f, %f, %f\n", desiredPlace.r.x, desiredPlace.r.y, desiredPlace.r.z); 149 149 //plLastBPlace = *bound->get_placement(); 150 150 } … … 153 153 case SMOTH_FOLLOW: 154 154 { 155 Placement *plBound = bound->get _placement();155 Placement *plBound = bound->getPlacement(); 156 156 Location lcBound; 157 157 if(bound != null) 158 158 { 159 bound->get _lookat(&lcBound);159 bound->getLookat(&lcBound); 160 160 Vector vDirection(0.0, 0.0, 1.0); 161 161 vDirection = plBound->w.apply(vDirection); 162 desired _place.r = (vDirection * ((lcBound.dist-10.0)/* / l*/)) + Vector(0,0,5.0);162 desiredPlace.r = (vDirection * ((lcBound.dist-10.0)/* / l*/)) + Vector(0,0,5.0); 163 163 } 164 164 break; … … 169 169 if(bound != null) 170 170 { 171 Placement *plBound = bound->get _placement();171 Placement *plBound = bound->getPlacement(); 172 172 Vector vDirection(0.0, 0.0, 1.0); 173 173 Vector eclipticOffset(0.0, 0.0, 5.0); 174 174 vDirection = plBound->w.apply(vDirection); 175 desired _place.r = plBound->r - vDirection*10 + eclipticOffset;175 desiredPlace.r = plBound->r - vDirection*10 + eclipticOffset; 176 176 } 177 177 break; … … 182 182 if( bound != NULL && world != NULL ) 183 183 { 184 bound->get _lookat (&lookat);185 world->calc _camera_pos (&lookat, &desired_place);184 bound->getLookat (&lookat); 185 world->calcCameraPos (&lookat, &desiredPlace); 186 186 } 187 187 else 188 188 { 189 desired _place.r = Vector (0,0,0);190 desired _place.w = Quaternion ();189 desiredPlace.r = Vector (0,0,0); 190 desiredPlace.w = Quaternion (); 191 191 } 192 192 break; … … 206 206 // view 207 207 // TO DO: implement options for frustum generation 208 glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 250.0); 208 //glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 250.0); 209 gluPerspective(60, 1.2f, 0.1, 250); 210 209 211 //Vector up(0,0,1); 210 212 //Vector dir(1,0,0); … … 235 237 // rotation 236 238 float matrix[4][4]; 237 actual _place.w.conjugate().matrix (matrix);239 actualPlace.w.conjugate().matrix (matrix); 238 240 /* orientation and */ 239 241 glMultMatrixf ((float*)matrix); 240 242 /* translation */ 241 glTranslatef (-actual _place.r.x, -actual_place.r.y,- actual_place.r.z);242 243 glTranslatef (-actualPlace.r.x, -actualPlace.r.y,- actualPlace.r.z); 244 //Placement *plBound = bound->get_placement(); 243 245 244 246 // ===== second camera control calculation option 245 247 /* 246 248 gluLookAt(actual_place.r.x, actual_place.r.y, actual_place.r.z, 247 249 plBound->r.x, plBound->r.y, plBound->r.z, 248 250 0.0, 0.0, 1.0); … … 263 265 if( plc == NULL) 264 266 { 265 actual _place = desired_place;267 actualPlace = desiredPlace; 266 268 //printf("Camera|jump: camer@ %f, %f, %f\n\n", actual_place.r.x, actual_place.r.y, actual_place.r.z); 267 269 } 268 270 else 269 271 { 270 desired _place = *plc;271 actual _place = *plc;272 desiredPlace = *plc; 273 actualPlace = *plc; 272 274 } 273 275 } … … 277 279 \param entity: The enitity to bind the camera to 278 280 279 280 281 281 This sets the focus of the camera to the given entity. This means that it will use the given WorldEntity's 282 Location and get_lookat() to determine the viewpoint the camera will render from. 283 Note that you cannot bind a camera to a free entity. 282 284 */ 283 285 void Camera::bind (WorldEntity* entity) … … 285 287 if( entity != NULL) 286 288 { 287 if( entity->isFree 289 if( entity->isFree()) printf("Cannot bind camera to free entity"); 288 290 else 289 291 { 290 bound = entity;292 this->bound = entity; 291 293 } 292 294 } … … 298 300 this->world = world; 299 301 } 302 303 304 /** 305 \brief destroy, reset the camera so that it doesn't perform anything anymore 306 307 */ 308 void Camera::destroy() 309 { 310 this->bound = NULL; 311 this->world = NULL; 312 } -
orxonox/branches/sound/src/camera.h
r2636 r3238 4 4 */ 5 5 6 #ifndef CAMERA_H7 #define CAMERA_H6 #ifndef _CAMERA_H 7 #define _CAMERA_H 8 8 9 9 #include "stdincl.h" … … 26 26 private: 27 27 WorldEntity* bound; //!< the WorldEntity the Camera is bound to 28 Placement actual _place; //!< the Camera's current position29 Placement desired _place; //!< where the Camera should be according to calculations28 Placement actualPlace; //!< the Camera's current position 29 Placement desiredPlace; //!< where the Camera should be according to calculations 30 30 World* world; 31 31 … … 54 54 CAMERA_MODE cameraMode; //!< saves the camera mode: how the camera follows the entity 55 55 56 void update _desired_place ();56 void updateDesiredPlace (); 57 57 58 58 public: … … 60 60 ~Camera (); 61 61 62 void time _slice (Uint32 deltaT);62 void timeSlice (Uint32 deltaT); 63 63 void apply (); 64 64 void bind (WorldEntity* entity); 65 65 void jump (Placement* plc); 66 void destroy(); 66 67 67 68 void setWorld(World* world); … … 69 70 }; 70 71 71 #endif 72 #endif /* _CAMERA_H */ -
orxonox/branches/sound/src/campaign.cc
r2636 r3238 27 27 Campaign::Campaign () 28 28 { 29 this->entities = new List <StoryEntity>();29 this->entities = new ListTemplate<StoryEntity>(); 30 30 this->isInit = false; 31 31 } … … 34 34 35 35 36 Error Campaign::init()36 ErrorMessage Campaign::init() 37 37 { 38 38 this->isInit = true; … … 48 48 want to queue up in the campaign. 49 49 */ 50 void Campaign::addEntity(StoryEntity* se, Uint32storyID)50 void Campaign::addEntity(StoryEntity* se, int storyID) 51 51 { 52 52 se->setStoryID(storyID); … … 60 60 61 61 62 void Campaign::removeEntity( Uint32storyID)62 void Campaign::removeEntity(int storyID) 63 63 { 64 64 this->removeEntity(this->getStoryEntity(storyID)); … … 73 73 74 74 75 Error Campaign::start()75 ErrorMessage Campaign::start() 76 76 { 77 77 this->start(0); 78 78 } 79 79 80 Error Campaign::start(Uint32storyID = 0)80 ErrorMessage Campaign::start(int storyID = 0) 81 81 { 82 82 printf("World::start() - starting new StoryEntity Nr:%i\n", storyID); 83 Error errorCode;84 if( !this->isInit) return errorCode;85 if( storyID == WORLD_ID_GAMEEND) return errorCode;83 ErrorMessage errorCode; 84 if( !this->isInit) return errorCode; 85 if( storyID == WORLD_ID_GAMEEND) return errorCode; 86 86 this->running = true; 87 87 StoryEntity* se = this->getStoryEntity(storyID); 88 while(se != NULL && this->running) 88 this->currentEntity = se; 89 while( se != NULL && this->running) 89 90 { 90 se = this->getStoryEntity(storyID); 91 this->currentEntity = se; 92 93 se->displayEntityScreen(); 91 se->displayLoadScreen(); 94 92 se->load(); 95 93 se->init(); 96 se->release EntityScreen();94 se->releaseLoadScreen(); 97 95 se->start(); 96 se->destroy(); 97 98 delete se; 98 99 99 100 int nextWorldID = se->getNextStoryID(); 100 if(nextWorldID == WORLD_ID_GAMEEND) return errorCode;101 //printf("Campaing::start() - got nextWorldID = %i\n", nextWorldID); 101 102 se = this->getStoryEntity(nextWorldID); 102 if(se == NULL) 103 printf("Campaign::start() - ERROR: world it not found, oh oh..."); 103 this->currentEntity = se; 104 if( ( nextWorldID == WORLD_ID_GAMEEND) ||( se == NULL) ) 105 { 106 printf("Campaign::start() - quitting campaing story loop\n"); 107 if(se != NULL) 108 delete se; 109 return errorCode; 110 } 111 104 112 } 105 113 } 106 114 107 Error Campaign::stop()115 ErrorMessage Campaign::stop() 108 116 { 109 117 this->running = false; … … 111 119 { 112 120 this->currentEntity->stop(); 113 delete this->currentEntity;114 this->currentEntity = NULL;121 //delete this->currentEntity; 122 //this->currentEntity = NULL; 115 123 } 116 124 } 117 125 118 Error Campaign::pause()126 ErrorMessage Campaign::pause() 119 127 { 120 128 if(this->currentEntity != NULL) … … 123 131 124 132 125 Error Campaign::resume()133 ErrorMessage Campaign::resume() 126 134 { 127 135 if(this->currentEntity != NULL) … … 130 138 131 139 140 void Campaign::destroy() 141 { 142 if(this->currentEntity != NULL) 143 { 144 this->currentEntity->destroy(); 145 delete this->currentEntity; 146 this->currentEntity = NULL; 147 } 148 } 149 150 /* 151 \brief this changes to the next level 152 */ 132 153 void Campaign::nextLevel() 133 154 { 134 printf("Campaign|nextLevel\n"); 135 int nextID = this->currentEntity->getNextStoryID(); 136 this->stop(); 137 this->start(nextID); 155 printf("Campaign:nextLevel()\n"); 156 //int nextID = this->currentEntity->getNextStoryID(); 157 //this->stop(); 158 //this->start(nextID); 159 this->currentEntity->stop(); 138 160 } 139 161 162 /* 163 \brief change to the previous level - not implemented 164 165 this propably useless 166 */ 140 167 void Campaign::previousLevel() 141 168 {} 142 169 143 170 144 StoryEntity* Campaign::getStoryEntity(Uint32 storyID) 171 /* 172 \brief lookup a entity with a given id 173 \param story id to be lookuped 174 \returns the entity found or NULL if search ended without match 175 */ 176 StoryEntity* Campaign::getStoryEntity(int storyID) 145 177 { 146 List<StoryEntity>* l; 147 StoryEntity* entity; 148 l = this->entities->get_next(); 178 //printf("Campaing::getStoryEntity(%i) - getting next Entity\n", storyID); 179 if( storyID == WORLD_ID_GAMEEND) 180 return NULL; 181 ListTemplate<StoryEntity>* l; 182 StoryEntity* entity = NULL; 183 l = this->entities->getNext(); 149 184 while( l != NULL) 150 185 { 151 entity = l->get_object(); 152 l = l->get_next(); 153 if(entity->getStoryID() == storyID) 154 return entity; 186 entity = l->getObject(); 187 l = l->getNext(); 188 int id = entity->getStoryID(); 189 //printf("Campaing::getStoryEntity() - now looping, found entity nr=%i\n", id); 190 if(id == storyID) 191 { 192 //printf("Campaing::getStoryEntity() - yea, this is what we where looking for: %id\n"); 193 return entity; 194 } 155 195 } 156 196 return NULL; -
orxonox/branches/sound/src/campaign.h
r2636 r3238 1 1 2 #ifndef CAMPAIGN_H3 #define CAMPAIGN_H2 #ifndef _CAMPAIGN_H 3 #define _CAMPAIGN_H 4 4 5 5 #include "stdincl.h" … … 17 17 StoryEntity* currentEntity; 18 18 19 virtual Error init();20 virtual Error start();21 virtual Error start(Uint32storyID);22 virtual Error stop();23 virtual Error pause();24 virtual Error resume();19 virtual ErrorMessage init(); 20 virtual ErrorMessage start(); 21 virtual ErrorMessage start(int storyID); 22 virtual ErrorMessage stop(); 23 virtual ErrorMessage pause(); 24 virtual ErrorMessage resume(); 25 25 26 void addEntity(StoryEntity* se, Uint32 storyID); 26 virtual void destroy(); 27 28 void addEntity(StoryEntity* se, int storyID); 27 29 void addEntity(StoryEntity* se); 28 void removeEntity( Uint32storyID);30 void removeEntity(int storyID); 29 31 void removeEntity(StoryEntity* se); 30 32 … … 33 35 34 36 private: 35 List <StoryEntity>* entities;37 ListTemplate<StoryEntity>* entities; 36 38 bool running; 37 39 38 StoryEntity* getStoryEntity( Uint32storyID);40 StoryEntity* getStoryEntity(int storyID); 39 41 }; 40 42 41 #endif 43 #endif /* _CAMPAIGN_H */ -
orxonox/branches/sound/src/collision.cc
r2190 r3238 28 28 CollisionCluster::CollisionCluster (float rad = 1.0, Vector mid = Vector(0,0,0)) 29 29 { 30 root = (CC _Tree*) malloc( sizeof( CC_Tree));30 root = (CCTree*) malloc( sizeof( CCTree)); 31 31 root->n = 0; 32 32 root->data.ID = 0; … … 62 62 } 63 63 64 root = load _CC_Tree (stream);64 root = loadCCTree (stream); 65 65 fclose (stream); 66 66 } … … 71 71 CollisionCluster::~CollisionCluster () 72 72 { 73 free _CC_Tree(root);73 freeCCTree(root); 74 74 } 75 75 … … 85 85 stream = fopen( filename, "wb"); 86 86 if( stream == NULL) return -1; 87 r = save _CC_Tree(root, stream);87 r = saveCCTree(root, stream); 88 88 fclose (stream); 89 89 return r; … … 99 99 \return true on collision, false otherwise. If true is returned, the flag in ahitflags that symbolises the hit subsphere is set, and impactpoint is set to the Location where the intersection occured 100 100 */ 101 bool check _trace (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Line* trace, Vector* impactpoint)102 { 103 CC _Tree* t;101 bool checkTrace (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Line* trace, Vector* impactpoint) 102 { 103 CCTree* t; 104 104 if( (t = a->root) == NULL) return false; 105 105 106 return cc tree_trace( pa, t, ahitflags, trace, impactpoint);106 return ccTreeTrace( pa, t, ahitflags, trace, impactpoint); 107 107 } 108 108 … … 118 118 If true is returned, all flags in ahitflags and bhitflags that symbolize intersecting subspheres in the respective CollisionCluster are set 119 119 */ 120 bool check _collision (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Placement* pb, const CollisionCluster* b, unsigned long* bhitflags)121 { 122 CC _Tree* ta, *tb;120 bool checkCollision (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Placement* pb, const CollisionCluster* b, unsigned long* bhitflags) 121 { 122 CCTree* ta, *tb; 123 123 if( (ta = a->root) == NULL) return false; 124 124 if( (tb = b->root) == NULL) return false; 125 125 126 return cc tree_iterate(pa, ta, ahitflags, pb, tb, bhitflags);126 return ccTreeIterate(pa, ta, ahitflags, pb, tb, bhitflags); 127 127 } 128 128 … … 135 135 \return true on intersection, false otherwise 136 136 */ 137 bool sphere _sphere_collision( Vector m1, float r1, Vector m2, float r2)137 bool sphereSphereCollision( Vector m1, float r1, Vector m2, float r2) 138 138 { 139 139 if ((m1-m2).len() < r1+r2) return true; … … 149 149 \return true on intersection, false otherwise. If true is returned, impactpoint is set to the loaction where the intersection occured 150 150 */ 151 bool trace _sphere_collision( Vector m, float r, const Line* l, Vector* impactpoint)151 bool traceSphereCollision( Vector m, float r, const Line* l, Vector* impactpoint) 152 152 { 153 153 float A, B, C, D, t[2]; … … 176 176 } 177 177 178 bool cc tree_iterate(const Placement* pa, CC_Tree* ta, unsigned long* ahitflags, const Placement* pb, CC_Tree* tb, unsigned long* bhitflags)178 bool ccTreeIterate(const Placement* pa, CCTree* ta, unsigned long* ahitflags, const Placement* pb, CCTree* tb, unsigned long* bhitflags) 179 179 { 180 180 bool r = false; … … 182 182 Vector mra = pa->r + pa->w.apply(ta->m); 183 183 Vector mrb = pb->r + pb->w.apply(tb->m); 184 CC _Tree* use_a, *use_b;185 186 if( use _a == NULL || use_b== NULL) return false;187 188 if( sphere _sphere_collision( mra, ta->r, mrb, tb->r))184 CCTree* useA, *useB; 185 186 if( useA == NULL || useB == NULL) return false; 187 188 if( sphereSphereCollision( mra, ta->r, mrb, tb->r)) 189 189 { 190 190 if( ta->n == 0 && tb->n == 0) … … 196 196 for( ia = 0; ia < ta->n || ta->n == 0; ia++) 197 197 { 198 if( ta->n == 0) use _a= ta;199 else use _a= ta->data.b[ia];198 if( ta->n == 0) useA = ta; 199 else useA = ta->data.b[ia]; 200 200 for( ib = 0; ib < tb->n || ta->n == 0; ib++) 201 201 { 202 if( ta->n == 0) use _b= ta;203 else use _b= ta->data.b[ib];202 if( ta->n == 0) useB = ta; 203 else useB = ta->data.b[ib]; 204 204 205 r = r || cc tree_iterate( pa, use_a, ahitflags, pb, use_b, bhitflags);205 r = r || ccTreeIterate( pa, useA, ahitflags, pb, useB, bhitflags); 206 206 207 207 if( tb->n == 0) break; … … 233 233 234 234 /** 235 \brief frees the memory allocated in a CC _Tree236 */ 237 void free _CC_Tree( CC_Tree* tree)235 \brief frees the memory allocated in a CCTree 236 */ 237 void freeCCTree( CCTree* tree) 238 238 { 239 239 if (tree == NULL) return; 240 240 for (int i = 0; i < tree->n; i++) 241 241 { 242 free _CC_Tree(tree->data.b[i]);242 freeCCTree(tree->data.b[i]); 243 243 } 244 244 free( tree); … … 246 246 247 247 /** 248 \brief loads a CC _Tree from a stream249 */ 250 CC _Tree* load_CC_Tree (FILE* stream)251 { 252 CC _Tree* tree = NULL;253 CC _Tree** branches = NULL;248 \brief loads a CCTree from a stream 249 */ 250 CCTree* loadCCTree (FILE* stream) 251 { 252 CCTree* tree = NULL; 253 CCTree** branches = NULL; 254 254 float buf[4]; 255 255 unsigned long n; … … 267 267 else 268 268 { 269 branches = (CC _Tree**)malloc( sizeof(CC_Tree*) * n);269 branches = (CCTree**)malloc( sizeof(CCTree*) * n); 270 270 for( int i = 0; i < n; i++) 271 271 { 272 if ((branches[i] = load _CC_Tree (stream)) == NULL)272 if ((branches[i] = loadCCTree (stream)) == NULL) 273 273 { 274 274 for( int j = 0; j < i; j++) 275 275 { 276 free _CC_Tree (branches[j]);277 free 276 freeCCTree (branches[j]); 277 free(branches); 278 278 return NULL; 279 279 } … … 283 283 284 284 // assemble 285 tree = (CC _Tree*) malloc (sizeof(CC_Tree));285 tree = (CCTree*) malloc (sizeof(CCTree)); 286 286 tree->m.x = buf[0]; 287 287 tree->m.y = buf[1]; … … 297 297 298 298 /** 299 \brief saves a CC _Tree to a stream300 */ 301 int save _CC_Tree (CC_Tree* tree, FILE* stream)299 \brief saves a CCTree to a stream 300 */ 301 int saveCCTree (CCTree* tree, FILE* stream) 302 302 { 303 303 float buf[4]; … … 321 321 for( int i = 0; i < tree->n; i++) 322 322 { 323 if ( save _CC_Tree (tree->data.b[i], stream) == -1) return -1;323 if ( saveCCTree (tree->data.b[i], stream) == -1) return -1; 324 324 } 325 325 } … … 329 329 } 330 330 331 bool cc tree_trace( const Placement* p, CC_Tree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint)331 bool ccTreeTrace( const Placement* p, CCTree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint) 332 332 { 333 333 bool r = false; 334 334 int i; 335 335 Vector mr = p->r + p->w.apply (t->m); 336 CC _Tree* use_t;336 CCTree* useT; 337 337 Vector* ips; 338 338 unsigned long* hfs; 339 339 340 if( trace _sphere_collision (mr, t->r, trace, impactpoint))340 if( traceSphereCollision (mr, t->r, trace, impactpoint)) 341 341 { 342 342 if( t->n == 0) … … 352 352 for (i = 0; i < t->n; i++) 353 353 { 354 r = r || cc tree_trace (p, t->data.b[i], &(hfs[i]), trace, &(ips[i]));354 r = r || ccTreeTrace (p, t->data.b[i], &(hfs[i]), trace, &(ips[i])); 355 355 } 356 356 if( r) -
orxonox/branches/sound/src/collision.h
r2190 r3238 4 4 */ 5 5 6 #ifndef COLLISION_H7 #define COLLISION_H6 #ifndef _COLLISION_H 7 #define _COLLISION_H 8 8 9 9 #include "vector.h" … … 14 14 15 15 //! Tree structure used by the CollisionCluster 16 typedef struct CC _Tree16 typedef struct CCTree 17 17 { 18 18 unsigned long n; 19 19 union 20 20 { 21 struct CC _Tree** b;21 struct CCTree** b; 22 22 unsigned long ID; 23 23 } data; 24 24 float r; 25 25 Vector m; 26 } CC _Tree;26 } CCTree; 27 27 28 28 //! Basic collision detection class … … 42 42 class CollisionCluster { 43 43 44 CC _Tree* root;44 CCTree* root; 45 45 46 46 … … 52 52 int store (char* filename); 53 53 54 friend bool cc tree_trace( const Placement* p, CC_Tree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint);55 friend bool cc tree_iterate(const Placement* pa, CC_Tree* ta, unsigned long* ahitflags, const Placement* pb, CC_Tree* tb, unsigned long* bhitflags);56 friend bool check _trace (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Line* trace, Vector* impactpoint);57 friend bool check _collision (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Placement* pb, const CollisionCluster* b, unsigned long* bhitflags);54 friend bool ccTreeTrace( const Placement* p, CCTree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint); 55 friend bool ccTreeIterate(const Placement* pa, CCTree* ta, unsigned long* ahitflags, const Placement* pb, CCTree* tb, unsigned long* bhitflags); 56 friend bool checkTrace (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Line* trace, Vector* impactpoint); 57 friend bool checkCollision (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Placement* pb, const CollisionCluster* b, unsigned long* bhitflags); 58 58 }; 59 59 60 bool sphere _sphere_collision( Vector m1, float r1, Vector m2, float r2);61 bool trace _sphere_collision( Vector m, float r, const Line* l, Vector* impactpoint);60 bool sphereSphereCollision( Vector m1, float r1, Vector m2, float r2); 61 bool traceSphereCollision( Vector m, float r, const Line* l, Vector* impactpoint); 62 62 63 63 void setflag( unsigned long* flags, unsigned long ID); 64 64 65 void free _CC_Tree( CC_Tree* tree);66 CC _Tree* load_CC_Tree (FILE* stream);67 int save _CC_Tree (CC_Tree* tree, FILE* stream);65 void freeCCTree( CCTree* tree); 66 CCTree* loadCCTree (FILE* stream); 67 int saveCCTree (CCTree* tree, FILE* stream); 68 68 69 #endif 69 #endif /* _COLLISION_H */ -
orxonox/branches/sound/src/command_node.cc
r2636 r3238 11 11 ### File Specific: 12 12 main-programmer: Christian Meyer 13 co-programmer: ...13 co-programmer: Patrick Boenzli 14 14 */ 15 15 … … 20 20 #include "world_entity.h" 21 21 #include "game_loader.h" 22 #include "world.h" 22 23 23 24 #include <stdio.h> … … 33 34 CommandNode::CommandNode (int ID) 34 35 { 35 bound = new List<WorldEntity>(); 36 aliases = NULL; 37 netID = ID; 38 bLocalInput = false; 36 this->bound = new tList<WorldEntity>(); 37 this->aliases = NULL; 38 this->netID = ID; 39 this->bLocalInput = false; 40 this->bEnabled = true; 41 this->world = NULL; 39 42 } 40 43 … … 45 48 CommandNode::CommandNode (char* filename = DEFAULT_KEYBIND_FILE) 46 49 { 47 aliases = NULL; 48 bLocalInput = true; 49 netID = 0; 50 bound = new List<WorldEntity>(); 51 load_bindings (filename); 50 this->aliases = NULL; 51 this->bLocalInput = true; 52 this->netID = 0; 53 this->bound = new tList<WorldEntity>(); 54 this->bEnabled = true; 55 this->world = NULL; 56 this->loadBindings (filename); 52 57 } 53 58 … … 58 63 { 59 64 if( aliases != NULL) free (aliases); 60 if( bound != NULL) delete bound; 61 } 65 if( bound != NULL) delete bound; /* \todo should this delete bound? dangerous FIX */ 66 } 67 68 69 /** 70 \brief this resets the command node 71 72 deleting all data contained in the command node to fill it up again 73 74 \todo coppling to different game-entities 75 \todo reset/destroy has to be redesigned 76 */ 77 78 void CommandNode::reset() 79 { 80 this->bound->destroy(); 81 //this->bound = NULL; /* \todo this produces a NULLpointer error.. FIX */ 82 this->bEnabled = false; 83 this->world = NULL; 84 } 85 86 void CommandNode::enable(bool bEnabled) 87 { 88 this->bEnabled = bEnabled; 89 } 90 91 92 /** 93 \brief adds Node to a GameWorld 94 95 this is usefull, if you want to catch events in a world class. usualy 96 this is done automaticaly via GameLoader. Reset it via 97 CommandNode::reset() 98 99 */ 100 void CommandNode::addToWorld(World* world) 101 { 102 this->world = world; 103 } 104 62 105 63 106 /** … … 65 108 \param filename: The path and name of the file to load the bindings from 66 109 */ 67 void CommandNode::load _bindings (char* filename)110 void CommandNode::loadBindings (char* filename) 68 111 { 69 112 FILE* stream; … … 82 125 // create parser 83 126 IniParser parser (filename); 84 if( parser.get _section ("Bindings") == -1)127 if( parser.getSection ("Bindings") == -1) 85 128 { 86 129 printf("Could not find key bindings in %s\n", filename); … … 96 139 int* index; 97 140 98 while( parser.next _var (namebuf, valuebuf) != -1)99 { 100 index = name _to_index (namebuf);141 while( parser.nextVar (namebuf, valuebuf) != -1) 142 { 143 index = nameToIndex (namebuf); 101 144 switch( index[0]) 102 145 { 103 146 case 0: 104 printf("Key binding %d(%s) set to %s\n", index[1], SDLK _to_keyname( index[1]), valuebuf);147 printf("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), valuebuf); 105 148 strcpy (aliases->keys[index[1]], valuebuf); 106 149 break; 107 150 case 1: 108 printf("Button binding %d(%s) set to %s\n", index[1], SDLB _to_buttonname( index[1]), valuebuf);151 printf("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), valuebuf); 109 152 strcpy (aliases->buttons[index[1]], valuebuf); 110 153 break; … … 123 166 void CommandNode::bind (WorldEntity* entity) 124 167 { 125 bound->add (entity , LIST_ADD_NEXT, true);168 bound->add (entity); 126 169 } 127 170 … … 132 175 void CommandNode::unbind (WorldEntity* entity) 133 176 { 134 bound->remove (entity , LIST_FIND_FW);135 } 136 137 int* CommandNode::name _to_index (char* name)177 bound->remove (entity); 178 } 179 180 int* CommandNode::nameToIndex (char* name) 138 181 { 139 182 coord[0] = -1; 140 183 coord[1] = -1; 141 184 int c; 142 if( (c = keyname _to_SDLK (name)) != -1)185 if( (c = keynameToSDLK (name)) != -1) 143 186 { 144 187 coord[1] = c; 145 188 coord[0] = 0; 146 189 } 147 if( (c = buttonname _to_SDLB (name)) != -1)190 if( (c = buttonnameToSDLB (name)) != -1) 148 191 { 149 192 coord[1] = c; … … 158 201 void CommandNode::process () 159 202 { 160 if( bLocalInput) process_local (); 161 else process_network (); 162 } 163 164 void CommandNode::process_local () 203 if( this->bEnabled) 204 { 205 if( bLocalInput) processLocal (); 206 else processNetwork (); 207 } 208 } 209 210 void CommandNode::processLocal () 165 211 { 166 212 SDL_Event event; 167 213 Command cmd; 168 169 214 while( SDL_PollEvent (&event)) 170 215 { … … 175 220 strcpy (cmd.cmd, aliases->keys[event.key.keysym.sym]); 176 221 cmd.bUp = false; 177 if( strlen (cmd.cmd) > 0) relay 222 if( strlen (cmd.cmd) > 0) relay(&cmd); 178 223 break; 179 224 case SDL_KEYUP: 180 225 strcpy( cmd.cmd, aliases->keys[event.key.keysym.sym]); 181 226 cmd.bUp = true; 182 if( strlen (cmd.cmd) > 0) relay 227 if( strlen (cmd.cmd) > 0) relay(&cmd); 183 228 break; 184 229 case SDL_MOUSEMOTION: … … 192 237 strcpy( cmd.cmd, aliases->buttons[event.button.button]); 193 238 cmd.bUp = true; 194 if( strlen (cmd.cmd) > 0) relay 239 if( strlen (cmd.cmd) > 0) relay(&cmd); 195 240 break; 196 241 case SDL_MOUSEBUTTONDOWN: 197 242 strcpy( cmd.cmd, aliases->buttons[event.button.button]); 198 243 cmd.bUp = false; 199 if( strlen (cmd.cmd) > 0) relay 244 if( strlen (cmd.cmd) > 0) relay(&cmd); 200 245 break; 201 246 case SDL_JOYAXISMOTION: … … 207 252 default: 208 253 Orxonox *orx = Orxonox::getInstance(); 209 orx->event_handler (&event); 210 254 orx->eventHandler(&event); 211 255 break; 212 256 } … … 214 258 } 215 259 216 void CommandNode::process_network () 217 { 218 219 } 260 261 void CommandNode::processNetwork () 262 { 263 264 } 265 220 266 221 267 void CommandNode::relay (Command* cmd) 222 268 { 223 //printf("CommandNode|relay()\n"); 224 List<WorldEntity>* plist = bound; 225 269 226 270 Orxonox *orx = Orxonox::getInstance(); 227 if( orx->system_command (cmd)) return; 271 if( orx->systemCommand (cmd)) return; 272 228 273 GameLoader* gl = GameLoader::getInstance(); 229 if(gl->worldCommand(cmd)) return; 230 231 if( bLocalInput) send_over_network (cmd); 232 233 while( (plist = plist->get_next()) != NULL) 234 { 235 plist->get_object()->command (cmd); 236 } 237 } 274 if( gl->worldCommand(cmd)) return; 275 276 if( bLocalInput) sendOverNetwork (cmd); 277 278 if( this->world->command(cmd)) return; 279 280 WorldEntity* entity = bound->enumerate(); 281 while( entity != NULL) 282 { 283 entity->command (cmd); 284 entity = bound->nextElement(); 285 } 286 } 287 238 288 239 289 /** … … 241 291 \param ID: the new ID to use 242 292 */ 243 void CommandNode::set _netID (int ID)293 void CommandNode::setNetID (int ID) 244 294 { 245 295 netID = ID; 246 296 } 247 297 248 void CommandNode::send _over_network (Command* cmd)249 { 250 } 298 void CommandNode::sendOverNetwork (Command* cmd) 299 { 300 } -
orxonox/branches/sound/src/command_node.h
r2190 r3238 6 6 */ 7 7 8 #ifndef COMMAND_NODE_H9 #define COMMAND_NODE_H8 #ifndef _COMMAND_NODE_H 9 #define _COMMAND_NODE_H 10 10 11 11 #include "stdincl.h" 12 12 13 13 class WorldEntity; 14 class World; 14 15 15 16 #define N_STD_KEYS SDLK_LAST … … 19 20 //! Key aliasing structure 20 21 /** 21 22 22 This structure contains the key aliasing information, e.g. the command strings that 23 have been bound to the keys. 23 24 */ 24 25 typedef struct 25 26 { 26 27 27 char keys[N_STD_KEYS][CMD_LENGHT]; 28 char buttons[N_BUTTONS][CMD_LENGHT]; 28 29 } KeyBindings; 29 30 30 31 //! Command Node 31 32 /** 32 33 34 35 36 33 This class gathers all incoming SDL_Events and processes them. Keyboard, mouse and joystick input is 34 captured and translated into command messages which are passed down to the bound WorldEntities (via WorldEntity::command()). 35 Other SDL_Events are passed to Orxonox::event_handler() to deal with them. If the CommandNode has been created 36 with bLocalInput set to false, it will query the network class for incoming commands that match his netID and pass 37 them on to it's WorldEntities. 37 38 */ 38 39 class CommandNode { 39 40 private: 40 bool bLocalInput; //!< Identifies the CommandNode that processes local input 41 int netID; //!< Unique identifier that is used to determine between remote CommandNodes 42 KeyBindings* aliases; 43 List<WorldEntity>* bound; //!< List of WorldEntites that recieve commands from this CommandNode 44 Sint32 coord[2]; 45 46 void relay (Command* cmd); 47 int* name_to_index (char* name); 48 void process_local (); 49 void process_network (); 50 void send_over_network (Command* cmd); 51 41 bool bLocalInput; //!< Identifies the CommandNode that processes local input 42 bool bEnabled; 43 int netID; //!< Unique identifier that is used to determine between remote CommandNodes 44 KeyBindings* aliases; 45 tList<WorldEntity>* bound; //!< List of WorldEntites that recieve commands from this CommandNode 46 Sint32 coord[2]; 47 World* world; 48 49 50 void relay (Command* cmd); 51 int* nameToIndex (char* name); 52 void processLocal (); 53 void processNetwork (); 54 void sendOverNetwork (Command* cmd); 55 52 56 public: 53 57 CommandNode (int ID); 54 58 CommandNode (char* filename); 55 59 ~CommandNode (); 56 57 void load_bindings (char* filename); 60 61 void reset (); 62 void enable (bool bEnabled); 63 void loadBindings (char* filename); 58 64 void bind (WorldEntity* entity); 59 65 void unbind (WorldEntity* entity); 66 void addToWorld (World* world); 60 67 void process (); 61 68 62 void set _netID (int ID);69 void setNetID (int ID); 63 70 }; 64 71 65 #endif 72 #endif /* _COMMAND_NODE_H */ -
orxonox/branches/sound/src/coordinates.h
r2551 r3238 4 4 */ 5 5 6 #ifndef COORDINATES_H7 #define COORDINATES_H6 #ifndef _COORDINATES_H 7 #define _COORDINATES_H 8 8 9 9 #include "vector.h" … … 34 34 } Placement; 35 35 36 #endif 36 #endif /* _COORDINATS_H */ -
orxonox/branches/sound/src/data_tank.h
r2190 r3238 1 1 2 #ifndef DATA_TANK_H3 #define DATA_TANK_H2 #ifndef _DATA_TANK_H 3 #define _DATA_TANK_H 4 4 5 5 … … 12 12 }; 13 13 14 #endif 14 #endif /* _DATA_TANK_H */ -
orxonox/branches/sound/src/environment.cc
r2036 r3238 16 16 */ 17 17 18 #include <iostream>19 #include <GL/glut.h>20 #include <stdlib.h>21 22 #include "data_tank.h"23 18 24 19 #include "environment.h" 20 #include "stdincl.h" 21 #include "world_entity.h" 22 #include "vector.h" 25 23 26 24 using namespace std; … … 30 28 #define LEVEL_LENGTH 500 31 29 32 Environment::Environment () 33 : WorldEntity() 30 Environment::Environment () : WorldEntity() 34 31 { 35 32 … … 60 57 Environment::~Environment () {} 61 58 59 void Environment::tick (float time) {} 62 60 61 void Environment::hit (WorldEntity* weapon, Vector loc) {} 62 63 void Environment::destroy () {} 64 65 void Environment::collide (WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags) {} 66 67 void Environment::draw () 68 { 69 glMatrixMode(GL_MODELVIEW); 70 glLoadIdentity(); 71 float matrix[4][4]; 72 73 glTranslatef(getPlacement()->r.x,getPlacement()->r.y,getPlacement()->r.z); 74 getPlacement()->w.matrix (matrix); 75 glMultMatrixf ((float*)matrix); 76 77 glBegin(GL_TRIANGLES); 78 glColor3f(1,0,1); 79 glVertex3f(0,0,0.5); 80 glVertex3f(-0.5,0,-1); 81 glVertex3f(0.5,0,-1); 82 83 glVertex3f(0,0,0.5); 84 glVertex3f(0,0.5,-1); 85 glVertex3f(0,-0.5,-1); 86 glEnd(); 87 88 glBegin(GL_QUADS); 89 glColor3f(1,0,1); 90 glVertex3f(0.5,0.5,-1); 91 glVertex3f(0.5,-0.5,-1); 92 glVertex3f(-0.5,-0.5,-1); 93 glVertex3f(-0.5,0.5,-1); 94 glEnd(); 95 } 96 97 /* 63 98 void Environment::paint() 64 99 { 65 /*100 66 101 glPushMatrix(); 67 102 //glScalef(0.5, 0.5, 1.0); … … 95 130 96 131 glPopMatrix(); 97 */132 98 133 } 99 134 … … 103 138 } 104 139 140 */ -
orxonox/branches/sound/src/environment.h
r2036 r3238 1 2 3 4 #ifndef ENVIRONEMENT_H 5 #define ENVIRONEMENT_H 6 1 #ifndef _ENVIRONEMENT_H 2 #define _ENVIRONEMENT_H 7 3 8 4 #include "world_entity.h" 9 5 10 class Environment : public WorldEntity { 6 7 class Environment : public WorldEntity 8 { 9 friend class World; 11 10 12 11 private: … … 21 20 ~Environment (); 22 21 23 void paint(void); 24 void drawEnvironment(void); 25 void setEnvPosition(void); 26 void getEnvPosition(void); 22 23 virtual void tick (float time); 24 virtual void hit (WorldEntity* weapon, Vector loc); 25 virtual void destroy (); 26 virtual void collide (WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags); 27 virtual void draw (); 27 28 28 29 }; 29 30 30 #endif 31 #endif /* _ENVIRONEMENT_H */ -
orxonox/branches/sound/src/error.h
r2644 r3238 22 22 */ 23 23 24 // this are the two undefined error nr. Don't use them ... 25 #define ERROR -1 26 #define NERROR 0 24 25 #ifndef _ERROR_H 26 #define _ERROR_H 27 28 // these are the two undefined error nr. Don't use them ... 29 #define oERROR -1 30 31 #define oNOERROR 0 27 32 28 33 /*! … … 54 59 char* message; 55 60 char* location; 56 } Error; 61 } ErrorMessage; 62 63 #endif /* _ERROR_H */ -
orxonox/branches/sound/src/game_loader.cc
r2636 r3238 42 42 43 43 44 /** 45 \brief this class is a singleton class 46 \returns an instance of itself 47 48 if you are unsure about singleton classes, check the theory out on the internet :) 49 */ 44 50 GameLoader* GameLoader::getInstance() 45 51 { … … 50 56 51 57 52 Error GameLoader::init()58 ErrorMessage GameLoader::init() 53 59 { 54 60 if(this->currentCampaign != NULL) … … 57 63 58 64 59 Error GameLoader::loadCampaign(char* name) 60 { 61 Error errorCode; 65 /** 66 \brief reads a campaign definition file into a campaign class 67 \param filename to be loaded 68 \returns the loaded campaign 69 70 this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns 71 */ 72 ErrorMessage GameLoader::loadCampaign(char* name) 73 { 74 ErrorMessage errorCode; 62 75 63 76 this->currentCampaign = this->fileToCampaign(name); 64 77 } 65 78 66 Error GameLoader::loadDebugCampaign(Uint32 campaignID) 79 80 /** 81 \brief loads a debug campaign for test purposes only. 82 \param the identifier of the campaign. 83 \returns error message if not able to do so. 84 */ 85 ErrorMessage GameLoader::loadDebugCampaign(Uint32 campaignID) 67 86 { 68 87 switch(campaignID) … … 72 91 { 73 92 Campaign* debugCampaign = new Campaign(); 93 74 94 World* world0 = new World(DEBUG_WORLD_0); 75 world0->setNextStoryID( DEBUG_WORLD_1);95 world0->setNextStoryID(WORLD_ID_1); 76 96 debugCampaign->addEntity(world0, WORLD_ID_0); 97 77 98 World* world1 = new World(DEBUG_WORLD_1); 78 99 world1->setNextStoryID(WORLD_ID_GAMEEND); … … 85 106 } 86 107 87 Error GameLoader::start()108 ErrorMessage GameLoader::start() 88 109 { 89 110 if(this->currentCampaign != NULL) … … 92 113 93 114 94 Error GameLoader::stop()115 ErrorMessage GameLoader::stop() 95 116 { 96 117 if(this->currentCampaign != NULL) … … 100 121 101 122 102 Error GameLoader::pause()123 ErrorMessage GameLoader::pause() 103 124 { 104 125 this->isPaused = true; … … 108 129 109 130 110 Error GameLoader::resume()131 ErrorMessage GameLoader::resume() 111 132 { 112 133 this->isPaused = false; … … 115 136 } 116 137 117 Error GameLoader::free() 138 /** 139 \brief release the mem 140 */ 141 ErrorMessage GameLoader::destroy() 118 142 {} 119 143 120 144 121 122 123 145 /** 146 \brief reads a campaign definition file into a campaign class 147 \param filename to be loaded 148 \returns the loaded campaign 149 150 this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns 151 */ 124 152 Campaign* GameLoader::fileToCampaign(char *name) 125 153 { … … 134 162 \brief handle keyboard commands 135 163 \param cmd: the command to handle 136 \return true if the command was handled by the system164 \returns true if the command was handled by the system 137 165 */ 138 166 bool GameLoader::worldCommand (Command* cmd) … … 165 193 return true; 166 194 } 195 else if( !strcmp( cmd->cmd, "quit")) 196 { 197 if( !cmd->bUp) this->stop(); 198 return true; 199 } 167 200 return false; 168 201 } 169 202 203 204 /* 205 \brief this changes to the next level 206 */ 170 207 void GameLoader::nextLevel() 171 208 { … … 174 211 } 175 212 213 214 /* 215 \brief change to the previous level - not implemented 216 217 this propably useless 218 */ 176 219 void GameLoader::previousLevel() 177 220 { -
orxonox/branches/sound/src/game_loader.h
r2636 r3238 1 #ifndef GAME_LOADER_H2 #define GAME_LOADER_H1 #ifndef _GAME_LOADER_H 2 #define _GAME_LOADER_H 3 3 4 4 #include "stdincl.h" … … 20 20 static GameLoader* getInstance(); 21 21 22 Error init();23 Error loadCampaign(char* name);24 Error start();25 Error stop();26 Error pause();27 Error resume();28 Error free();22 ErrorMessage init(); 23 ErrorMessage loadCampaign(char* name); 24 ErrorMessage start(); 25 ErrorMessage stop(); 26 ErrorMessage pause(); 27 ErrorMessage resume(); 28 ErrorMessage destroy(); 29 29 30 30 void nextLevel(); … … 32 32 33 33 bool worldCommand(Command* cmd); 34 Error loadDebugCampaign(Uint32 campaignID);34 ErrorMessage loadDebugCampaign(Uint32 campaignID); 35 35 36 36 private: … … 47 47 }; 48 48 49 #endif 49 #endif /* _GAME_LOADER_H */ -
orxonox/branches/sound/src/ini_parser.cc
r2551 r3238 25 25 IniParser::IniParser (char* filename) 26 26 { 27 28 29 open_file(filename);27 stream = NULL; 28 bInSection = false; 29 openFile(filename); 30 30 } 31 31 … … 35 35 IniParser::~IniParser () 36 36 { 37 37 if( stream != NULL) fclose (stream); 38 38 } 39 39 40 40 /** 41 42 43 41 \brief opens another file to parse 42 \param filename: path and name of the new file to parse 43 \return zero on success or -1 if an error occured; 44 44 */ 45 int IniParser::open _file( char* filename)45 int IniParser::openFile( char* filename) 46 46 { 47 48 49 50 51 52 53 54 55 47 if( filename == NULL) return -1; 48 if( stream != NULL) fclose (stream); 49 if( (stream = fopen (filename, "r")) == NULL) 50 { 51 printf("IniParser could not open %s\n", filename); 52 return -1; 53 } 54 bInSection = false; 55 return 0; 56 56 } 57 57 58 58 /** 59 60 61 59 \brief set the parsing cursor to the specified section 60 \param section: the name of the section to set the cursor to 61 \return zero on success or -1 if the section could not be found 62 62 */ 63 int IniParser::get _section( char* section)63 int IniParser::getSection( char* section) 64 64 { 65 65 bInSection = false; … … 95 95 96 96 /** 97 98 99 100 97 \brief gets the next VarName=VarValue pair from the parsing stream 98 \param name: a pointer to a buffer to store the name of the entry 99 \param value: a pointer to a buffer to store the value of the entry 100 \return zero if the buffers have been filled with data or -1 if there are no entries left in the current section 101 101 */ 102 int IniParser::next _var( char* name, char* value)102 int IniParser::nextVar( char* name, char* value) 103 103 { 104 if( stream == NULL) 104 if( stream == NULL) 105 { 106 bInSection = false; 107 return -1; 108 } 109 if( !bInSection) return -1; 110 111 char linebuffer[PARSELINELENGHT]; 112 char* ptr; 113 114 while( !feof( stream)) 115 { 116 // get next line 117 fgets (linebuffer, PARSELINELENGHT, stream); 118 // remove newline char 119 if( (ptr = strchr( linebuffer, '\n')) != NULL) *ptr = 0; 120 if( linebuffer[0] == '[') 105 121 { 106 107 122 bInSection = false; 123 return -1; 108 124 } 109 if( !bInSection) return -1; 110 111 char linebuffer[PARSELINELENGHT]; 112 char* ptr; 113 114 while( !feof( stream)) 125 if( (ptr = strchr( linebuffer, '=')) != NULL) 115 126 { 116 // get next line 117 fgets (linebuffer, PARSELINELENGHT, stream); 118 // remove newline char 119 if( (ptr = strchr( linebuffer, '\n')) != NULL) *ptr = 0; 120 if( linebuffer[0] == '[') 121 { 122 bInSection = false; 123 return -1; 124 } 125 if( (ptr = strchr( linebuffer, '=')) != NULL) 126 { 127 if( ptr == linebuffer) continue; 128 strcpy (value, &ptr[1]); 129 strncpy (name, linebuffer, strlen (linebuffer) - strlen (value) - 1); 130 return 0; 131 } 127 if( ptr == linebuffer) continue; 128 strcpy (value, &ptr[1]); 129 strncpy (name, linebuffer, strlen (linebuffer) - strlen (value) - 1); 130 return 0; 132 131 } 133 return -1; 132 } 133 return -1; 134 134 } 135 135 136 136 /** 137 138 139 140 141 142 143 144 137 \brief directly acesses an entry in a section 138 \param name: the name of the entry to find 139 \param section: the section where the entry is to be found 140 \param defvalue: what should be returned in case the entry cannot be found 141 \return a pointer to a buffer conatining the value of the specified entry. This buffer will contain the data specified in defvalue in case the entry wasn't found 142 143 The returned pointer points to an internal buffer, so do not free it on your own. Do not give a NULL pointer to defvalue, this will certainly 144 lead to unwanted behaviour. 145 145 */ 146 char* IniParser::get _var( char* name, char* section, char* defvalue = "")146 char* IniParser::getVar( char* name, char* section, char* defvalue = "") 147 147 { 148 strcpy (internbuf, defvalue); 149 if( get_section (section) == -1) return internbuf; 150 151 char namebuf[PARSELINELENGHT]; 152 char valuebuf[PARSELINELENGHT]; 153 154 while( next_var (namebuf, valuebuf) != -1) 148 strcpy (internbuf, defvalue); 149 if( getSection (section) == -1) return internbuf; 150 151 char namebuf[PARSELINELENGHT]; 152 char valuebuf[PARSELINELENGHT]; 153 154 while( nextVar (namebuf, valuebuf) != -1) 155 { 156 if( !strcmp (name, namebuf)) 155 157 { 156 if( !strcmp (name, namebuf)) 157 { 158 strcpy (internbuf, valuebuf); 159 return internbuf; 160 } 158 strcpy (internbuf, valuebuf); 159 return internbuf; 161 160 } 162 return internbuf; 161 } 162 return internbuf; 163 163 } -
orxonox/branches/sound/src/ini_parser.h
r2190 r3238 6 6 */ 7 7 8 #ifndef INI_PARSER_H9 #define INI_PARSER_H8 #ifndef _INI_PARSER_H 9 #define _INI_PARSER_H 10 10 11 11 #include <stdio.h> … … 29 29 ~IniParser (); 30 30 31 char* get _var( char* name, char* section, char* defvalue);32 int open _file( char* name);33 int get _section( char* section);34 int next _var( char* name, char* value);31 char* getVar( char* name, char* section, char* defvalue); 32 int openFile( char* name); 33 int getSection( char* section); 34 int nextVar( char* name, char* value); 35 35 }; 36 36 37 #endif 37 #endif /* _INI_PARSER_H */ -
orxonox/branches/sound/src/keynames.cc
r2551 r3238 13 13 co-programmer: ... 14 14 */ 15 #include <SDL/SDL.h>16 15 17 16 #include "keynames.h" … … 21 20 using namespace std; 22 21 23 int buttonname _to_SDLB( char* name)22 int buttonnameToSDLB( char* name) 24 23 { 25 24 if( !strcmp (name, "BUTTON_LEFT")) return SDL_BUTTON_LEFT; … … 31 30 } 32 31 33 char* SDLB _to_buttonname( int button)32 char* SDLBToButtonname( int button) 34 33 { 35 34 if( button == SDL_BUTTON_LEFT) return "BUTTON_LEFT"; … … 41 40 } 42 41 43 int keyname _to_SDLK( char* name)42 int keynameToSDLK( char* name) 44 43 { 45 44 if( !strcmp (name, "BACKSPACE")) return SDLK_BACKSPACE; … … 179 178 } 180 179 181 char* SDLK _to_keyname( int key)180 char* SDLKToKeyname( int key) 182 181 { 183 182 if( key == SDLK_BACKSPACE) return "BACKSPACE"; -
orxonox/branches/sound/src/keynames.h
r2551 r3238 5 5 Converts strings to SDLK/SDL_BUTTON values and vice versa 6 6 */ 7 #ifndef _KEYNAMES_H 8 #define _KEYNAMES_H 9 7 10 8 11 #ifdef __WIN32__ … … 10 13 #endif 11 14 15 #ifndef __APPLE__ 12 16 #include <SDL/SDL.h> 17 #else 18 #include <SDL.h> 19 #endif 13 20 14 21 /** … … 17 24 \return an int containing the SDL identifier of the mouse button or -1 if the button name is not valid 18 25 */ 19 int buttonname _to_SDLB( char* name);26 int buttonnameToSDLB( char* name); 20 27 21 28 /** … … 24 31 \return a pointer to a string containing the name of the mouse button 25 32 */ 26 char* SDLB _to_buttonname( int button);33 char* SDLBToButtonname( int button); 27 34 28 35 /** … … 31 38 \return the SDLK sym of the named key or -1 if the key name is not valid 32 39 */ 33 int keyname _to_SDLK( char* name);40 int keynameToSDLK( char* name); 34 41 35 42 /** … … 38 45 \return a pointer to a string containig the name of the key 39 46 */ 40 char* SDLK _to_keyname( int key);47 char* SDLKToKeyname( int key); 41 48 49 50 #endif /* _KEYNAMES_H */ -
orxonox/branches/sound/src/list.h
r2636 r3238 1 /* 2 orxonox - the future of 3D-vertical-scrollers 3 4 Copyright (C) 2004 orx 5 6 This program is free software; you can redistribute it and/or modify 7 it under the terms of the GNU General Public License as published by 8 the Free Software Foundation; either version 2, or (at your option) 9 any later version. 10 11 ### File Specific: 12 main-programmer: Christian Meyer 13 14 ADDONS/FIXES: 15 16 Patrick Boenzli : Implemented getSize() function 17 */ 18 19 20 /*! 21 \file list.h 22 \brief Contains a template for a doubly linked list 23 */ 24 25 #ifndef LIST_H 26 #define LIST_H 27 28 #include "stdlib.h" 1 2 #ifndef _LIST_H 3 #define _LIST_H 4 5 #include "stdincl.h" 29 6 30 7 //! An enum to list all the modes available when adding an object to a List 31 enum ADDMODE {LIST_ADD_NEXT, LIST_ADD_PREV,LIST_ADD_FIRST, LIST_ADD_LAST};8 //enum ADDMODE {LIST_ADD_FIRST, LIST_ADD_LAST}; 32 9 //! An enum to list the two searching directions available when removing an object from a List 33 enum FINDMODE {LIST_FIND_BW, LIST_FIND_FW}; 34 35 //! A generic doubly linked list 36 template<class T> class List 37 { 38 T* object; 39 List<T>* next; 40 List<T>* prev; 41 bool bReference; 42 int size; 10 //enum FINDMODE {LIST_FIND_BW, LIST_FIND_FW}; 11 12 13 14 class WorldEntity; 15 16 class List { 17 18 public: 19 List (); 20 ~List (); 21 22 void add(WorldEntity* entity); 23 void remove(WorldEntity* entity); 24 void destroy(); 25 WorldEntity* firstElement(); 26 bool isEmpty(); 27 int getSize(); 28 WorldEntity* enumerate(); 29 WorldEntity* nextElement(); 30 WorldEntity* toArray(); 31 void debug(); 32 33 private: 34 struct listElement 35 { 36 listElement* prev; 37 WorldEntity* curr; 38 listElement* next; 39 }; 40 Uint32 size; 41 listElement* first; 42 listElement* last; 43 listElement* currentEl; 44 45 46 }; 47 48 class Iterator 49 { 50 51 public: 52 bool hasNext(); 53 WorldEntity* next(); 54 55 private: 56 57 }; 58 59 60 template<class T> class tList 61 { 62 private: 63 struct listElement 64 { 65 listElement* prev; 66 T* curr; 67 listElement* next; 68 }; 69 70 Uint32 size; 71 listElement* first; 72 listElement* last; 73 listElement* currentEl; 43 74 44 75 public: 45 List (T* obj, List<T>* n, List<T>* p, bool bRef);46 ~ List ();76 tList (); 77 ~tList (); 47 78 48 int add (T* obj, ADDMODE mode, bool bRef); 49 T* get_object(); 50 List<T>* get_next (); 51 List<T>* get_previous (); 52 List<T>* get_last (); 53 List<T>* get_first (); 54 void set_next (List<T>* ptr); 55 void set_prev (List<T>* ptr); 56 int remove (T* obj, FINDMODE mode); 79 80 void add(WorldEntity* entity); 81 void remove(WorldEntity* entity); 82 void destroy(); 83 T* firstElement(); 84 bool isEmpty(); 57 85 int getSize(); 86 T* enumerate(); 87 T* nextElement(); 88 T* toArray(); 89 void debug(); 58 90 }; 59 91 60 92 61 /** 62 \brief Standard constructor 63 64 Call this without any parameters to generate a new List which can be filled with content. 65 DO NOT create a List element that contains an object on your own, you'll lose the data 66 contained in that object and will have trouble removing the list from your memory. 67 */ 68 template<class T> 69 List<T>::List (T* obj = NULL, List<T>* n = NULL, List<T>* p = NULL, bool bRef = false) 70 { 71 object = obj; 72 next = n; 73 prev = p; 74 bReference = bRef; 75 if(obj != NULL) 76 ++size; 77 } 78 79 /** 80 \brief Standard destructor 81 82 Call this on the initially generated base List element to remove the whole List from the memory. 83 You can safely do this to any List element you want without messing up the rest of the List, but keep in mind 84 that the contained object will be deleted as well when bRef had been set to false. 85 */ 86 template<class T> 87 List<T>::~List () 88 { 89 if (object == NULL) // deleted foot node => disband the list 90 { 91 while( next != NULL) 93 template<class T> 94 tList<T>::tList () 95 { 96 this->first = NULL; 97 this->last = NULL; 98 this->size = 0; 99 } 100 101 template<class T> 102 tList<T>::~tList () 103 {} 104 105 template<class T> 106 void tList<T>::add(WorldEntity* entity) 107 { 108 listElement* el = new listElement; 109 el->prev = this->last; 110 el->curr = entity; 111 el->next = NULL; 112 113 this->last = el; 114 115 if(this->size == 0) this->first = el; 116 else el->prev->next = el; 117 this->size++; 118 } 119 120 121 template<class T> 122 void tList<T>::remove(WorldEntity* entity) 123 { 124 this->currentEl = this->first; 125 listElement* te; 126 while( this->currentEl != NULL) 92 127 { 93 delete next; 128 if( this->currentEl->curr == entity) 129 { 130 if( this->currentEl->prev == NULL ) this->first = this->currentEl->next; 131 else this->currentEl->prev->next = this->currentEl->next; 132 133 if( this->currentEl->next == NULL) this->last = this->currentEl->prev; 134 else this->currentEl->next->prev = this->currentEl->prev; 135 136 te = this->currentEl->next; 137 delete this->currentEl; 138 this->currentEl = te; 139 return; 140 } 141 this->currentEl = this->currentEl->next; 94 142 } 95 while( prev != NULL) 143 } 144 145 146 template<class T> 147 void tList<T>::destroy() 148 { 149 this->currentEl = this->first; 150 while(this->currentEl != NULL) 96 151 { 97 delete prev; 152 listElement* le = this->currentEl->next; 153 delete this->currentEl->curr; 154 delete this->currentEl; 155 this->currentEl = le; 98 156 } 99 } 100 else 101 { 102 if (prev != NULL) prev->set_next (next); 103 if (next != NULL) next->set_prev (prev); 104 if (!bReference) delete object; 105 } 106 } 107 108 /** 109 \brief Add an object to the List 110 \param obj: A pointer to an allocated object 111 \param mode: A Value of ADDMODE (default: LIST_ADD_NEXT) 112 \param bRef: Sets whether the element is serving as a storage point or a simple listing (default: false) 113 \return 0 if the operation succeded, -1 if the element could not be added 114 115 This adds a new List element to the chain. The mode parameter can be used to specify 116 the location where the element should be added. LIST_ADD_NEXT will add the new element directly 117 after the base element. LIST_ADD_PREV will add the new element directly before the base element. 118 LIST_ADD_FIRST will add the element at the beginning of the List whereas LIST_ADD_LAST will add 119 it to the end of the chain. If the bRef parameter is set to true, the object pointer will not be deleted 120 when the element containing that object is deleted, thus the List can be used for temporary listings as 121 well as permanent data storage. 122 */ 123 template<class T> 124 int List<T>::add (T* obj, ADDMODE mode = LIST_ADD_NEXT, bool bRef = false) 125 { 126 List<T>* p; 127 if( obj == NULL) return -1; 128 switch (mode) 129 { 130 case LIST_ADD_NEXT: 131 p = new List<T>( obj, next, this, bRef); 132 if( next != NULL) next->set_prev (p); 133 next = p; 134 break; 135 case LIST_ADD_PREV: 136 p = new List<T>( obj, this, prev, bRef); 137 if( prev != NULL) prev->set_next (p); 138 prev = p; 139 break; 140 case LIST_ADD_FIRST: 141 if (prev == NULL) prev = new List<T> (obj, this, NULL, bRef); 142 else return prev->add (obj, mode, bRef); 143 break; 144 case LIST_ADD_LAST: 145 if (next == NULL) next = new List<T> (obj, NULL, this, bRef); 146 else return next->add (obj, mode, bRef); 147 break; 148 default: 149 return -1; 150 break; 151 } 152 ++size; 153 return 0; 154 } 155 156 /** 157 \brief Get the next element of the List 158 \return The List element after the current List element 159 */ 160 template<class T> 161 List<T>* List<T>::get_next () 162 { 163 return next; 164 } 165 166 /** 167 \brief Get the previous element of the List 168 \return The List element before the current List element 169 */ 170 template<class T> 171 List<T>* List<T>::get_previous () 172 { 173 return prev; 174 } 175 176 /** 177 \brief Get the last element of the List 178 \return The last List element 179 */ 180 template<class T> 181 List<T>* List<T>::get_last () 182 { 183 if (next == NULL) return this; 184 else return next->get_last(); 185 } 186 187 /** 188 \brief Get the first element of the List 189 \return The first List element 190 */ 191 template<class T> 192 List<T>* List<T>::get_first () 193 { 194 if (prev == NULL) return this; 195 else return prev->get_first(); 196 } 197 198 /** 199 \brief Removes a certain element from the List 200 \param obj: A pointer to the object that should be removed 201 \param mode: A value of FINDMODE 202 \return 0 if the element was found and removed, -1 if the element was not found 203 204 This searches the part of the List specified with mode for the object in question. 205 When the object is found it is deleted and the List element is removed from the chain. 206 If mode is LIST_FIND_FW all elements AFTER the base element are searched, if mode is 207 LIST_FIND_BW all elements BEFORE the base element are searched. Note that the object 208 contained within the List element is NOT deleted when bRef was set to true. 209 */ 210 template<class T> 211 int List<T>::remove (T* obj, FINDMODE mode = LIST_FIND_FW) 212 { 213 if (obj == NULL) return -1; 214 else 215 { 216 switch (mode) 217 { 218 case LIST_FIND_BW: 219 if (prev == NULL) return -1; 220 else 221 { 222 if( prev->get_object() == obj) 223 { 224 delete prev; 225 } 226 else 227 { 228 return prev->remove( obj, mode); 229 } 230 } 231 break; 232 case LIST_FIND_FW: 233 if (next == NULL) return -1; 234 else 235 { 236 if( next->get_object() == obj) 237 { 238 delete next; 239 } 240 else 241 { 242 return next->remove( obj, mode); 243 } 244 } 245 break; 246 default: 247 return -1; 248 } 249 } 250 --size; 251 return 0; 252 } 253 254 /** 255 \brief Set the next element of a List element 256 \param ptr: A pointer to the new next element 257 258 Sets the next element of a List element... Better not touch this, it can really mess up a List. 259 */ 260 template<class T> 261 void List<T>::set_next (List<T>* ptr) 262 { 263 next = ptr; 264 } 265 266 /** 267 \brief Set the prev element of a List element 268 \param ptr: A pointer to the new previous element 269 270 Sets the previous element of a List element... Better not touch this, it can really mess up a List. 271 */ 272 template<class T> 273 void List<T>::set_prev (List<T>* ptr) 274 { 275 prev = ptr; 276 } 277 278 /** 279 \brief Get the pointer to the object the element is containing 280 \return The contained object (will be NULL if called on the base element). 281 */ 282 template<class T> 283 T* List<T>::get_object() 284 { 285 return object; 286 } 287 288 289 /** 290 \brief Returns the current size of the List 291 \return Size of List 292 */ 293 template<class T> 294 int List<T>::getSize() 157 this->first = NULL; 158 this->last = NULL; 159 this->size = 0; 160 } 161 162 163 template<class T> 164 T* tList<T>::firstElement() 165 { 166 return this->first->curr; 167 } 168 169 170 template<class T> 171 bool tList<T>::isEmpty() 172 { 173 return (this->size==0)?true:false; 174 } 175 176 177 template<class T> 178 int tList<T>::getSize() 295 179 { 296 180 return this->size; 297 181 } 298 182 299 #endif 300 183 184 template<class T> 185 T* tList<T>::enumerate() 186 { 187 if(this->size == 0) return NULL; 188 this->currentEl = this->first; 189 return this->currentEl->curr; 190 } 191 192 193 template<class T> 194 T* tList<T>::nextElement() 195 { 196 if(this->size == 0) return NULL; 197 this->currentEl = this->currentEl->next; 198 if(this->currentEl == NULL) return NULL; 199 return this->currentEl->curr; 200 } 201 202 203 template<class T> 204 T* tList<T>::toArray() 205 {} 206 207 #endif /* _LIST_H */ -
orxonox/branches/sound/src/message_structures.h
r2551 r3238 4 4 */ 5 5 6 #ifndef _MESSAGE STRUCTURES_H7 #define _MESSAGE STRUCTURES_H6 #ifndef _MESSAGE_STRUCTURES_H 7 #define _MESSAGE_STRUCTURES_H 8 8 9 9 #define CMD_LENGHT 16 … … 26 26 } Command; 27 27 28 #endif 28 #endif /* _MESSAGE_STRUCTURES_H */ -
orxonox/branches/sound/src/npc.h
r2036 r3238 1 1 2 #ifndef NPC_H3 #define NPC_H2 #ifndef _NPC_H 3 #define _NPC_H 4 4 5 5 #include "world_entity.h" … … 41 41 }; 42 42 43 #endif 43 #endif /* _NPC_H */ -
orxonox/branches/sound/src/orxonox.cc
r2636 r3238 47 47 Orxonox::~Orxonox () 48 48 { 49 Orxonox::singleton _ref = NULL;49 Orxonox::singletonRef = NULL; 50 50 if( world != NULL) delete world; 51 51 if( localinput != NULL) delete world; … … 56 56 57 57 /* this is a singleton class to prevent duplicates */ 58 Orxonox* Orxonox::singleton _ref = 0;58 Orxonox* Orxonox::singletonRef = 0; 59 59 60 60 Orxonox* Orxonox::getInstance (void) 61 61 { 62 if (singleton _ref == NULL)63 singleton _ref = new Orxonox();64 return singleton _ref;62 if (singletonRef == NULL) 63 singletonRef = new Orxonox(); 64 return singletonRef; 65 65 } 66 66 … … 72 72 it's path and name into configfilename 73 73 */ 74 void Orxonox::get_config_file (int argc, char** argv) 75 { 76 /* char* path; 77 #ifdef __WIN32__ 78 path = getenv(""); 79 #else 80 path = getenv("HOME"); 81 #endif 82 83 if( path != NULL) strcpy (configfilename, path); 84 else strcpy (configfilename, "./"); 85 strcat (configfilename, "/.orxonox.conf");*/ 86 74 void Orxonox::getConfigFile (int argc, char** argv) 75 { 87 76 strcpy (configfilename, "orxonox.conf"); 88 77 } … … 96 85 // config file 97 86 98 get_config_file (argc, argv); 99 100 // initialize SDL 101 printf("> Initializing SDL\n"); 102 if( SDL_Init (SDL_INIT_EVERYTHING) == -1) 87 getConfigFile (argc, argv); 88 SDL_Init (SDL_INIT_TIMER); 89 // initialize everything 90 if( initVideo() == -1) return -1; 91 if( initSound() == -1) return -1; 92 printf("> Initializing input\n"); 93 if( initInput() == -1) return -1; 94 printf("> Initializing networking\n"); 95 if( initNetworking () == -1) return -1; 96 printf("> Initializing resources\n"); 97 if( initResources () == -1) return -1; 98 //printf("> Initializing world\n"); 99 //if( init_world () == -1) return -1; PB: world will be initialized when started 100 101 return 0; 102 } 103 104 /** 105 \brief initializes SDL and OpenGL 106 */ 107 int Orxonox::initVideo() 108 { 109 printf("> Initializing video\n"); 110 if (SDL_Init(SDL_INIT_VIDEO) == -1) 103 111 { 104 printf (" Could not SDL_Init(): %s\n", SDL_GetError());112 printf ("could not initialize SDL Video\n"); 105 113 return -1; 106 114 } 107 108 // initialize everything109 printf("> Initializing video\n");110 if( init_video () == -1) return -1;111 printf("> Initializing sound\n");112 if( init_sound () == -1) return -1;113 printf("> Initializing input\n");114 if( init_input () == -1) return -1;115 printf("> Initializing networking\n");116 if( init_networking () == -1) return -1;117 printf("> Initializing resources\n");118 if( init_resources () == -1) return -1;119 //printf("> Initializing world\n");120 //if( init_world () == -1) return -1; PB: world will be initialized when started121 122 return 0;123 }124 125 /**126 \brief initializes SDL and OpenGL127 */128 int Orxonox::init_video ()129 {130 115 // Set video mode 131 116 // TO DO: parse arguments for settings 132 SDL_GL_SetAttribute 133 SDL_GL_SetAttribute 134 SDL_GL_SetAttribute 135 SDL_GL_SetAttribute 117 SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5); 118 SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5); 119 SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5); 120 SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16); 136 121 137 122 int bpp = 16; … … 140 125 Uint32 flags = SDL_HWSURFACE | SDL_OPENGL | SDL_GL_DOUBLEBUFFER; 141 126 142 if( 127 if((screen = SDL_SetVideoMode (width, height, bpp, flags)) == NULL) 143 128 { 144 printf 129 printf("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", width, height, bpp, flags, SDL_GetError()); 145 130 SDL_Quit(); 146 131 return -1; … … 148 133 149 134 // Set window labeling 150 // TO DO: Add version information to caption 151 SDL_WM_SetCaption( "Orxonox", "Orxonox"); 135 SDL_WM_SetCaption("Orxonox " PACKAGE_VERSION, "Orxonox " PACKAGE_VERSION); 152 136 153 137 // TO DO: Create a cool icon and use it here … … 158 142 glClearColor(0.0, 0.0, 0.0, 0.0); 159 143 glEnable(GL_DEPTH_TEST); 160 glEnable(GL_COLOR); 161 glShadeModel(GL_FLAT); 144 145 // LIGHTING 146 GLfloat lmodelAmbient[] = {.1, .1, .1, 1.0}; 147 GLfloat whiteLight[] = {1.0, 1.0, 1.0,1.0}; 148 GLfloat lightPosition[] = {10.0, 10, 19.0, 0.0}; 149 150 glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight); 151 glLightfv(GL_LIGHT0, GL_SPECULAR, whiteLight); 152 glEnable(GL_LIGHTING); 153 glEnable(GL_LIGHT0); 154 glEnable(GL_DEPTH_TEST); 155 glLightfv(GL_LIGHT0, GL_POSITION, lightPosition); 156 glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight); 157 158 // glEnable(GL_COLOR); 159 // glShadeModel(GL_SMOOTH); 162 160 163 161 // create camera 164 localcamera = new Camera(world); 165 166 return 0; 167 } 162 //localcamera = new Camera(world); /* \todo camera/input node not used anymore*/ 163 164 return 0; 165 } 166 168 167 169 168 /** 170 169 \brief initializes the sound engine 171 170 */ 172 int Orxonox::init_sound () 173 { 171 int Orxonox::initSound() 172 { 173 printf("> Initializing sound\n"); 174 // SDL_Init(SDL_INIT_AUDIO); 174 175 printf("Not yet implemented\n"); 175 176 return 0; 176 177 } 177 178 179 178 180 /** 179 181 \brief initializes input functions 180 182 */ 181 int Orxonox::init _input()183 int Orxonox::initInput() 182 184 { 183 185 // create localinput … … 187 189 } 188 190 191 189 192 /** 190 193 \brief initializes network system 191 194 */ 192 int Orxonox::init _networking()195 int Orxonox::initNetworking() 193 196 { 194 197 printf("Not yet implemented\n"); … … 196 199 } 197 200 201 198 202 /** 199 203 \brief initializes and loads resource files 200 204 */ 201 int Orxonox::init _resources()205 int Orxonox::initResources() 202 206 { 203 207 printf("Not yet implemented\n"); … … 205 209 } 206 210 211 207 212 /** 208 213 \brief initializes the world 209 214 */ 210 int Orxonox::init _world()215 int Orxonox::initWorld() 211 216 { 212 217 //world = new World(); … … 236 241 } 237 242 243 238 244 /** 239 245 \brief exits Orxonox … … 244 250 } 245 251 246 /** 247 \brief this runs all of Orxonox 248 */ 249 void Orxonox::mainLoop() 250 { 251 lastframe = SDL_GetTicks(); 252 bQuitOrxonox = false; 253 // This is where everything is run 254 printf("Orxonox|Entering main loop\n"); 255 while( !bQuitOrxonox) 256 { 257 // Network 258 synchronize(); 259 // Process input 260 handle_input(); 261 // Process time 262 time_slice(); 263 // Process collision 264 collision(); 265 // Draw 266 display(); 267 } 268 printf("Orxonox|Exiting the main loop\n"); 269 } 252 270 253 271 254 /** … … 273 256 \param event: an event not handled by the CommandNode 274 257 */ 275 void Orxonox::event _handler(SDL_Event* event)258 void Orxonox::eventHandler(SDL_Event* event) 276 259 { 277 260 // Handle special events such as reshape, quit, focus changes 278 261 } 279 280 /** 281 \brief synchronize local data with remote data 282 */ 283 void Orxonox::synchronize () 284 { 285 // Get remote input 286 // Update synchronizables 287 } 288 289 /** 290 \brief run all input processing 291 */ 292 void Orxonox::handle_input () 293 { 294 // localinput 295 localinput->process(); 296 // remoteinput 297 } 298 299 /** 300 \brief advance the timeline 301 */ 302 void Orxonox::time_slice () 303 { 304 Uint32 curframe = SDL_GetTicks(); 305 if( !pause) 306 { 307 Uint32 dt = curframe - lastframe; 308 309 if(dt > 0) 310 { 311 float fps = 1000/dt; 312 printf("fps = %f\n", fps); 313 } 314 315 world->time_slice (dt); 316 world->update (); 317 localcamera->time_slice (dt); 318 } 319 lastframe = curframe; 320 } 321 322 /** 323 \brief compute collision detection 324 */ 325 void Orxonox::collision () 326 { 327 world->collide (); 328 } 262 329 263 330 264 /** … … 333 267 \return true if the command was handled by the system or false if it may be passed to the WorldEntities 334 268 */ 335 bool Orxonox::system_command (Command* cmd) 336 { 269 bool Orxonox::systemCommand(Command* cmd) 270 { 271 /* 337 272 if( !strcmp( cmd->cmd, "quit")) 338 273 { … … 341 276 } 342 277 return false; 343 } 344 345 /** 346 \brief render the current frame 347 */ 348 void Orxonox::display () 349 { 350 // clear buffer 351 glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); 352 // set camera 353 localcamera->apply (); 354 // draw world 355 world->draw (); 356 // draw HUD 357 // flip buffers 358 SDL_GL_SwapBuffers(); 359 } 278 */ 279 return false; 280 } 281 360 282 361 283 /** … … 363 285 \return a pointer to localcamera 364 286 */ 365 Camera* Orxonox::get _camera()287 Camera* Orxonox::getCamera() 366 288 { 367 289 return localcamera; 368 290 } 291 369 292 370 293 /** … … 372 295 \return a pointer to localinput 373 296 */ 374 CommandNode* Orxonox::get _localinput()297 CommandNode* Orxonox::getLocalInput() 375 298 { 376 299 return localinput; 377 300 } 301 378 302 379 303 /** … … 381 305 \return a pointer to world 382 306 */ 383 World* Orxonox::get _world()307 World* Orxonox::getWorld() 384 308 { 385 309 return world; 386 310 } 387 311 388 int main (int argc, char** argv) 312 313 314 315 int main(int argc, char** argv) 389 316 { 390 317 printf(">>> Starting Orxonox <<<\n"); 391 318 Orxonox *orx = Orxonox::getInstance(); 392 319 393 if( 320 if((*orx).init(argc, argv) == -1) 394 321 { 395 322 printf("! Orxonox initialization failed\n"); … … 397 324 } 398 325 399 //(*orx).mainLoop();400 401 326 orx->start(); 402 327 -
orxonox/branches/sound/src/orxonox.h
r2636 r3238 4 4 */ 5 5 6 #ifndef ORXONOX_H 7 #define ORXONOX_H 8 9 #include <SDL/SDL.h> 6 #ifndef _ORXONOX_H 7 #define _ORXONOX_H 10 8 11 9 #include "stdincl.h" … … 24 22 25 23 private: 26 static Orxonox* singleton _ref;24 static Orxonox* singletonRef; 27 25 Orxonox (); 28 26 ~Orxonox (); … … 40 38 Uint32 lastframe; 41 39 42 void get _config_file (int argc, char** argv);40 void getConfigFile (int argc, char** argv); 43 41 44 42 // main loop functions 45 void synchronize ();46 void handle_input ();47 void time_slice ();48 void collision ();49 void display ();43 // void synchronize (); 44 //void handle_input (); 45 //void time_slice (); 46 //void collision (); 47 //void display (); 50 48 51 49 // subsystem initialization 52 int init _video ();53 int init _sound ();54 int init _input ();55 int init _networking ();56 int init _resources ();57 int init _world ();50 int initVideo (); 51 int initSound (); 52 int initInput (); 53 int initNetworking (); 54 int initResources (); 55 int initWorld (); 58 56 59 57 public: … … 62 60 void quitGame(); 63 61 64 void event _handler (SDL_Event* event);65 bool system _command (Command* cmd);62 void eventHandler (SDL_Event* event); 63 bool systemCommand (Command* cmd); 66 64 67 65 int init (int argc, char** argv); 68 66 69 CommandNode* get _localinput();70 Camera* get _camera();71 World* get _world();67 CommandNode* getLocalInput(); 68 Camera* getCamera(); 69 World* getWorld(); 72 70 73 void mainLoop();71 //void mainLoop(); 74 72 }; 75 73 76 #endif 74 #endif /* _ORXONOX_H */ 77 75 -
orxonox/branches/sound/src/player.cc
r2640 r3238 25 25 Player::Player(bool isFree) : WorldEntity(isFree) 26 26 { 27 }28 27 29 Player::~Player () 28 this->obj = new Object("reaplow.obj"); 29 /* 30 objectList = glGenLists(1); 31 glNewList (objectList, GL_COMPILE); 30 32 31 {32 }33 34 void Player::post_spawn ()35 {36 travel_speed = 15.0;37 velocity = Vector();38 bUp = bDown = bLeft = bRight = bAscend = bDescend = false;39 bFire = false;40 acceleration = 10.0;41 set_collision (new CollisionCluster (1.0, Vector(0,0,0)));42 }43 44 void Player::tick (float time)45 {46 // movement47 move (time);48 }49 50 void Player::hit (WorldEntity* weapon, Vector loc)51 {52 }53 54 void Player::destroy ()55 {56 }57 58 void Player::collide (WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags)59 {60 }61 62 void Player::command (Command* cmd)63 {64 //printf("Player|recieved command [%s]\n", cmd->cmd);65 if( !strcmp( cmd->cmd, "up")) bUp = !cmd->bUp;66 else if( !strcmp( cmd->cmd, "down")) bDown = !cmd->bUp;67 else if( !strcmp( cmd->cmd, "left")) bLeft = !cmd->bUp;68 else if( !strcmp( cmd->cmd, "right")) bRight = !cmd->bUp;69 else if( !strcmp( cmd->cmd, "fire")) bFire = !cmd->bUp;70 }71 72 void Player::draw ()73 {74 glMatrixMode(GL_MODELVIEW);75 glLoadIdentity();76 float matrix[4][4];77 78 glTranslatef(get_placement()->r.x,get_placement()->r.y,get_placement()->r.z);79 get_placement()->w.matrix (matrix);80 glMultMatrixf ((float*)matrix);81 82 33 glBegin(GL_TRIANGLES); 83 34 glColor3f(1,1,1); … … 99 50 glEnd(); 100 51 101 //printf("Player@%f/%f/%f\n", get_placement()->r.x, get_placement()->r.y, get_placement()->r.z); 52 glEndList (); 53 */ 102 54 } 103 55 104 void Player::get_lookat (Location* locbuf)56 Player::~Player() 105 57 { 106 *locbuf = *get_location(); 107 //locbuf->dist += 5.0; 58 delete this->obj; 108 59 } 109 60 110 void Player::left_world () 61 void Player::postSpawn() 62 { 63 travelSpeed = 15.0; 64 velocity = Vector(); 65 bUp = bDown = bLeft = bRight = bAscend = bDescend = false; 66 bFire = false; 67 acceleration = 10.0; 68 setCollision(new CollisionCluster(1.0, Vector(0,0,0))); 69 } 70 71 void Player::tick(float time) 72 { 73 // movement 74 move (time); 75 } 76 77 void Player::hit(WorldEntity* weapon, Vector loc) 111 78 { 112 79 } 113 80 114 void Player::move (float time) 81 void Player::destroy() 82 { 83 } 84 85 void Player::collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags) 86 { 87 } 88 89 void Player::command(Command* cmd) 90 { 91 //printf("Player|recieved command [%s]\n", cmd->cmd); 92 if( !strcmp( cmd->cmd, "up")) bUp = !cmd->bUp; 93 else if( !strcmp( cmd->cmd, "down")) bDown = !cmd->bUp; 94 else if( !strcmp( cmd->cmd, "left")) bLeft = !cmd->bUp; 95 else if( !strcmp( cmd->cmd, "right")) bRight = !cmd->bUp; 96 else if( !strcmp( cmd->cmd, "fire")) bFire = !cmd->bUp; 97 } 98 99 void Player::draw() 100 { 101 glMatrixMode(GL_MODELVIEW); 102 glLoadIdentity(); 103 float matrix[4][4]; 104 105 glTranslatef(getPlacement()->r.x, getPlacement()->r.y, getPlacement()->r.z); 106 getPlacement()->w.matrix (matrix); 107 glMultMatrixf((float*)matrix); 108 109 glMatrixMode(GL_MODELVIEW); 110 glRotatef(-90, 0,1,0); 111 obj->draw(); 112 // glCallList(objectList); 113 114 115 116 } 117 118 void Player::getLookat(Location* locbuf) 119 { 120 *locbuf = *getLocation(); 121 //locbuf->dist += 5.0; 122 } 123 124 void Player::leftWorld() 125 { 126 } 127 128 void Player::move(float time) 115 129 { 116 130 Vector accel(0.0, 0.0, 0.0); 117 /* FIXME: calculating the direction and orthDirection every time _slice is redundant! save it somewhere */118 Placement *pos = get _placement();131 /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */ 132 Placement *pos = getPlacement(); 119 133 /* calculate the direction in which the craft is heading */ 120 134 Vector direction(0.0, 0.0, 1.0); … … 128 142 if( bRight ) { accel = accel - (orthDirection*acceleration); } 129 143 if( bAscend ) { /* not yet implemented but just: (0,0,1)*acceleration */} 130 if( bDescend) {/* FIXME */} 144 if( bDescend) {/* FIXME */} /* \todo up and down player movement */ 131 145 132 Location* l = get _location();146 Location* l = getLocation(); 133 147 134 148 // r(t) = r(0) + v(0)*t + 1/2*a*t^2 … … 138 152 139 153 /* this the base-speed of the player: determines how fast and how the player follows the track*/ 140 l->dist = l->dist + travel _speed * time;154 l->dist = l->dist + travelSpeed * time; 141 155 142 156 /* this updates the player position on the track - user interaction */ 143 157 l->pos = l->pos + accel*time; 144 158 } 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 -
orxonox/branches/sound/src/player.h
r2551 r3238 4 4 */ 5 5 6 #ifndef PLAYER_H7 #define PLAYER_H6 #ifndef _PLAYER_H 7 #define _PLAYER_H 8 8 9 9 #include "world_entity.h" 10 #include "importer/object.h" 10 11 11 12 //! Basic controllable WorldEntity … … 15 16 16 17 public: 17 Player 18 ~Player 18 Player(bool isFree = false); 19 ~Player(); 19 20 20 virtual void post _spawn();21 virtual void tick 22 virtual void hit 23 virtual void destroy 24 virtual void collide (WorldEntity* other,Uint32 ownhitflags, Uint32 otherhitflags);25 virtual void command 21 virtual void postSpawn(); 22 virtual void tick(float time); 23 virtual void hit(WorldEntity* weapon, Vector loc); 24 virtual void destroy(); 25 virtual void collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags); 26 virtual void command(Command* cmd); 26 27 27 virtual void draw 28 virtual void get _lookat(Location* locbuf);28 virtual void draw(); 29 virtual void getLookat(Location* locbuf); 29 30 30 virtual void left _world();31 virtual void leftWorld(); 31 32 32 33 private: … … 34 35 bool bFire; 35 36 Vector velocity; 36 float travel _speed;37 float travelSpeed; 37 38 float acceleration; 39 GLuint objectList; 40 Object* obj; 38 41 39 void move 42 void move(float time); 40 43 41 44 }; 42 45 43 #endif 46 #endif /* _PLAYER_H */ -
orxonox/branches/sound/src/power_up.h
r2077 r3238 4 4 */ 5 5 6 #ifndef POWER_UP_H7 #define POWER_UP_H6 #ifndef _POWER_UP_H 7 #define _POWER_UP_H 8 8 9 9 #include "data_tank.h" … … 19 19 }; 20 20 21 #endif 21 #endif /* _POWER_UP_H */ -
orxonox/branches/sound/src/proto_class.h
r2036 r3238 1 1 2 #ifndef PROTO_CLASS_H3 #define PROTO_CLASS_H2 #ifndef _PROTO_CLASS_H 3 #define _PROTO_CLASS_H 4 4 5 5 #include "data_tank.h" … … 14 14 }; 15 15 16 #endif 16 #endif /* _PROTO_CLASS_H */ -
orxonox/branches/sound/src/shoot_laser.h
r2036 r3238 1 1 2 #ifndef SHOOT_LASER_H3 #define SHOOT_LASER_H2 #ifndef _SHOOT_LASER_H 3 #define _SHOOT_LASER_H 4 4 5 5 … … 40 40 }; 41 41 42 #endif 42 #endif /* _SHOOT_LASER_H */ -
orxonox/branches/sound/src/shoot_rocket.h
r2036 r3238 1 1 2 #ifndef SHOOT_ROCKET_H3 #define SHOOT_ROCKET_H2 #ifndef _SHOOT_ROCKET_H 3 #define _SHOOT_ROCKET_H 4 4 5 5 … … 54 54 }; 55 55 56 #endif 56 #endif /* _SHOOT_ROCKET_H */ -
orxonox/branches/sound/src/stdincl.h
r2636 r3238 1 /*! 2 \file stdincl.h 3 \brief This file includes default headers that nearly every Class needs. 4 5 no Class is defined here, but many headers to classes, and more general Headers like the openGL-header. 6 */ 1 7 2 #ifndef STDINCL_H3 #define STDINCL_H8 #ifndef _STDINCL_H 9 #define _STDINCL_H 4 10 5 #define null 0 11 #define null 0 //!< null 12 13 // this includes the information from configure/makefiles 14 #if HAVE_CONFIG_H 15 #include <config.h> 16 #endif 6 17 7 18 #ifdef __WIN32__ 8 19 #include <windows.h> 9 20 #endif 21 22 #ifndef __APPLE__ 10 23 #include <SDL/SDL.h> 11 24 #include <GL/gl.h> 12 25 #include <GL/glu.h> 26 #else 27 #include <SDL.h> 28 #include <OpenGL/gl.h> 29 #include <OpenGL/glu.h> 30 #endif 13 31 14 32 #include "vector.h" 15 33 #include "coordinates.h" 16 34 #include "list.h" 35 #include "list_template.h" 17 36 #include "error.h" 37 #include "debug.h" 18 38 #include "message_structures.h" 19 39 #include "orxonox.h" 20 40 21 #endif 41 #endif /* _STDINCL_H */ -
orxonox/branches/sound/src/story_def.h
r2636 r3238 1 1 2 #ifndef STORY_DEF_H3 #define STORY_DEF_H2 #ifndef _STORY_DEF_H 3 #define _STORY_DEF_H 4 4 5 5 6 #define DEBUG_CAMPAIGN_0 07 #define DEBUG_CAMPAIGN_1 1 8 #define DEBUG_CAMPAIGN_2 26 #define DEBUG_CAMPAIGN_0 1000 7 #define DEBUG_CAMPAIGN_1 1001 8 #define DEBUG_CAMPAIGN_2 1002 9 9 10 #define DEBUG_WORLD_0 011 #define DEBUG_WORLD_1 1 12 #define DEBUG_WORLD_2 210 #define DEBUG_WORLD_0 100 11 #define DEBUG_WORLD_1 101 12 #define DEBUG_WORLD_2 102 13 13 14 14 #define WORLD_ID_0 0 … … 20 20 #define WORLD_ID_GAMEEND 999 21 21 22 #define MAX_STORY_ENTITIES 99 ;//!> maximal StoryEntities in a Campaign22 #define MAX_STORY_ENTITIES 99 //!> maximal StoryEntities in a Campaign 23 23 24 #endif 24 #endif /* _STORY_DEF_H */ -
orxonox/branches/sound/src/story_entity.cc
r2636 r3238 30 30 /** 31 31 \brief initialize the entity before use. 32 \returns an error code if not able to apply. 32 33 33 34 After execution of this function, the Entity is ready to be played/executed, 34 35 this shifts the initialisation work before the execution - very important... 35 36 36 */ 37 Error StoryEntity::init()37 ErrorMessage StoryEntity::init() 38 38 {} 39 39 40 40 41 void StoryEntity::setStoryID(Uint32 storyID) 41 /** 42 \brief sets the story ID 43 44 sets the story id of the current entity, this enables it to be identified in a 45 global context. 46 */ 47 void StoryEntity::setStoryID(int storyID) 42 48 { 43 49 this->storyID = storyID; 44 50 } 45 51 52 53 /** 54 \brief this reads the story id of the current entity 55 \returns the story entity id 56 */ 46 57 int StoryEntity::getStoryID() 47 58 { … … 50 61 51 62 52 void StoryEntity::setNextStoryID(Uint32 nextStoryID) 63 /** 64 \brief sets the id of the next story entity 65 66 StoryEntities can choose their following entity themselfs. the entity id defined here 67 will be startet after this entity ends. this can be convenient if you want to have a 68 non linear story with switches. 69 */ 70 void StoryEntity::setNextStoryID(int nextStoryID) 53 71 { 54 72 this->nextStoryID = nextStoryID; 55 73 } 56 74 57 Uint32 StoryEntity::getNextStoryID() 75 /** 76 \brief gets the story id of the current entity 77 \returns story id 78 */ 79 int StoryEntity::getNextStoryID() 58 80 { 59 81 return this->nextStoryID; … … 61 83 62 84 63 Error StoryEntity::start(Uint32 storyID) 64 {} 85 /** 86 \brief starts the entity with the choosen id. only for entities with lists. 87 \param story id 88 \returns error code if this action has caused a error 65 89 66 Error StoryEntity::start() 67 {} 68 69 Error StoryEntity::stop() 70 {} 71 72 Error StoryEntity::pause() 73 {} 74 75 Error StoryEntity::resume() 90 this simply starts the story with the id storyID. the story with the choosen id has 91 to be part of the current entity else, this doesn't make sense. this is used for 92 campaigns or the GameLoader, they have lists of Campaigns/Worlds with their own 93 storyID. 94 */ 95 ErrorMessage StoryEntity::start(int storyID) 76 96 {} 77 97 78 98 99 /** 100 \brief starts the current entity 101 \returns error code if this action has caused a error 102 */ 103 ErrorMessage StoryEntity::start() 104 {} 105 106 107 /** 108 \brief stops the current entity 109 \returns error code if this action has caused a error 110 111 ATTENTION: this function shouldn't call other functions, or if so, they must return 112 after finishing. If you ignore or forget to do so, the current entity is not able to 113 terminate and it will run in the background or the ressources can't be freed or even 114 worse: are freed and the program will end in a segmentation fault! 115 hehehe, all seen... :) 116 */ 117 ErrorMessage StoryEntity::stop() 118 {} 119 120 121 /** 122 \brief pause the current entity 123 \returns error code if this action has caused a error 124 125 this pauses the current entity or passes this call forth to the running entity. 126 */ 127 ErrorMessage StoryEntity::pause() 128 {} 129 130 131 /** 132 \brief resumes a pause 133 \returns error code if this action has caused a error 134 135 this resumess the current entity or passes this call forth to the running entity. 136 */ 137 ErrorMessage StoryEntity::resume() 138 {} 139 140 141 /** 142 \brief loads the current entity 143 144 this is here to enable you loading maps into the entities. for all other actions you 145 should take the init() function. 146 */ 79 147 void StoryEntity::load() 80 148 {} 81 149 82 150 83 void StoryEntity::displayEntityScreen() 151 /** 152 \brief destroys and cleans up the current entity. 153 154 this cleans up ressources before the deconstructor is called. for terminating 155 the entity please use the stop() function. 156 */ 157 void StoryEntity::destroy() 84 158 {} 85 159 86 void StoryEntity::releaseEntityScreen() 160 161 /** 162 \brief this displays the load screen 163 164 it will need some time to load maps or things like that. to inform the user about 165 progress and to just show him/her something for the eyes, put here this stuff 166 */ 167 void StoryEntity::displayLoadScreen() 87 168 {} 169 170 171 /** 172 \brief undisplay the load screen 173 174 the load process has terminated, you now can release the load screen and start this 175 entity. 176 */ 177 void StoryEntity::releaseLoadScreen() 178 {} -
orxonox/branches/sound/src/story_entity.h
r2636 r3238 1 /*! 2 \file story_entity.h 3 \brief holds the base class of everything that is playable - that is part of the story 4 */ 1 5 2 #ifndef STORY_ENTITY_H 3 #define STORY_ENTITY_H 6 7 #ifndef _STORY_ENTITY_H 8 #define _STORY_ENTITY_H 4 9 5 10 #include "stdincl.h" 6 11 #include "story_def.h" 7 12 13 //! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc... 8 14 class StoryEntity { 9 15 10 16 public: 11 17 StoryEntity (); 12 ~StoryEntity ();18 virtual ~StoryEntity (); 13 19 14 bool isInit; 15 bool isPaused; 20 bool isInit; //! if the entity is initialized, this has to be true 21 bool isPaused; //! is true if the entity is paused 16 22 17 virtual Error init();18 virtual Error start(Uint32storyID);19 virtual Error start();20 virtual Error stop();21 virtual Error pause();22 virtual Error resume();23 virtual ErrorMessage init(); 24 virtual ErrorMessage start(int storyID); 25 virtual ErrorMessage start(); 26 virtual ErrorMessage stop(); 27 virtual ErrorMessage pause(); 28 virtual ErrorMessage resume(); 23 29 24 30 virtual void load(); 31 virtual void destroy(); 25 32 26 virtual void display EntityScreen();27 virtual void release EntityScreen();33 virtual void displayLoadScreen(); 34 virtual void releaseLoadScreen(); 28 35 29 void setStoryID( Uint32storyID);36 void setStoryID(int storyID); 30 37 int getStoryID(); 31 38 32 void setNextStoryID( Uint32nextStoryID);33 Uint32getNextStoryID();39 void setNextStoryID(int nextStoryID); 40 int getNextStoryID(); 34 41 35 42 36 43 private: 37 Uint32 storyID;38 Uint32 nextStoryID;44 int storyID; //! this is the number of this entity, identifying it in a list/tree... 45 int nextStoryID; //! if this entity has finished, this entity shall be called 39 46 }; 40 47 41 #endif 48 #endif /* _STORY_ENTITY_H */ -
orxonox/branches/sound/src/synchronisable.h
r2036 r3238 1 1 2 #ifndef SYNCHRONISABLE_H3 #define SYNCHRONISABLE_H2 #ifndef _SYNCHRONISABLE_H 3 #define _SYNCHRONISABLE_H 4 4 5 5 #include "data_tank.h" … … 22 22 }; 23 23 24 #endif 24 #endif /* _SYNCHRONISABLE_H */ -
orxonox/branches/sound/src/track.cc
r2636 r3238 21 21 22 22 /** 23 23 \brief creates a null Track part 24 24 */ 25 25 Track::Track () 26 26 { 27 28 29 30 27 this->ID = 0; 28 this->offset = NULL; 29 this->end = NULL; 30 this->nextID = 0; 31 31 } 32 32 33 33 /** 34 35 36 37 38 34 \brief creates a functional base Track part 35 \param number: the ID if this Track part 36 \param next: the ID of the next Track part 37 \param start: pointer to an anchor point (Vector) representing the offset of this part 38 \param finish: pointer to an anchor point (Vector) representing the end of this part 39 39 */ 40 40 Track::Track (Uint32 number, Uint32 next, Vector* start, Vector* finish) 41 41 { 42 43 44 45 42 this->ID = number; 43 this->offset = start; 44 this->end = finish; 45 this->nextID = next; 46 46 } 47 47 48 48 /** 49 49 \brief removes the Track part from memory 50 50 */ 51 51 Track::~Track () … … 68 68 at inside camera boundaries. 69 69 */ 70 void Track::map _camera (Location* lookat, Placement* camplc)70 void Track::mapCamera (Location* lookat, Placement* camplc) 71 71 { 72 72 Line trace(*offset, *end - *offset); … … 103 103 when transfering between track parts. 104 104 */ 105 bool Track::map _coords (Location* loc, Placement* plc)105 bool Track::mapCoords (Location* loc, Placement* plc) 106 106 { 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 107 Line trace(*offset, *end - *offset); 108 float l = trace.len (); 109 110 /* change to the next track? */ 111 if( loc->dist > l) 112 { 113 loc->dist -= l; 114 loc->part = nextID; 115 //FIXME: loc->track = this; 116 return true; 117 } 118 119 /* this quaternion represents the rotation from start-vector (0,0,1) to the direction of 120 * the track */ 121 Quaternion dir(trace.a, Vector(0,0,1)); 122 123 plc->r = trace.r + (trace.a * ((loc->dist) / l)) + /*dir.apply*/(loc->pos); 124 plc->w = dir * loc->rot; 125 126 return false; 127 127 } 128 128 129 129 130 /** 130 131 132 133 134 131 \brief this is called when a WorldEntity enters a Track part 132 \param entity: pointer to the WorldEntity in question 133 134 You can do stuff like add or remove effects, do some coordinate finetuning 135 or whatever in here. 135 136 */ 136 void Track::post _enter (WorldEntity* entity)137 void Track::postEnter (WorldEntity* entity) 137 138 { 138 139 } 139 140 141 140 142 /** 141 142 143 144 145 143 \brief this is called when a WorldEntity leaves a Track part 144 \param entity: pointer to the WorldEntity in question 145 146 You can do stuff like add or remove effects, do some coordinate finetuning 147 or whatever in here. 146 148 */ 147 void Track::post _leave (WorldEntity* entity)149 void Track::postLeave (WorldEntity* entity) 148 150 { 149 151 } 150 152 153 151 154 /** 152 153 154 155 155 \brief this is called every frame 156 \param deltaT: amount of time passed since the last frame in seconds 157 158 Do time based or polling scripts here. 156 159 */ 157 160 void Track::tick (float deltaT) -
orxonox/branches/sound/src/track.h
r2636 r3238 4 4 */ 5 5 6 #ifndef TRACK_H7 #define TRACK_H6 #ifndef _TRACK_H 7 #define _TRACK_H 8 8 9 9 #include "stdincl.h" … … 25 25 Uint32 nextID; 26 26 27 27 28 28 public: 29 29 Track (); … … 32 32 virtual void init(); 33 33 34 virtual void post _enter (WorldEntity* entity); // handle coordinate transition in here !!! (when dist < 0 or dist > lasttracklenght)35 virtual void post _leave (WorldEntity* entity);34 virtual void postEnter (WorldEntity* entity); // handle coordinate transition in here !!! (when dist < 0 or dist > lasttracklenght) 35 virtual void postLeave (WorldEntity* entity); 36 36 virtual void tick (float deltaT); 37 virtual void map _camera (Location* lookat, Placement* camplc);38 virtual bool map _coords (Location* loc, Placement* plc); // this should return true if the entity left track boundaries37 virtual void mapCamera (Location* lookat, Placement* camplc); 38 virtual bool mapCoords (Location* loc, Placement* plc); // this should return true if the entity left track boundaries 39 39 }; 40 40 41 #endif 41 #endif /* _TRACK_H */ -
orxonox/branches/sound/src/vector.cc
r2551 r3238 33 33 { 34 34 Vector r; 35 35 36 36 r.x = x + v.x; 37 37 r.y = y + v.y; … … 203 203 \return the angle between the vectors in radians 204 204 */ 205 float angle _rad (const Vector& v1, const Vector& v2)205 float angleRad (const Vector& v1, const Vector& v2) 206 206 { 207 207 return acos( v1 * v2 / (v1.len() * v2.len())); … … 215 215 \return the angle between the vectors in degrees 216 216 */ 217 float angle _deg (const Vector& v1, const Vector& v2)217 float angleDeg (const Vector& v1, const Vector& v2) 218 218 { 219 219 float f; … … 243 243 244 244 /** 245 \brief calculates a look _at rotation245 \brief calculates a lookAt rotation 246 246 \param dir: the direction you want to look 247 247 \param up: specify what direction up should be … … 578 578 Vector axis = x.cross( v); 579 579 axis.normalize(); 580 float angle = angle _rad( x, v);580 float angle = angleRad( x, v); 581 581 float ca = cos(angle); 582 582 float sa = sin(angle); … … 714 714 \return the rotated vector 715 715 */ 716 Vector rotate _vector( const Vector& v, const Rotation& r)716 Vector rotateVector( const Vector& v, const Rotation& r) 717 717 { 718 718 Vector t; … … 745 745 \return the distance between the Line and the point 746 746 */ 747 float Line::distance _point (const Vector& v) const747 float Line::distancePoint (const Vector& v) const 748 748 { 749 749 Vector d = v-r; … … 761 761 Vector* fp = new Vector[2]; 762 762 Plane p = Plane (r + a.cross(l.a), r, r + a); 763 fp[1] = p.intersect _line (l);763 fp[1] = p.intersectLine (l); 764 764 p = Plane (fp[1], l.a); 765 fp[0] = p.intersect _line (*this);765 fp[0] = p.intersectLine (*this); 766 766 return fp; 767 767 } … … 783 783 { 784 784 Vector t = a + r; 785 t = rotate _vector( t, rot);786 r = rotate _vector( r, rot),785 t = rotateVector( t, rot); 786 r = rotateVector( r, rot), 787 787 a = t - r; 788 788 } … … 815 815 \param l: a line 816 816 */ 817 Vector Plane::intersect _line (const Line& l) const817 Vector Plane::intersectLine (const Line& l) const 818 818 { 819 819 if (n.x*l.a.x+n.y*l.a.y+n.z*l.a.z == 0.0) return Vector(0,0,0); … … 827 827 \return the distance between the plane and the point (can be negative) 828 828 */ 829 float Plane::distance _point (const Vector& p) const829 float Plane::distancePoint (const Vector& p) const 830 830 { 831 831 float l = n.len(); … … 839 839 \return 0 if the point is contained within the Plane, positive(negative) if the point is in the positive(negative) semi-space of the Plane 840 840 */ 841 float Plane::locate _point (const Vector& p) const841 float Plane::locatePoint (const Vector& p) const 842 842 { 843 843 return (n.dot(p) + k); 844 844 } 845 846 847 /** 848 \brief Creates a new BezierCurve 849 */ 850 BezierCurve::BezierCurve (void) 851 { 852 nodeCount = 0; 853 firstNode = new PathNode; 854 currentNode = firstNode; 855 856 firstNode->position = Vector (.0, .0, .0); 857 firstNode->number = 0; 858 firstNode->next = 0; // not sure if this really points to NULL!! 859 860 return; 861 } 862 863 /** 864 \brief Deletes a BezierCurve. 865 It does this by freeing all the space taken over from the nodes 866 */ 867 BezierCurve::~BezierCurve (void) 868 { 869 PathNode* tmpNode; 870 currentNode = firstNode; 871 while (tmpNode != 0) 872 { 873 tmpNode = currentNode; 874 currentNode = currentNode->next; 875 delete tmpNode; 876 } 877 } 878 879 /** 880 \brief adds a new Node to the bezier Curve 881 \param newNode a Vector to the position of the new node 882 */ 883 void BezierCurve::addNode(const Vector& newNode) 884 { 885 PathNode* tmpNode; 886 if (nodeCount == 0 ) 887 tmpNode = firstNode; 888 else 889 { 890 tmpNode = new PathNode; 891 currentNode = currentNode->next = tmpNode; 892 } 893 tmpNode->position = newNode; 894 tmpNode->next = 0; // not sure if this really points to NULL!! 895 tmpNode->number = (++nodeCount); 896 return; 897 } 898 899 /** 900 \brief calculates the Position on the curve 901 \param t The position on the Curve (0<=t<=1) 902 \return the Position on the Path 903 */ 904 Vector BezierCurve::calcPos(float t) 905 { 906 if (nodeCount <=4) 907 { 908 // if (verbose >= 1) 909 // printf ("Please define at least 4 nodes, until now you have only defined %i.\n", nodeCount); 910 curvePoint = Vector(0,0,0); 911 } 912 PathNode* tmpNode = firstNode; 913 914 int k,kn,nn,nkn; 915 double blend,muk,munk; 916 Vector b = Vector(0.0,0.0,0.0); 917 918 muk = 1; 919 munk = pow(1-t,(double)nodeCount); 920 921 for (k=0; k<=nodeCount; k++) { 922 nn = nodeCount; 923 kn = k; 924 nkn = nodeCount - k; 925 blend = muk * munk; 926 muk *= t; 927 munk /= (1-t); 928 while (nn >= 1) { 929 blend *= nn; 930 nn--; 931 if (kn > 1) { 932 blend /= (double)kn; 933 kn--; 934 } 935 if (nkn > 1) { 936 blend /= (double)nkn; 937 nkn--; 938 } 939 } 940 b.x += tmpNode->position.x * blend; 941 b.y += tmpNode->position.y * blend; 942 b.z += tmpNode->position.z * blend; 943 944 tmpNode = tmpNode->next; 945 } 946 return b; 947 } 948 949 Vector BezierCurve::calcDirection (float t) 950 { 951 double diff = .00000000001; 952 953 Vector diffV = ((calcPos(t+diff) - calcPos(t))/diff); 954 diffV.normalize(); 955 return diffV; 956 } 957 958 /** 959 \brief returns the Position of the point calculated on the Curve 960 \return a Vector to the calculated position 961 */ 962 Vector BezierCurve::getPos() const 963 { 964 return curvePoint; 965 } -
orxonox/branches/sound/src/vector.h
r2551 r3238 6 6 */ 7 7 8 #ifndef VECTOR_H9 #define VECTOR_H8 #ifndef _VECTOR_H 9 #define _VECTOR_H 10 10 11 11 #include <math.h> … … 40 40 }; 41 41 42 float angle _deg (const Vector& v1, const Vector& v2);43 float angle _rad (const Vector& v1, const Vector& v2);42 float angleDeg (const Vector& v1, const Vector& v2); 43 float angleRad (const Vector& v1, const Vector& v2); 44 44 45 45 //! Quaternion … … 98 98 99 99 //!< Apply a rotation to a vector 100 Vector rotate _vector( const Vector& v, const Rotation& r);100 Vector rotateVector( const Vector& v, const Rotation& r); 101 101 102 102 //! 3D line … … 118 118 119 119 float distance (const Line& l) const; 120 float distance _point (const Vector& v) const;120 float distancePoint (const Vector& v) const; 121 121 Vector* footpoints (const Line& l) const; 122 122 float len () const; … … 144 144 ~Plane () {} 145 145 146 Vector intersect _line (const Line& l) const;147 float distance _point (const Vector& p) const;148 float locate _point (const Vector& p) const;146 Vector intersectLine (const Line& l) const; 147 float distancePoint (const Vector& p) const; 148 float locatePoint (const Vector& p) const; 149 149 }; 150 150 151 #endif 151 152 153 //! Bezier Curve 154 /** 155 Class to handle bezier curves in 3-dimesnsional space 156 157 needed for the Tracking system in OrxOnoX. 158 */ 159 class BezierCurve 160 { 161 private: 162 int nodeCount; 163 Vector curvePoint; 164 165 struct PathNode 166 { 167 int number; 168 Vector position; 169 PathNode* next; 170 }; 171 172 PathNode* firstNode; 173 PathNode* currentNode; 174 175 public: 176 BezierCurve (void); 177 ~BezierCurve (void); 178 void addNode (const Vector& newNode); 179 Vector calcPos (float t); 180 Vector calcDirection (float t); 181 182 Vector getPos () const; 183 }; 184 185 186 187 #endif /* _VECTOR_H */ -
orxonox/branches/sound/src/world.cc
r2644 r3238 22 22 #include "command_node.h" 23 23 #include "camera.h" 24 #include "environment.h" 24 25 25 26 using namespace std; … … 35 36 this->worldName = name; 36 37 this->debugWorldNr = -1; 37 this->entities = new List<WorldEntity>();38 this->entities = new tList<WorldEntity>(); 38 39 } 39 40 … … 42 43 this->debugWorldNr = worldID; 43 44 this->worldName = NULL; 44 this->entities = new List<WorldEntity>();45 this->entities = new tList<WorldEntity>(); 45 46 } 46 47 … … 50 51 World::~World () 51 52 { 52 Orxonox *orx = Orxonox::getInstance(); 53 orx->get_localinput()->unbind (this->localPlayer); 53 printf("World::~World() - deleting current world\n"); 54 CommandNode* cn = Orxonox::getInstance()->getLocalInput(); 55 cn->unbind(this->localPlayer); 56 cn->reset(); 57 this->localCamera->destroy(); 58 59 WorldEntity* entity = entities->enumerate(); 60 while( entity != NULL ) 61 { 62 entity->destroy(); 63 entity = entities->nextElement(); 64 } 65 this->entities->destroy(); 66 54 67 delete this->entities; 55 68 delete this->localCamera; 56 } 57 58 59 /** 60 \brief initialize the world before use. 61 */ 62 Error World::init() 69 /* this->localPlayer hasn't to be deleted explicitly, it is 70 contained in entities*/ 71 } 72 73 74 ErrorMessage World::init() 63 75 { 64 76 this->bPause = false; 65 } 66 67 Error World::start() 68 { 77 CommandNode* cn = Orxonox::getInstance()->getLocalInput(); 78 cn->addToWorld(this); 79 cn->enable(true); 80 } 81 82 ErrorMessage World::start() 83 { 84 printf("World::start() - starting current World: nr %i\n", this->debugWorldNr); 85 this->bQuitOrxonox = false; 86 this->bQuitCurrentGame = false; 69 87 this->mainLoop(); 70 88 } 71 89 72 Error World::stop() 73 { 90 ErrorMessage World::stop() 91 { 92 printf("World::stop() - got stop signal\n"); 74 93 this->bQuitCurrentGame = true; 75 this->localCamera->setWorld(NULL); 76 this->~World(); 77 } 78 79 Error World::pause() 94 } 95 96 ErrorMessage World::pause() 80 97 { 81 98 this->isPaused = true; 82 99 } 83 100 84 Error World::resume()101 ErrorMessage World::resume() 85 102 { 86 103 this->isPaused = false; 87 104 } 88 105 106 void World::destroy() 107 { 108 109 } 110 89 111 void World::load() 90 112 { … … 93 115 switch(this->debugWorldNr) 94 116 { 117 /* 118 this loads the hard-coded debug world. this only for simplicity and will be 119 removed by a reald world-loader, which interprets a world-file. 120 if you want to add an own debug world, just add a case DEBUG_WORLD_[nr] and 121 make whatever you want... 122 */ 95 123 case DEBUG_WORLD_0: 96 124 { … … 98 126 this->pathnodes = new Vector[6]; 99 127 this->pathnodes[0] = Vector(0, 0, 0); 100 this->pathnodes[1] = Vector( -100, 40, 0);101 this->pathnodes[2] = Vector(-100, 140, 0);102 this->pathnodes[3] = Vector(0, 180, 0);103 this->pathnodes[4] = Vector(100, 140, 0);104 this->pathnodes[5] = Vector(100, 40, 0);128 this->pathnodes[1] = Vector(1000, 0, 0); 129 // this->pathnodes[2] = Vector(-100, 140, 0); 130 // this->pathnodes[3] = Vector(0, 180, 0); 131 // this->pathnodes[4] = Vector(100, 140, 0); 132 // this->pathnodes[5] = Vector(100, 40, 0); 105 133 106 134 // create the tracks 107 this->tracklen = 6;108 this->track = new Track[ 6];135 this->tracklen = 2; 136 this->track = new Track[2]; 109 137 for( int i = 0; i < this->tracklen; i++) 110 138 { 111 139 this->track[i] = Track( i, (i+1)%this->tracklen, &this->pathnodes[i], &this->pathnodes[(i+1)%this->tracklen]); 112 140 } 113 141 // !\todo old track-system has to be removed 142 114 143 // create a player 115 //WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>();116 144 WorldEntity* myPlayer = new Player(); 117 145 this->spawn(myPlayer); … … 120 148 // bind input 121 149 Orxonox *orx = Orxonox::getInstance(); 122 orx->get _localinput()->bind (myPlayer);150 orx->getLocalInput()->bind (myPlayer); 123 151 124 152 // bind camera 125 153 this->localCamera = new Camera(this); 126 154 this->getCamera()->bind (myPlayer); 155 156 Placement* plc = new Placement; 157 plc->r = Vector(100, 10, 10); 158 plc->w = Quaternion(); 159 WorldEntity* env = new Environment(); 160 this->spawn(env, plc); 161 127 162 break; 128 163 } … … 145 180 this->track[i] = Track( i, (i+1)%this->tracklen, &this->pathnodes[i], &this->pathnodes[(i+1)%this->tracklen]); 146 181 } 147 182 148 183 // create a player 149 //WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>();150 184 WorldEntity* myPlayer = new Player(); 151 185 this->spawn(myPlayer); 152 this->localPlayer = myPlayer; 186 this->localPlayer = myPlayer; 153 187 154 188 // bind input 155 189 Orxonox *orx = Orxonox::getInstance(); 156 orx->get _localinput()->bind (myPlayer);190 orx->getLocalInput()->bind (myPlayer); 157 191 158 192 // bind camera … … 169 203 170 204 } 205 206 // initialize debug coord system 207 objectList = glGenLists(1); 208 glNewList (objectList, GL_COMPILE); 209 glLoadIdentity(); 210 glColor3f(1.0,0,0); 211 glBegin(GL_QUADS); 212 213 int sizeX = 100; 214 int sizeY = 80; 215 float length = 1000; 216 float width = 200; 217 float widthX = float (length /sizeX); 218 float widthY = float (width /sizeY); 219 220 float height [sizeX][sizeY]; 221 Vector normal_vectors[sizeX][sizeY]; 222 223 224 for ( int i = 0; i<sizeX-1; i+=1) 225 for (int j = 0; j<sizeY-1;j+=1) 226 //height[i][j] = rand()/20046 + (j-25)*(j-25)/30; 227 #ifdef __WIN32__ 228 height[i][j]=(sin((float)j/3)*rand()*i/182400)*.5; 229 #else 230 height[i][j]=(sin((float)j/3)*rand()*(long)i/6282450500.0)*.5; 231 #endif 232 233 //Die Hügel ein wenig glätten 234 for (int h=1; h<2;h++) 235 for (int i=1;i<sizeX-2 ;i+=1 ) 236 for(int j=1;j<sizeY-2;j+=1) 237 height[i][j]=(height[i+1][j]+height[i][j+1]+height[i-1][j]+height[i][j-1])/4; 238 239 //Berechnung von normalen Vektoren 240 241 for(int i=1;i<sizeX-2;i+=1) 242 for(int j=1;j<sizeY-2 ;j+=1) 243 { 244 Vector v1 = Vector (widthX*(1), widthY*(j) , height[i][j]); 245 Vector v2 = Vector (widthX*(i-1), widthY*(j) , height[i-1][j]); 246 Vector v3 = Vector (widthX*(i), widthY*(j+1), height[i][j+1]); 247 Vector v4 = Vector (widthX*(i+1), widthY*(j), height[i+1][j]); 248 Vector v5 = Vector (widthX*(i), widthY*(j-1), height[i][j-1]); 249 250 Vector c1 = v2 - v1; 251 Vector c2 = v3 - v1; 252 Vector c3= v4 - v1; 253 Vector c4 = v5 - v1; 254 Vector zero = Vector (0,0,0); 255 normal_vectors[i][j]=c1.cross(v4-v2)+c2.cross(v1-v3)+c3.cross(v2-v4)+c4.cross(v3-v1); 256 normal_vectors[i][j].normalize(); 257 } 258 259 int snowheight=3; 260 for ( int i = 0; i<sizeX; i+=1) 261 for (int j = 0; j<sizeY;j+=1) 262 { 263 Vector v1 = Vector (widthX*(i), widthY*(j) -width/2, height[i][j]-20 ); 264 Vector v2 = Vector (widthX*(i+1), widthY*(j) -width/2, height[i+1][j]-20); 265 Vector v3 = Vector (widthX*(i+1), widthY*(j+1)-width/2, height[i+1][j+1]-20); 266 Vector v4 = Vector (widthX*(i), widthY*(j+1)-width/2, height[i][j+1]-20); 267 float a[3]; 268 if(height[i][j]<snowheight){ 269 a[0]=0; 270 a[1]=1.0-height[i][j]/10-.3; 271 a[2]=0; 272 glMaterialfv(GL_FRONT,GL_DIFFUSE,a); 273 } 274 else{ 275 a[0]=1.0; 276 a[1]=1.0; 277 a[2]=1.0; 278 glMaterialfv(GL_FRONT,GL_DIFFUSE,a); 279 280 } 281 glNormal3f(normal_vectors[i][j].x, normal_vectors[i][j].y, normal_vectors[i][j].z); 282 glVertex3f(v1.x, v1.y, v1.z); 283 if(height[i+1][j]<snowheight){ 284 a[0]=0; 285 a[1] =1.0-height[i+1][j]/10-.3; 286 a[2]=0; 287 glMaterialfv(GL_FRONT,GL_DIFFUSE,a); 288 } 289 else{ 290 a[0]=1.0; 291 a[1]=1.0; 292 a[2]=1.0; 293 glMaterialfv(GL_FRONT,GL_DIFFUSE,a); 294 295 } 296 glNormal3f(normal_vectors[i+1][j].x, normal_vectors[i+1][j].y, normal_vectors[i+1][j].z); 297 glVertex3f(v2.x, v2.y, v2.z); 298 if(height[i+1][j+1]<snowheight){ 299 a[0]=0; 300 a[1] =1.0-height[i+1][j+1]/10-.3; 301 a[2]=0; 302 glMaterialfv(GL_FRONT,GL_DIFFUSE,a); 303 } 304 else{ 305 a[0]=1.0; 306 a[1]=1.0; 307 a[2]=1.0; 308 glMaterialfv(GL_FRONT,GL_DIFFUSE,a); 309 310 311 } 312 glNormal3f(normal_vectors[i+1][j+1].x, normal_vectors[i+1][j+1].y, normal_vectors[i+1][j+1].z); 313 glVertex3f(v3.x, v3.y, v3.z); 314 if(height[i][j+1]<snowheight){ 315 a[0]=0; 316 a[1] =1.0-height[i+1][j+1]/10-.3; 317 a[2]=0; 318 glMaterialfv(GL_FRONT,GL_DIFFUSE,a); 319 } 320 else{ 321 a[0]=1.0; 322 a[1]=1.0; 323 a[2]=1.0; 324 glMaterialfv(GL_FRONT,GL_DIFFUSE,a); 325 } 326 glNormal3f(normal_vectors[i][j+1].x, normal_vectors[i][j+1].y, normal_vectors[i][j+1].z); 327 glVertex3f(v4.x, v4.y, v4.z); 328 329 } 330 glEnd(); 331 /* 332 glBegin(GL_LINES); 333 for( float x = -128.0; x < 128.0; x += 25.0) 334 { 335 for( float y = -128.0; y < 128.0; y += 25.0) 336 { 337 glColor3f(1,0,0); 338 glVertex3f(x,y,-128.0); 339 glVertex3f(x,y,0.0); 340 glColor3f(0.5,0,0); 341 glVertex3f(x,y,0.0); 342 glVertex3f(x,y,128.0); 343 } 344 } 345 for( float y = -128.0; y < 128.0; y += 25.0) 346 { 347 for( float z = -128.0; z < 128.0; z += 25.0) 348 { 349 glColor3f(0,1,0); 350 glVertex3f(-128.0,y,z); 351 glVertex3f(0.0,y,z); 352 glColor3f(0,0.5,0); 353 glVertex3f(0.0,y,z); 354 glVertex3f(128.0,y,z); 355 } 356 } 357 for( float x = -128.0; x < 128.0; x += 25.0) 358 { 359 for( float z = -128.0; z < 128.0; z += 25.0) 360 { 361 glColor3f(0,0,1); 362 glVertex3f(x,-128.0,z); 363 glVertex3f(x,0.0,z); 364 glColor3f(0,0,0.5); 365 glVertex3f(x,0.0,z); 366 glVertex3f(x,128.0,z); 367 } 368 369 } 370 */ 371 //draw track 372 glBegin(GL_LINES); 373 glColor3f(0,1,1); 374 for( int i = 0; i < tracklen; i++) 375 { 376 glVertex3f(pathnodes[i].x,pathnodes[i].y,pathnodes[i].z); 377 glVertex3f(pathnodes[(i+1)%tracklen].x,pathnodes[(i+1)%tracklen].y,pathnodes[(i+1)%tracklen].z); 378 } 379 glEnd(); 380 glEndList(); 171 381 } 172 382 … … 181 391 void World::collide () 182 392 { 183 List<WorldEntity> *a, *b; 393 /* 394 List *a, *b; 184 395 WorldEntity *aobj, *bobj; 185 186 a = entities ->get_next();396 397 a = entities; 187 398 188 399 while( a != NULL) 189 400 { 190 aobj = a-> get_object();401 aobj = a->nextElement(); 191 402 if( aobj->bCollide && aobj->collisioncluster != NULL) 192 403 { 193 b = a-> get_next();404 b = a->nextElement(); 194 405 while( b != NULL ) 195 406 { 196 bobj = b-> get_object();407 bobj = b->nextElement(); 197 408 if( bobj->bCollide && bobj->collisioncluster != NULL ) 198 409 { … … 206 417 } 207 418 } 208 b = b-> get_next();419 b = b->nextElement(); 209 420 } 210 421 } 211 a = a->get_next(); 212 } 422 a = a->enumerate(); 423 } 424 */ 213 425 } 214 426 … … 221 433 222 434 // draw entities 223 List<WorldEntity> *l;224 435 WorldEntity* entity; 225 436 226 l = entities->get_next();227 while( l!= NULL )437 entity = this->entities->enumerate(); 438 while( entity != NULL ) 228 439 { 229 entity = l->get_object();230 440 if( entity->bDraw ) entity->draw(); 231 l = l->get_next();441 entity = this->entities->nextElement(); 232 442 } 233 443 234 444 235 445 // draw debug coord system 236 glLoadIdentity(); 237 238 239 glBegin(GL_LINES); 240 241 for( float x = -128.0; x < 128.0; x += 25.0) 242 { 243 for( float y = -128.0; y < 128.0; y += 25.0) 244 { 245 glColor3f(1,0,0); 246 glVertex3f(x,y,-128.0); 247 glVertex3f(x,y,0.0); 248 glColor3f(0.5,0,0); 249 glVertex3f(x,y,0.0); 250 glVertex3f(x,y,128.0); 251 } 252 } 253 for( float y = -128.0; y < 128.0; y += 25.0) 254 { 255 for( float z = -128.0; z < 128.0; z += 25.0) 256 { 257 glColor3f(0,1,0); 258 glVertex3f(-128.0,y,z); 259 glVertex3f(0.0,y,z); 260 glColor3f(0,0.5,0); 261 glVertex3f(0.0,y,z); 262 glVertex3f(128.0,y,z); 263 } 264 } 265 for( float x = -128.0; x < 128.0; x += 25.0) 266 { 267 for( float z = -128.0; z < 128.0; z += 25.0) 268 { 269 glColor3f(0,0,1); 270 glVertex3f(x,-128.0,z); 271 glVertex3f(x,0.0,z); 272 glColor3f(0,0,0.5); 273 glVertex3f(x,0.0,z); 274 glVertex3f(x,128.0,z); 275 } 276 277 } 278 279 //draw track 280 glColor3f(0,1,1); 281 for( int i = 0; i < tracklen; i++) 282 { 283 glVertex3f(pathnodes[i].x,pathnodes[i].y,pathnodes[i].z); 284 glVertex3f(pathnodes[(i+1)%tracklen].x,pathnodes[(i+1)%tracklen].y,pathnodes[(i+1)%tracklen].z); 285 } 286 glEnd(); 446 glCallList (objectList); 447 448 287 449 } 288 450 … … 297 459 void World::update () 298 460 { 299 List<WorldEntity> *l;461 //List<WorldEntity> *l; 300 462 WorldEntity* entity; 301 463 Location* loc; … … 303 465 Uint32 t; 304 466 305 l = entities->get_next(); 306 while( l != NULL ) 467 // l = entities->enumerate(); 468 entity = this->entities->enumerate(); 469 while( entity != NULL ) 307 470 { 308 entity = l->get_object(); 471 309 472 310 473 if( !entity->isFree() ) 311 474 { 312 loc = entity->get _location();313 plc = entity->get _placement();475 loc = entity->getLocation(); 476 plc = entity->getPlacement(); 314 477 t = loc->part; 315 478 … … 318 481 { 319 482 printf("An entity is out of the game area\n"); 320 entity->left _world ();483 entity->leftWorld (); 321 484 } 322 485 else 323 486 { 324 while( track[t].map _coords( loc, plc) )487 while( track[t].mapCoords( loc, plc) ) 325 488 { 326 track[t].post _leave (entity);489 track[t].postLeave (entity); 327 490 if( loc->part >= tracklen ) 328 491 { 329 492 printf("An entity has left the game area\n"); 330 entity->left _world ();493 entity->leftWorld (); 331 494 break; 332 495 } 333 track[loc->part].post _enter (entity);496 track[loc->part].postEnter (entity); 334 497 } 335 498 } … … 337 500 else 338 501 { 339 /* TO DO: implement check whether this particular free entity502 /* \todo: implement check whether this particular free entity 340 503 is out of the game area 341 TO DO: call function to notify the entity that it left504 \todo: call function to notify the entity that it left 342 505 the game area 343 506 */ 344 507 } 345 508 346 l = l->get_next();509 entity = entities->nextElement(); 347 510 } 348 511 … … 353 516 \param deltaT: the time passed since the last frame in milliseconds 354 517 */ 355 void World::time _slice (Uint32 deltaT)356 { 357 List<WorldEntity> *l;518 void World::timeSlice (Uint32 deltaT) 519 { 520 //List<WorldEntity> *l; 358 521 WorldEntity* entity; 359 float seconds = deltaT; 360 361 seconds /= 1000; 362 363 l = entities->get_next(); 364 while( l != NULL) 522 float seconds = deltaT / 1000.0; 523 524 entity = entities->enumerate(); 525 while( entity != NULL) 365 526 { 366 entity = l->get_object();367 527 entity->tick (seconds); 368 l = l->get_next();369 } 370 371 for( int i = 0; i < tracklen; i++) track[i].tick (seconds);528 entity = entities->nextElement(); 529 } 530 531 //for( int i = 0; i < tracklen; i++) track[i].tick (seconds); 372 532 } 373 533 … … 387 547 Camera Placement 388 548 */ 389 void World::calc _camera_pos (Location* loc, Placement* plc)390 { 391 track[loc->part].map _camera (loc, plc);549 void World::calcCameraPos (Location* loc, Placement* plc) 550 { 551 track[loc->part].mapCamera (loc, plc); 392 552 } 393 553 … … 403 563 } 404 564 565 566 567 /** 568 \brief function to put your own debug stuff into it. it can display informations about 569 the current class/procedure 570 */ 405 571 void World::debug() 406 572 { 407 List<WorldEntity> *l;573 //List<WorldEntity> *l; 408 574 WorldEntity* entity; 409 575 410 576 printf("counting all entities\n"); 411 l = entities->get_next(); 412 while( l != NULL ) 577 printf("World::debug() - enumerate()\n"); 578 entity = entities->enumerate(); 579 while( entity != NULL ) 413 580 { 414 entity = l->get_object();415 581 if( entity->bDraw ) printf("got an entity\n"); 416 l = l->get_next(); 417 } 418 } 419 420 582 entity = entities->nextElement(); 583 } 584 } 585 586 587 /* 588 \brief main loop of the world: executing all world relevant function 589 590 in this loop we synchronize (if networked), handle input events, give the heart-beat to 591 all other member-entities of the world (tick to player, enemies etc.), checking for 592 collisions drawing everything to the screen. 593 */ 421 594 void World::mainLoop() 422 595 { 423 596 this->lastFrame = SDL_GetTicks(); 424 this->bQuitOrxonox = false; 425 this->bQuitCurrentGame = false; 426 printf("World|Entering main loop\n"); 427 while(!this->bQuitOrxonox && !this->bQuitCurrentGame) /* pause pause pause ?!?!?*/ 428 { 429 //debug routine 430 //debug(); 597 printf("World::mainLoop() - Entering main loop\n"); 598 while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* \todo implement pause */ 599 { 431 600 // Network 432 601 synchronize(); 433 602 // Process input 434 handle_input(); 603 handleInput(); 604 if( this->bQuitCurrentGame || this->bQuitOrxonox) 605 { 606 printf("World::mainLoop() - leaving loop earlier...\n"); 607 break; 608 } 435 609 // Process time 436 time _slice();610 timeSlice(); 437 611 // Process collision 438 612 collision(); 439 613 // Draw 440 614 display(); 441 } 442 printf("World|Exiting the main loop\n"); 615 616 for(int i = 0; i < 10000000; i++) {} 617 } 618 printf("World::mainLoop() - Exiting the main loop\n"); 443 619 } 444 620 … … 454 630 /** 455 631 \brief run all input processing 456 */ 457 void World::handle_input () 632 633 the command node is the central input event dispatcher. the node uses the even-queue from 634 sdl and has its own event-passing-queue. 635 */ 636 void World::handleInput () 458 637 { 459 638 // localinput 460 Orxonox::getInstance()->get_localinput()->process(); 639 CommandNode* cn = Orxonox::getInstance()->getLocalInput(); 640 cn->process(); 461 641 // remoteinput 462 642 } … … 464 644 /** 465 645 \brief advance the timeline 466 */ 467 void World::time_slice () 646 647 this calculates the time used to process one frame (with all input handling, drawing, etc) 648 the time is mesured in ms and passed to all world-entities and other classes that need 649 a heart-beat. 650 */ 651 void World::timeSlice () 468 652 { 469 653 Uint32 currentFrame = SDL_GetTicks(); … … 471 655 { 472 656 Uint32 dt = currentFrame - this->lastFrame; 473 /*657 474 658 if(dt > 0) 475 659 { … … 479 663 else 480 664 { 481 printf("fps = 1000\n"); 482 } 483 */ 484 this->time_slice (dt); 665 /* the frame-rate is limited to 100 frames per second, all other things are for 666 nothing. 667 */ 668 printf("fps = 1000 - frame rate is adjusted\n"); 669 SDL_Delay(10); 670 dt = 10; 671 } 672 this->timeSlice (dt); 485 673 this->update (); 486 this->localCamera->time _slice(dt);674 this->localCamera->timeSlice(dt); 487 675 } 488 676 this->lastFrame = currentFrame; 489 677 } 490 678 679 491 680 /** 492 681 \brief compute collision detection … … 497 686 } 498 687 499 /** 500 \brief handle keyboard commands that are not meant for WorldEntities 501 \param cmd: the command to handle 502 \return true if the command was handled by the system or false if it may be passed to the WorldEntities 503 */ 504 bool World::system_command (Command* cmd) 505 { 506 if( !strcmp( cmd->cmd, "quit")) 507 { 508 if( !cmd->bUp) this->bQuitOrxonox = true; 509 return true; 510 } 511 return false; 512 } 513 514 /** 515 \brief render the current frame 688 689 /** 690 \brief render the current frame 691 692 clear all buffers and draw the world 516 693 */ 517 694 void World::display () … … 528 705 } 529 706 707 /** 708 \brief give back active camera 709 710 this passes back the actualy active camera 711 \todo ability to define more than one camera or camera-places 712 */ 530 713 Camera* World::getCamera() 531 714 { … … 534 717 535 718 719 /** 720 \brief add and spawn a new entity to this world 721 \param entity to be added 722 */ 536 723 void World::spawn(WorldEntity* entity) 537 724 { … … 539 726 Location* loc = NULL; 540 727 WorldEntity* owner; 541 //T* entity = new T(); 542 entities->add (entity, LIST_ADD_NEXT); 543 //if( loc == NULL) 544 //{ 545 zeroloc.dist = 0; 546 zeroloc.part = 0; 547 zeroloc.pos = Vector(); 548 zeroloc.rot = Quaternion(); 549 loc = &zeroloc; 550 //} 728 729 entities->add (entity); 730 zeroloc.dist = 0; 731 zeroloc.part = 0; 732 zeroloc.pos = Vector(); 733 zeroloc.rot = Quaternion(); 734 loc = &zeroloc; 551 735 entity->init (loc, owner); 552 736 if (entity->bFree) 553 737 { 554 this->track[loc->part].map_coords( loc, entity->get_placement()); 555 } 556 entity->post_spawn (); 738 this->track[loc->part].mapCoords( loc, entity->getPlacement()); 739 } 740 entity->postSpawn (); 741 } 742 743 744 /** 745 \brief add and spawn a new entity to this world 746 \param entity to be added 747 \param location where to add 748 */ 749 void World::spawn(WorldEntity* entity, Location* loc) 750 { 751 Location zeroLoc; 752 WorldEntity* owner; 753 this->entities->add (entity); 754 if( loc == NULL) 755 { 756 zeroLoc.dist = 0; 757 zeroLoc.part = 0; 758 zeroLoc.pos = Vector(); 759 zeroLoc.rot = Quaternion(); 760 loc = &zeroLoc; 761 } 762 entity->init (loc, owner); 763 if (entity->bFree) 764 { 765 this->track[loc->part].mapCoords( loc, entity->getPlacement()); 766 } 767 entity->postSpawn (); 557 768 //return entity; 558 769 } 770 771 772 /** 773 \brief add and spawn a new entity to this world 774 \param entity to be added 775 \param place where to be added 776 */ 777 void World::spawn(WorldEntity* entity, Placement* plc) 778 { 779 Placement zeroPlc; 780 WorldEntity* owner; 781 if( plc == NULL) 782 { 783 zeroPlc.r = Vector(); 784 zeroPlc.w = Quaternion(); 785 plc = &zeroPlc; 786 } 787 this->entities->add (entity); 788 entity->init (plc, owner); 789 entity->postSpawn (); 790 //return entity; 791 } 792 793 794 /* 795 \brief commands that the world must catch 796 \returns false if not used by the world 797 */ 798 bool World::command(Command* cmd) 799 { 800 return false; 801 } -
orxonox/branches/sound/src/world.h
r2644 r3238 4 4 */ 5 5 6 #ifndef WORLD_H7 #define WORLD_H6 #ifndef _WORLD_H 7 #define _WORLD_H 8 8 9 9 #include "stdincl.h" … … 22 22 World (char* name); 23 23 World (int worldID); 24 ~World ();24 virtual ~World (); 25 25 26 26 template<typename T> 27 T* spawn (Location* loc, WorldEntity* owner); // template to be able to spawn any derivation of WorldEntity27 T* spawn (Location* loc, WorldEntity* owner); // template to be able to spawn any derivation of WorldEntity 28 28 template<typename T> 29 T* spawn (Placement* plc, WorldEntity* owner);29 T* spawn (Placement* plc, WorldEntity* owner); 30 30 31 virtual Error init();32 virtual Error start();33 virtual Error stop();34 virtual Error pause();35 virtual Error resume();31 virtual ErrorMessage init (); 32 virtual ErrorMessage start (); 33 virtual ErrorMessage stop (); 34 virtual ErrorMessage pause (); 35 virtual ErrorMessage resume (); 36 36 37 virtual void load(); 37 virtual void load (); 38 virtual void destroy (); 38 39 39 void time _slice (Uint32 deltaT);40 void timeSlice (Uint32 deltaT); 40 41 void collide (); 41 42 void draw (); 42 43 void update (); // maps Locations to Placements 43 void calc _camera_pos (Location* loc, Placement* plc);44 void calcCameraPos (Location* loc, Placement* plc); 44 45 45 46 void unload (); 47 bool command (Command* cmd); 46 48 47 void setTrackLen(Uint32 tracklen); 48 int getTrackLen(); 49 bool system_command (Command* cmd); 50 Camera* getCamera(); 51 //private: 49 void setTrackLen (Uint32 tracklen); 50 int getTrackLen (); 51 //bool system_command (Command* cmd); 52 Camera* getCamera (); 52 53 53 void spawn(WorldEntity* entity); 54 void spawn (WorldEntity* entity); 55 void spawn (WorldEntity* entity, Location* loc); 56 void spawn (WorldEntity* entity, Placement* plc); 54 57 55 List<WorldEntity>* entities;58 tList<WorldEntity>* entities; 56 59 57 60 // base level data … … 69 72 char* worldName; 70 73 int debugWorldNr; 74 GLuint objectList; 71 75 72 76 WorldEntity* localPlayer; 73 77 74 void mainLoop ();75 void synchronize ();76 void handle _input();77 void time _slice();78 void collision ();79 void display ();80 void debug ();78 void mainLoop (); 79 void synchronize (); 80 void handleInput (); 81 void timeSlice (); 82 void collision (); 83 void display (); 84 void debug (); 81 85 }; 82 86 83 /** 84 \brief spawn a new WorldEntity at a Location 85 \param loc: the Location where the Entity should be spawned 86 \param owner: a pointer to the parent of the Entity 87 \return a pointer to the new WorldEntity or NULL if there was an error 88 89 You can use this function to spawn any derivation of WorldEntity you want, just specify the desired 90 class within the template specification brackets. Do not attempt to spawn any classes that have NOT been 91 derived from WorldEntity, you won't even be able to compile the code. Note that this version of spawn() 92 works with both free and bound WorldEntities. 93 */ 94 template<typename T> T* World::spawn(Location* loc = NULL, WorldEntity* owner = NULL) 95 { 96 Location zeroloc; 97 T* entity = new T(); 98 entities->add ((WorldEntity*)entity, LIST_ADD_NEXT); 99 if( loc == NULL) 100 { 101 zeroloc.dist = 0; 102 zeroloc.part = 0; 103 zeroloc.pos = Vector(); 104 zeroloc.rot = Quaternion(); 105 loc = &zeroloc; 106 } 107 entity->init (loc, owner); 108 if (entity->bFree) 109 { 110 track[loc->part].map_coords( loc, entity->get_placement()); 111 } 112 entity->post_spawn (); 113 return entity; 114 } 115 116 /** 117 \brief spawn a new WorldEntity at a Placement 118 \param lplc: the placement where the Entity should be spawned 119 \param owner: a pointer to the parent of the Entity 120 \return a pointer to the new WorldEntity or NULL if there was an error 121 122 You can use this function to spawn any FREE derivation of WorldEntity you want, just specify the desired 123 class within the template specification brackets. Do not attempt to spawn any classes that have NOT been 124 derived from WorldEntity, you won't even be able to compile the code. Note that this version of spawn() 125 works with free WorldEntities only, you will provoke an error message if you try to spawn a bound Entity with 126 a Placement. 127 */ 128 template<typename T> T* World::spawn(Placement* plc, WorldEntity* owner = NULL) 129 { 130 T* entity = new T(); 131 entities->add ((WorldEntity*)entity, LIST_ADD_NEXT); 132 entity->init (plc, owner); 133 if (!entity->bFree) 134 { 135 printf("Can't spawn unfree entity with placement\n"); 136 entities->remove( (WorldEntity*)entity, LIST_FIND_FW); 137 return NULL; 138 } 139 entity->post_spawn (); 140 return entity; 141 } 142 143 #endif 87 #endif /* _WORLD_H */ -
orxonox/branches/sound/src/world_entity.cc
r2190 r3238 36 36 WorldEntity::WorldEntity (bool isFree) : bFree(isFree) 37 37 { 38 collisioncluster = NULL; 39 owner = NULL; 38 this->bDraw = true; 39 collisioncluster = NULL; 40 owner = NULL; 40 41 } 41 42 … … 45 46 WorldEntity::~WorldEntity () 46 47 { 47 48 if( collisioncluster != NULL) delete collisioncluster; 48 49 } 49 50 50 51 /** 51 52 52 \brief get the Location of the WorldEntity 53 \return a pointer to location 53 54 */ 54 Location* WorldEntity::get _location ()55 Location* WorldEntity::getLocation () 55 56 { 56 57 return &loc; 57 58 } 58 59 59 60 /** 60 61 61 \brief get the Placement of the WorldEntity 62 \return a pointer to placement 62 63 */ 63 Placement* WorldEntity::get _placement ()64 Placement* WorldEntity::getPlacement () 64 65 { 65 66 return &place; 66 67 } 67 68 68 69 /** 69 70 70 \brief query whether the WorldEntity in question is free 71 \return true if the WorldEntity is free or false if it isn't 71 72 */ 72 73 bool WorldEntity::isFree () … … 76 77 77 78 /** 78 79 80 81 79 \brief set the WorldEntity's collision hull 80 \param newhull: a pointer to a completely assembled CollisionCluster 81 82 Any previously assigned collision hull will be deleted on reassignment 82 83 */ 83 void WorldEntity::set _collision (CollisionCluster* newhull)84 void WorldEntity::setCollision (CollisionCluster* newhull) 84 85 { 85 86 87 86 if( newhull == NULL) return; 87 if( collisioncluster != NULL) delete collisioncluster; 88 collisioncluster = newhull; 88 89 } 89 90 90 91 /** 91 92 93 94 92 \brief this method is called every frame 93 \param time: the time in seconds that has passed since the last tick 94 95 Handle all stuff that should update with time inside this method (movement, animation, etc.) 95 96 */ 96 97 void WorldEntity::tick(float time) … … 100 101 /** 101 102 \brief the entity is drawn onto the screen with this function 102 103 103 104 This is a central function of an entity: call it to let the entity painted to the screen. Just override this function with whatever you want to be drawn. 104 105 */ … … 108 109 109 110 /** 110 111 112 113 111 \brief this function is called, when two entities collide 112 \param other: the world entity with whom it collides 113 \param ownhitflags: flags to the CollisionCluster subsections that registered an impact 114 \param otherhitflags: flags to the CollisionCluster subsections of the other entity that registered an impact 114 115 115 116 Implement behaviour like damage application or other miscellaneous collision stuff in this function 116 117 */ 117 118 void WorldEntity::collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags) {} … … 135 136 136 137 /** 137 138 \brief basic initialisation for bound Entities 138 139 */ 139 140 void WorldEntity::init( Location* spawnloc, WorldEntity* spawnowner) 140 141 { 141 142 142 loc = *spawnloc; 143 owner = spawnowner; 143 144 } 144 145 145 146 /** 146 147 \brief basic initialisation for free Entities 147 148 */ 148 149 void WorldEntity::init( Placement* spawnplc, WorldEntity* spawnowner) 149 150 { 150 151 151 place = *spawnplc; 152 owner = spawnowner; 152 153 } 153 154 154 155 /** 155 156 157 158 156 \brief this is called immediately after the Entity has been constructed and initialized 157 158 Put any initialisation code that requires knowledge of location (placement if the Entity is free) and owner of the entity here. 159 DO NOT place such code in the constructor, those variables are set AFTER the entity is constucted. 159 160 */ 160 void WorldEntity::post _spawn ()161 void WorldEntity::postSpawn () 161 162 { 162 163 } 163 164 164 165 /** 165 166 167 168 169 166 \brief this handles incoming command messages 167 \param cmd: a pointer to the incoming Command structure 168 169 Put all code that handles Command messages here, this will mainly be called by the assigned CommandNode but can also be used 170 to send commands from one WorldEntity to another. 170 171 */ 171 172 void WorldEntity::command (Command* cmd) … … 174 175 175 176 /** 176 177 177 \brief this is called by the local Camera to determine the point it should look at on the WorldEntity 178 \param locbuf: a pointer to the buffer to fill with a location to look at 178 179 179 180 180 You may put any Location you want into locbuf, the Camera will determine via the corresponding Track how 181 to look at the location you return with this. 181 182 */ 182 void WorldEntity::get _lookat (Location* locbuf)183 void WorldEntity::getLookat (Location* locbuf) 183 184 { 184 185 } 185 186 186 187 /** 187 188 189 190 188 \brief this method is called by the world if the WorldEntity leaves valid gamespace 189 190 For free entities this means it left the Track boundaries. With bound entities it means its Location adresses a 191 place that is not in the world anymore. In both cases you might have to take extreme measures (a.k.a. call destroy). 191 192 */ 192 void WorldEntity::left _world ()193 void WorldEntity::leftWorld () 193 194 { 194 195 } -
orxonox/branches/sound/src/world_entity.h
r2551 r3238 4 4 */ 5 5 6 #ifndef WORLD_ENTITY_H7 #define WORLD_ENTITY_H6 #ifndef _WORLD_ENTITY_H 7 #define _WORLD_ENTITY_H 8 8 9 9 #include "stdincl.h" … … 18 18 public: 19 19 WorldEntity (bool isFree = false); 20 ~WorldEntity ();20 virtual ~WorldEntity (); 21 21 22 Location* get _location ();23 Placement* get _placement ();24 void set _collision (CollisionCluster* newhull);22 Location* getLocation (); 23 Placement* getPlacement (); 24 void setCollision (CollisionCluster* newhull); 25 25 26 26 bool isFree (); … … 29 29 //void removeAbility(Ability* ability); 30 30 31 virtual void post _spawn ();31 virtual void postSpawn (); 32 32 virtual void tick (float time); 33 33 virtual void hit (WorldEntity* weapon, Vector loc); … … 37 37 38 38 virtual void draw (); 39 virtual void get _lookat (Location* locbuf);39 virtual void getLookat (Location* locbuf); 40 40 41 virtual void left _world ();41 virtual void leftWorld (); 42 42 43 43 private: … … 55 55 }; 56 56 57 #endif 57 #endif /* _WORLD_ENTITY_H */
Note: See TracChangeset
for help on using the changeset viewer.
