Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7177 in orxonox.OLD


Ignore:
Timestamp:
Feb 22, 2006, 12:34:43 AM (18 years ago)
Author:
bensch
Message:

orxonox/dylib: the first level works again, had to fix out the TestGun (it had some bugs, i think)

Location:
branches/shared_lib/src
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/shared_lib/src/Makefile.am

    r7175 r7177  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 include world_entities/WorldEntities.am
    54include story_entities/Makefile.am
    65
    … …  
    2726
    2827orxonox_SOURCES = \
    29                 $(WorldEntities_SOURCES_) \
    3028                $(StoryEntities_SOURCES_) \
    3129                orxonox.cc \

  • branches/shared_lib/src/orxonox.cc

    r7176 r7177  
    282282    NetworkManager::getInstance()->establishConnection(this->serverName, port);
    283283  }
    284   else if( this->port > 0) {    // we are a server
     284  else if( this->port > 0)
     285  {    // we are a server
    285286    State::setOnline(true);
    286287    NetworkManager::getInstance()->createServer(port);
    … …  
    337338      DynamicLoader::addSearchDir(PKG_LIBDIR);
    338339
    339   DynamicLoader::loadDyLib("libORXground_turret");
     340  /// FIXME make this more modular (search for himself for all the libraries
    340341  printf("%s\n", DynamicLoader::getSearchDir());
     342  DynamicLoader::loadDyLib("libORXenvironmentals");
     343  DynamicLoader::loadDyLib("libORXplayables");
     344  DynamicLoader::loadDyLib("libORXweapons");
     345  DynamicLoader::loadDyLib("libORXprojectiles");
     346  DynamicLoader::loadDyLib("libORXpower_ups");
     347  DynamicLoader::loadDyLib("libORXmisc_entities");
     348  DynamicLoader::loadDyLib("libORXnpcs_ground.la");
     349  DynamicLoader::loadDyLib("libORXnpcs_air");
     350  printf("%s\n", DynamicLoader::getSearchDir());
     351
    341352  // start the collision detection engine
    342353  CDEngine::getInstance();

  • branches/shared_lib/src/util/loading/dynamic_loader.cc

    r7175 r7177  
    7575{
    7676  DynamicLoader::initialize();
     77
    7778  void* handle;
    7879  handle = lt_dlopenext(libName);

  • branches/shared_lib/src/world_entities/Makefile.am

    r7176 r7177  
    11MAINSRCDIR=..
    22include $(MAINSRCDIR)/defs/include_paths.am
    3 include WorldEntities.am
    43
    54noinst_LIBRARIES = libORXwe.a
    65
    7 pkglib_LTLIBRARIES = libORXground_turret.la
    8 libORXground_turret_la_SOURCES = npcs/ground_turret.cc
    9 
     6## TODO ::
     7WRONG_SORTED_SOURCES_ = space_ships/space_ship.cc
    108
    119
    … …  
    3230                spawning_point.cc \
    3331                \
     32                skybox.cc \
     33                terrain.cc \
    3434                \
    35                 effects/explosion.cc
     35                elements/image_entity.cc \
     36                elements/text_element.cc \
     37                \
     38                effects/explosion.cc \
     39                \
     40                $(WRONG_SORTED_SOURCES_)
    3641
     42LD_FLAGS = --export-dynamic
     43
     44pkglib_LTLIBRARIES = \
     45                libORXnpcs_ground.la \
     46                libORXnpcs_air.la \
     47                libORXenvironmentals.la \
     48                libORXweapons.la \
     49                libORXprojectiles.la \
     50                libORXpower_ups.la \
     51                libORXplayables.la \
     52                libORXmisc_entities.la
     53
     54libORXnpcs_ground_la_SOURCES = \
     55                npcs/ground_turret.cc
     56
     57libORXnpcs_air_la_SOURCES = \
     58                npcs/npc_test1.cc \
     59                npcs/npc_test.cc
     60
     61libORXenvironmentals_la_SOURCES = \
     62                environment.cc \
     63                skysphere.cc \
     64                satellite.cc \
     65                character_attributes.cc \
     66                test_entity.cc \
     67                planet.cc \
     68                environments/water.cc \
     69                environments/model_entity.cc \
     70                environments/building.cc \
     71                \
     72                movie_entity.cc \
     73                recorder.cc
     74
     75libORXweapons_la_SOURCES = \
     76                weapons/turret.cc \
     77                weapons/aiming_turret.cc \
     78                weapons/targeting_turret.cc \
     79                weapons/cannon.cc \
     80                weapons/hyperblaster.cc \
     81                weapons/aim.cc
     82
     83#               weapons/test_gun.cc
     84
     85libORXprojectiles_la_SOURCES = \
     86                projectiles/bomb.cc \
     87                projectiles/laser.cc \
     88                projectiles/test_bullet.cc \
     89                projectiles/rocket.cc \
     90                projectiles/guided_missile.cc \
     91                projectiles/hyperblast.cc
     92
     93libORXpower_ups_la_SOURCES = \
     94                power_ups/turret_power_up.cc \
     95                power_ups/laser_power_up.cc
     96
     97libORXplayables_la_SOURCES = \
     98                space_ships/helicopter.cc \
     99                space_ships/hover.cc \
     100                space_ships/turbine_hover.cc \
     101                creatures/md2_creature.cc
     102
     103libORXmisc_entities_la_SOURCES = \
     104                \
     105                effects/lightning_bolt.cc
    37106
    38107
    … …  
    62131                effects/explosion.h \
    63132                \
    64                 $(WorldEntities_HEADERS_)
     133                \
     134                \
     135                npcs/npc_test.h \
     136                npcs/npc_test1.h \
     137                npcs/ground_turret.h \
     138                environment.h \
     139                skysphere.h \
     140                skybox.h \
     141                terrain.h \
     142                satellite.h \
     143                movie_entity.h \
     144                recorder.h \
     145                character_attributes.h \
     146                test_entity.h \
     147                planet.h \
     148                \
     149                weapons/test_gun.h \
     150                weapons/cannon.h \
     151                weapons/hyperblaster.h \
     152                weapons/turret.h \
     153                weapons/aiming_turret.h \
     154                weapons/targeting_turret.h \
     155                weapons/aim.h \
     156                \
     157                projectiles/bomb.h \
     158                projectiles/laser.h \
     159                projectiles/test_bullet.h \
     160                projectiles/rocket.h \
     161                projectiles/guided_missile.h \
     162                projectiles/hyperblast.h \
     163                \
     164                power_ups/turret_power_up.h \
     165                power_ups/laser_power_up.h \
     166                \
     167                space_ships/space_ship.h \
     168                space_ships/helicopter.h \
     169                space_ships/hover.h \
     170                space_ships/turbine_hover.h \
     171                creatures/md2_creature.h \
     172                \
     173                environments/water.h \
     174                environments/model_entity.h \
     175                environments/building.h \
     176                elements/image_entity.h \
     177                elements/text_element.h \
     178                \
     179                effects/lightning_bolt.h
    65180
    66 
    67 EXTRA_DIST = WorldEntities.am

  • branches/shared_lib/src/world_entities/WorldEntities.am

    r7175 r7177  
    5050
    5151
    52 WorldEntities_HEADERS_ = \
    53                 npcs/npc_test.h \
    54                 npcs/npc_test1.h \
    55                 npcs/ground_turret.h \
    56                 environment.h \
    57                 skysphere.h \
    58                 skybox.h \
    59                 terrain.h \
    60                 satellite.h \
    61                 movie_entity.h \
    62                 recorder.h \
    63                 character_attributes.h \
    64                 test_entity.h \
    65                 planet.h \
    66                 \
    67                 weapons/test_gun.h \
    68                 weapons/cannon.h \
    69                 weapons/hyperblaster.h \
    70                 weapons/turret.h \
    71                 weapons/aiming_turret.h \
    72                 weapons/targeting_turret.h \
    73                 weapons/aim.h \
    74                 \
    75                 projectiles/bomb.h \
    76                 projectiles/laser.h \
    77                 projectiles/test_bullet.h \
    78                 projectiles/rocket.h \
    79                 projectiles/guided_missile.h \
    80                 projectiles/hyperblast.h \
    81                 \
    82                 power_ups/turret_power_up.h \
    83                 power_ups/laser_power_up.h \
    84                 \
    85                 space_ships/space_ship.h \
    86                 space_ships/helicopter.h \
    87                 space_ships/hover.h \
    88                 space_ships/turbine_hover.h \
    89                 creatures/md2_creature.h \
    90                 \
    91                 environments/water.h \
    92                 environments/model_entity.h \
    93                 environments/building.h \
    94                 \
    95                 elements/image_entity.h \
    96                 elements/text_element.h \
    97                 \
    98                 effects/lightning_bolt.h

  • branches/shared_lib/src/world_entities/creatures/md2_creature.cc

    r7078 r7177  
    2626
    2727#include "weapons/weapon_manager.h"
    28 #include "weapons/test_gun.h"
    29 #include "weapons/turret.h"
    30 #include "weapons/cannon.h"
    3128
    3229#include "factory.h"
    … …  
    8077
    8178  //weapons:
    82   Weapon* wpRight = new TestGun(0);
    83   wpRight->setName("testGun Right");
    84   Weapon* wpLeft = new TestGun(1);
    85   wpLeft->setName("testGun Left");
    86   Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
    87 
    88   cannon->setName("BFG");
    89 
    90    this->getWeaponManager()->addWeapon(wpLeft, 1, 0);
    91    this->getWeaponManager()->addWeapon(wpRight,1 ,1);
     79//  Weapon* wpRight = new TestGun(0);
     80//  wpRight->setName("testGun Right");
     81//  Weapon* wpLeft = new TestGun(1);
     82//  wpLeft->setName("testGun Left");
     83//  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
     84
     85//  cannon->setName("BFG");
     86
     87   //this->getWeaponManager()->addWeapon(wpLeft, 1, 0);
     88   //this->getWeaponManager()->addWeapon(wpRight,1 ,1);
    9289//   this->getWeaponManager()->addWeapon(cannon, 0, 6);
    9390

  • branches/shared_lib/src/world_entities/space_ships/helicopter.cc

    r7096 r7177  
    2020
    2121#include "weapons/weapon_manager.h"
    22 #include "weapons/test_gun.h"
    23 #include "weapons/turret.h"
    24 #include "weapons/cannon.h"
    2522
    2623#include "factory.h"
    … …  
    8279
    8380  //weapons:
    84   Weapon* wpRight = new TestGun(0);
    85   wpRight->setName("testGun Right");
    86   Weapon* wpLeft = new TestGun(1);
    87   wpLeft->setName("testGun Left");
     81//  Weapon* wpRight = new TestGun(0);
     82//  wpRight->setName("testGun Right");
     83//  Weapon* wpLeft = new TestGun(1);
     84//  wpLeft->setName("testGun Left");
    8885  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
    8986
    9087  cannon->setName("BFG");
    9188
    92   this->addWeapon(wpLeft, 1, 0);
    93   this->addWeapon(wpRight,1 ,1);
     89//  this->addWeapon(wpLeft, 1, 0);
     90//  this->addWeapon(wpRight,1 ,1);
    9491  this->addWeapon(cannon, 0, 6);
    9592

  • branches/shared_lib/src/world_entities/space_ships/hover.cc

    r7072 r7177  
    2020
    2121#include "weapons/weapon_manager.h"
    22 #include "weapons/test_gun.h"
    23 #include "weapons/turret.h"
    24 #include "weapons/cannon.h"
    2522
    2623#include "factory.h"
    … …  
    7471
    7572  //weapons:
    76   Weapon* wpRight = new TestGun(0);
    77   wpRight->setName("testGun Right");
    78   Weapon* wpLeft = new TestGun(1);
    79   wpLeft->setName("testGun Left");
    80   Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
    81 
    82   cannon->setName("BFG");
    83 
    84   this->addWeapon(wpLeft, 1, 0);
    85   this->addWeapon(wpRight,1 ,1);
    86   this->addWeapon(cannon, 0, 2);
     73//  Weapon* wpRight = new TestGun(0);
     74//  wpRight->setName("testGun Right");
     75//  Weapon* wpLeft = new TestGun(1);
     76//  wpLeft->setName("testGun Left");
     77//  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
     78
     79//  cannon->setName("BFG");
     80
     81//  this->addWeapon(wpLeft, 1, 0);
     82//  this->addWeapon(wpRight,1 ,1);
     83//  this->addWeapon(cannon, 0, 2);
    8784
    8885  this->getWeaponManager()->changeWeaponConfig(1);

  • branches/shared_lib/src/world_entities/space_ships/space_ship.cc

    r7122 r7177  
    2323#include "resource_manager.h"
    2424
    25 #include "weapons/weapon_manager.h"
    26 #include "weapons/test_gun.h"
    2725#include "weapons/turret.h"
    2826#include "weapons/cannon.h"
    … …  
    126124
    127125  //weapons:
    128   Weapon* wpRight = new TestGun(0);
    129   wpRight->setName("testGun Right");
    130   Weapon* wpLeft = new TestGun(1);
    131   wpLeft->setName("testGun Left");
     126  //Weapon* wpRight = dynamic_cast<Weapon*>(Factory::fabricate("TestGun"));
     127  //wpRight->setName("testGun Right");
     128  //Weapon* wpLeft = dynamic_cast<Weapon*>(Factory::fabricate("TestGun"));
     129  //wpLeft->setName("testGun Left");
    132130  //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
    133131
    134132  //cannon->setName("BFG");
    135133
    136   this->addWeapon(wpLeft, 1, 0);
    137   this->addWeapon(wpRight,1 ,1);
     134  //this->addWeapon(wpLeft, 1, 0);
     135  //this->addWeapon(wpRight,1 ,1);
    138136  //this->addWeapon(cannon, 0, 6);
    139137

  • branches/shared_lib/src/world_entities/space_ships/turbine_hover.cc

    r7126 r7177  
    2020
    2121#include "weapons/weapon_manager.h"
    22 #include "weapons/test_gun.h"
    23 #include "weapons/turret.h"
    24 #include "weapons/cannon.h"
    2522
    2623#include "factory.h"
    … …  
    7673
    7774  //weapons:
    78   Weapon* wpRight = new TestGun(0);
    79   wpRight->setName("testGun Right");
    80   Weapon* wpLeft = new TestGun(1);
    81   wpLeft->setName("testGun Left");
     75//  Weapon* wpRight = new TestGun(0);
     76//  wpRight->setName("testGun Right");
     77//  Weapon* wpLeft = new TestGun(1);
     78//  wpLeft->setName("testGun Left");
    8279  //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
    8380
    8481  //  cannon->setName("BFG");
    8582
    86   this->addWeapon(wpLeft, 1, 0);
    87   this->addWeapon(wpRight,1 ,1);
     83//  this->addWeapon(wpLeft, 1, 0);
     84//  this->addWeapon(wpRight,1 ,1);
    8885  //this->addWeapon(cannon, 0, 2);
    8986
Note: See TracChangeset for help on using the changeset viewer.