cmake/FindALUT.cmake @@ -94,25 +94,52 @@ SET(OPENC2E_CORE -# Pass flags to the compiler -ADD_DEFINITIONS("-W -Wall -Wno-conversion -Wno-unused -pthread -D_REENTRANT -DYYERROR_VERBOSE") FIND_PACKAGE(SDL REQUIRED) FIND_PACKAGE(SDL_mixer REQUIRED) FIND_PACKAGE(SDL_net REQUIRED) FIND_PACKAGE(SDL_gfx REQUIRED) +FIND_PACKAGE(OpenAL) +FIND_PACKAGE(ALUT) FIND_PACKAGE(Boost) -ADD_EXECUTABLE(openc2e ${OPENC2E_CORE} caosVM_ser_stub.cpp main.cpp) +SET(USE_OPENAL "NO") + +IF(${OPENAL_FOUND} STREQUAL "YES") + IF(${ALUT_FOUND} STREQUAL "YES") + SET(USE_OPENAL "YES") + ENDIF(${ALUT_FOUND} STREQUAL "YES") +ENDIF(${OPENAL_FOUND} STREQUAL "YES") + +IF(${USE_OPENAL} STREQUAL "NO") + SET(ALUT_INCLUDE_DIR "") + SET(OPENAL_INCLUDE_DIR "") + SET(ALUT_LIBRARY "") + SET(OPENAL_LIBRARY "") + SET(OPENAL_SRC "") + SET(OPENAL_DEF "") +ELSE(${OPENAL_SRC} STREQUAL "") + SET(OPENAL_SRC "OpenALBackend.cpp") + SET(OPENAL_DEF "-DOPENAL_SUPPORT") +ENDIF(${OPENAL_SRC} STREQUAL "") + +# Pass flags to the compiler +ADD_DEFINITIONS("-W -Wall -Wno-conversion -Wno-unused -pthread -D_REENTRANT -DYYERROR_VERBOSE ${OPENAL_DEF}") + +ADD_EXECUTABLE(openc2e ${OPENC2E_CORE} ${OPENAL_SRC} caosVM_ser_stub.cpp main.cpp) TARGET_LINK_LIBRARIES(openc2e z m pthread ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLNET_LIBRARY} ${SDLGFX_LIBRARY} + ${OPENAL_LIBRARY} + ${ALUT_LIBRARY} boost_program_options-mt boost_serialization-mt - boost_filesystem-mt) + boost_filesystem-mt + boost_thread-mt + ) INCLUDE_DIRECTORIES(BEFORE ${BIN} @@ -120,7 +147,10 @@ INCLUDE_DIRECTORIES(BEFORE ${SDL_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${SDLNET_INCLUDE_DIR} - ${SDLGFX_INCLUDE_DIR}) + ${SDLGFX_INCLUDE_DIR} + ${OPENAL_INCLUDE_DIR} + ${ALUT_INCLUDE_DIR} + ) FILE(GLOB CAOSVM_FILES ${SRC}/caosVM_*.cpp) ADD_CUSTOM_COMMAND( CMakeLists.txt @@ -75,14 +75,16 @@ public: void setZoom(int pixels, int _x, int _y); }; +class Backend; + class MainCamera : public Camera { protected: - class Backend *backend; + boost::shared_ptr<Backend> backend; std::vector<AgentRef> floated; public: - MainCamera() { backend = 0; } - void setBackend(Backend *b) { backend = b; } + MainCamera() { } + void setBackend(boost::shared_ptr<Backend> b) { backend = b; } unsigned int const getWidth(); unsigned int const getHeight(); void moveTo(int _x, int _y, panstyle pan = jump); Camera.h @@ -23,6 +23,8 @@ #include "caosVM.h" // for setupCommandPointers() #include "PointerAgent.h" #include "dialect.h" // registerDelegates +#include "NullBackend.h" +#include "NullAudioBackend.h" #include <boost/filesystem/path.hpp> #include <boost/filesystem/operations.hpp> @@ -40,7 +42,6 @@ namespace po = boost::program_options; Engine engine; Engine::Engine() { - backend = 0; done = false; tickdata = 0; for (unsigned int i = 0; i < 10; i++) ticktimes[i] = 0; @@ -51,13 +52,27 @@ Engine::Engine() { cmdline_enable_sound = true; cmdline_norun = false; + + addPossibleBackend("null", shared_ptr<Backend>(new NullBackend())); + addPossibleAudioBackend("null", shared_ptr<AudioBackend>(new NullAudioBackend())); } Engine::~Engine() { - if (backend) delete backend; } -void Engine::setBackend(Backend *b) { +void Engine::addPossibleBackend(std::string s, boost::shared_ptr<Backend> b) { + assert(b); + preferred_backend = s; + possible_backends[s] = b; +} + +void Engine::addPossibleAudioBackend(std::string s, boost::shared_ptr<AudioBackend> b) { + assert(b); + preferred_audiobackend = s; + possible_audiobackends[s] = b; +} + +void Engine::setBackend(shared_ptr<Backend> b) { backend = b; lasttimestamp = backend->ticks(); @@ -387,7 +402,6 @@ void Engine::handleMouseButton(SomeEvent &event) { } void Engine::handleKeyDown(SomeEvent &event) { - switch (event.key) { case 'w': w_down = true; break; case 'a': a_down = true; break; @@ -520,14 +534,31 @@ bool Engine::parseCommandLine(int argc, char *argv[]) { int optret; std::vector<std::string> data_vec; + // generate help for backend options + std::string available_backends; + for (std::map<std::string, boost::shared_ptr<Backend> >::iterator i = possible_backends.begin(); i != possible_backends.end(); i++) { + if (available_backends.empty()) available_backends = i->first; + else available_backends += ", " + i->first; + } + available_backends = "Select the backend (options: " + available_backends + "), default is " + preferred_backend; + + std::string available_audiobackends; + for (std::map<std::string, boost::shared_ptr<AudioBackend> >::iterator i = possible_audiobackends.begin(); i != possible_audiobackends.end(); i++) { + if (available_audiobackends.empty()) available_audiobackends = i->first; + else available_audiobackends += ", " + i->first; + } + available_audiobackends = "Select the audio backend (options: " + available_audiobackends + "), default is " + preferred_audiobackend; + // parse the command-line flags po::options_description desc; desc.add_options() ("help,h", "Display help on command-line options") ("version,V", "Display openc2e version") ("silent,s", "Disable all sounds") + ("backend,k", po::value<std::string>(&preferred_backend)->composing(), available_backends.c_str()) + ("audiobackend,o", po::value<std::string>(&preferred_audiobackend)->composing(), available_audiobackends.c_str()) ("data-path,d", po::value< std::vector<std::string> >(&data_vec)->composing(), - "Set the path to the data directory") + "Sets or adds a path to a data directory") ("bootstrap,b", po::value< std::vector<std::string> >(&cmdline_bootstrap)->composing(), "Sets or adds a path or COS file to bootstrap from") ("gametype,g", po::value< std::string >(&world.gametype), "Set the game type (c1, c2, cv or c3)") @@ -572,7 +603,7 @@ bool Engine::parseCommandLine(int argc, char *argv[]) { return true; } -bool Engine::initialSetup(Backend *b) { +bool Engine::initialSetup() { assert(world.data_directories.size() > 0); // autodetect gametype if necessary @@ -603,13 +634,24 @@ bool Engine::initialSetup(Backend *b) { world.init(); // just reads mouse cursor (we want this after the catalogue reading so we don't play "guess the filename") std::cout << "* Reading PRAY files..." << std::endl; world.praymanager.update(); - std::cout << "* Initialising backend..." << std::endl; - // TODO: ideally we shouldn't bother with the backend if norun is set (but we need one right now, for MainCamera/CAOS) - engine.setBackend(b); - engine.backend->init(); - world.camera.setBackend(engine.backend); // TODO: hrr + + if (cmdline_norun) preferred_backend = "null"; + if (preferred_backend != "null") std::cout << "* Initialising backend " << preferred_backend << "..." << std::endl; + shared_ptr<Backend> b = possible_backends[preferred_backend]; + if (!b) throw creaturesException("No such backend " + preferred_backend); + b->init(); setBackend(b); + possible_backends.clear(); + + if (cmdline_norun || !cmdline_enable_sound) preferred_audiobackend = "null"; + if (preferred_audiobackend != "null") std::cout << "* Initialising audio backend " << preferred_audiobackend << "..." << std::endl; + shared_ptr<AudioBackend> a = possible_audiobackends[preferred_audiobackend]; + if (!a) throw creaturesException("No such audio backend " + preferred_audiobackend); + a->init(); audio = a; + possible_audiobackends.clear(); + + world.camera.setBackend(backend); // TODO: hrr - int listenport = engine.backend->networkInit(); + int listenport = backend->networkInit(); if (listenport != -1) { // inform the user of the port used, and store it in the relevant file std::cout << "Listening for connections on port " << listenport << "." << std::endl; @@ -626,7 +668,7 @@ bool Engine::initialSetup(Backend *b) { // TODO: This is a hack for DS, basically. Not sure if it works properly. - fuzzie caosVar name; name.setString("engine_no_auxiliary_bootstrap_1"); caosVar contents; contents.setInt(1); - engine.eame_variables[name] = contents; + eame_variables[name] = contents; } // execute the initial scripts! @@ -667,7 +709,8 @@ bool Engine::initialSetup(Backend *b) { void Engine::shutdown() { world.shutdown(); - engine.backend->shutdown(); + backend->shutdown(); + audio->shutdown(); freeDelegates(); // does nothing if there are none (ie, no call to initialSetup) } Engine.cpp @@ -21,10 +21,13 @@ #define _ENGINE_H #include "caosVar.h" -#include "Backend.h" #include <map> #include <boost/filesystem/path.hpp> +class Backend; +class AudioBackend; +struct SomeEvent; + class Engine { protected: unsigned int tickdata; @@ -38,17 +41,21 @@ protected: bool cmdline_norun; std::vector<std::string> cmdline_bootstrap; + std::map<std::string, boost::shared_ptr<Backend> > possible_backends; + std::map<std::string, boost::shared_ptr<class AudioBackend> > possible_audiobackends; + std::string preferred_backend, preferred_audiobackend; + public: std::map<caosVar, caosVar, caosVarCompare> eame_variables; // non-serialised - Backend *backend; + boost::shared_ptr<Backend> backend; boost::shared_ptr<class AudioBackend> audio; bool done; unsigned int version; Engine(); ~Engine(); - void setBackend(Backend *b); + void setBackend(boost::shared_ptr<Backend> b); std::string executeNetwork(std::string in); bool needsUpdate(); void update(); @@ -62,8 +69,11 @@ public: void handleSpecialKeyDown(SomeEvent &event); void handleSpecialKeyUp(SomeEvent &event); + void addPossibleBackend(std::string, boost::shared_ptr<Backend>); + void addPossibleAudioBackend(std::string, boost::shared_ptr<AudioBackend>); + bool parseCommandLine(int argc, char *argv[]); - bool initialSetup(Backend *b); + bool initialSetup(); void shutdown(); bool noRun() { return cmdline_norun; } Engine.h @@ -73,6 +73,7 @@ OPENC2E_CORE = \ mngfile.o \ mngparser.tab.o \ oldBrain.o \ + OpenALBackend.o \ PathResolver.o \ physics.o \ PointerAgent.o \ @@ -96,8 +97,8 @@ OPENC2E = $(OPENC2E_CORE) $(SERSTUB) main.o OPENC2E_S = $(OPENC2E_CORE) $(SERIALIZATION) main.o DEBUGFLAGS=-ggdb3 -O0 -CFLAGS += -W -Wall -Wno-conversion -Wno-unused -pthread -D_REENTRANT -DYYERROR_VERBOSE -XLDFLAGS=$(LDFLAGS) -lboost_program_options-mt -lboost_serialization-mt -lboost_filesystem-mt $(SDL_LFLAGS) -lz -lm -lSDL_net -lSDL_gfx -lpthread +CFLAGS += -W -Wall -Wno-conversion -Wno-unused -pthread -D_REENTRANT -DYYERROR_VERBOSE -DOPENAL_SUPPORT +XLDFLAGS=$(LDFLAGS) -lboost_program_options-mt -lboost_serialization-mt -lboost_filesystem-mt -lboost_thread-mt $(SDL_LFLAGS) -lz -lm -lSDL_net -lSDL_gfx -lpthread -lopenal -lalut COREFLAGS=$(DEBUGFLAGS) $(SDL_CFLAGS) -I. XCFLAGS=$(CFLAGS) $(COREFLAGS) XCPPFLAGS=$(COREFLAGS) $(CPPFLAGS) $(CFLAGS) Makefile @@ -27,6 +27,10 @@ #include "exceptions.h" #include "World.h" +#ifndef OPENAL_SUPPORT +#error OPENAL_SUPPORT isn't set, so this file shouldn't be being compiled +#endif + const ALfloat zdist = -1.0; const ALfloat plnemul = 0.0; const ALfloat scale = 1.0/50; OpenALBackend.cpp @@ -24,7 +24,7 @@ #include "World.h" #include "SDLBackend.h" #include "NullBackend.h" -#include "NullAudioBackend.h" +#include "OpenALBackend.h" #if defined(_MSC_VER) && defined(_DEBUG) #undef main // because SDL is stupid @@ -34,19 +34,16 @@ extern "C" int main(int argc, char *argv[]) { try { std::cout << "openc2e (development build), built " __DATE__ " " __TIME__ "\nCopyright (c) 2004-2007 Alyssa Milburn and others\n\n"; + engine.addPossibleBackend("sdl", shared_ptr<Backend>(new SDLBackend())); +#ifdef OPENAL_SUPPORT + engine.addPossibleAudioBackend("openal", shared_ptr<AudioBackend>(new OpenALBackend())); +#endif + // pass command-line flags to the engine, but do no other setup if (!engine.parseCommandLine(argc, argv)) return 1; - // depending on engine configuration, create either a null (does nothing) backend or a normal SDL one - Backend *b; - if (engine.noRun()) b = new NullBackend(); - else b = new SDLBackend(); - - engine.audio = shared_ptr<AudioBackend>(new NullAudioBackend()); - engine.audio->init(); - // get the engine to do all the startup (read catalogue, loading world, etc) - if (!engine.initialSetup(b)) return 0; + if (!engine.initialSetup()) return 0; // do a first-pass draw of the world. TODO: correct? world.drawWorld(); main.cpp bc69cdddd3b79121c96e7032bfb7b096859c5627 Alyssa Milburn fuzzie@fuzzie.org http://github.com/ccdevnet/openc2e/commit/1549c9f136eb147476142e5fa7f64fe6f7899a21 1549c9f136eb147476142e5fa7f64fe6f7899a21 2007-08-16T12:35:07-07:00 2007-08-16T12:35:07-07:00 add multiple backend/audiobackend support, enable openal support, tweak makefile/cmake as necessary aa7b98e89d5e70de29ecbbbe9ee69d5c78a94c77 Alyssa Milburn fuzzie@fuzzie.org