Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 513


Ignore:
Timestamp:
Dec 13, 2007, 5:58:14 PM (16 years ago)
Author:
nicolasc
Message:

added copyright notice
network still need to be done

Location:
code/branches/FICN/src
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FICN/src/audio/AudioBuffer.cc

    r389 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#include "AudioBuffer.h"
    229
    … …  
    1845                if(alGetError() != AL_NO_ERROR)
    1946                        loaded=AL_FALSE;
    20        
     47
    2148                loaded=AL_TRUE;
    2249        }
    23        
     50
    2451        AudioBuffer::~AudioBuffer()
    2552        {
    26                
     53
    2754        }
    2855}

  • code/branches/FICN/src/audio/AudioManager.cc

    r458 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#include "AudioManager.h"
    229

  • code/branches/FICN/src/audio/AudioSource.cc

    r389 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#include "AudioSource.h"
    229
    … …  
    734
    835        }
    9        
     36
    1037        AudioSource::~AudioSource()
    1138        {
    12                
     39
    1340        }
    1441}

  • code/branches/FICN/src/audio/AudioStream.cc

    r430 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128
    229#include "AudioStream.h"
    … …  
    835                this->path = path;
    936                loaded = false;
    10         }       
     37        }
    1138
    1239        void AudioStream::open()
    … …  
    1441            int result;
    1542
    16            
     43
    1744            if(!(oggFile = fopen(path.c_str(), "rb")))
    1845                        {
    … …  
    2350            if((result = ov_open(oggFile, &oggStream, NULL, 0)) < 0)
    2451            {
    25         fclose(oggFile);               
     52        fclose(oggFile);
    2653              orxonox::Error("Could not open Ogg stream. " + errorString(result));
    2754                                return;
    … …  
    2956
    3057                        loaded = true;
    31        
     58
    3259            vorbisInfo = ov_info(&oggStream, -1);
    3360            vorbisComment = ov_comment(&oggStream, -1);
    34        
     61
    3562            if(vorbisInfo->channels == 1)
    3663                format = AL_FORMAT_MONO16;
    3764            else
    3865                format = AL_FORMAT_STEREO16;
    39                
    40                
     66
     67
    4168            alGenBuffers(2, buffers);
    4269            check();
    4370            alGenSources(1, &source);
    4471            check();
    45            
     72
    4673            alSource3f(source, AL_POSITION,        0.0, 0.0, 0.0);
    4774            alSource3f(source, AL_VELOCITY,        0.0, 0.0, 0.0);
    … …  
    5077            alSourcei (source, AL_SOURCE_RELATIVE, AL_FALSE      );
    5178        }
    52        
    53        
    54        
    55        
     79
     80
     81
     82
    5683        void AudioStream::release()
    5784        {
    … …  
    6390            alDeleteBuffers(1, buffers);
    6491            check();
    65        
     92
    6693            ov_clear(&oggStream);
    6794                        loaded = false;
    68                
    69         }
    70        
    71        
    72        
    73        
     95
     96        }
     97
     98
     99
     100
    74101        void AudioStream::display()
    75102        {
    … …  
    86113                << "\n"
    87114                << "vendor " << vorbisComment->vendor << "\n";
    88                
     115
    89116            for(int i = 0; i < vorbisComment->comments; i++)
    90117                std::cout << "   " << vorbisComment->user_comments[i] << "\n";
    91                
    92             std::cout << std::endl;     
     118
     119            std::cout << std::endl;
    93120                }
    94121        }
    95        
    96        
    97        
    98        
     122
     123
     124
     125
    99126        bool AudioStream::playback()
    100127        {
    … …  
    106133            if(playing())
    107134                return true;
    108                
     135
    109136            if(!stream(buffers[0]))
    110137                return false;
    111                
     138
    112139            if(!stream(buffers[1]))
    113140                return false;
    114            
     141
    115142            alSourceQueueBuffers(source, 2, buffers);
    116143            alSourcePlay(source);
    117            
     144
    118145            return true;
    119146        }
    120        
    121        
    122        
    123        
     147
     148
     149
     150
    124151        bool AudioStream::playing()
    125152        {
    … …  
    133160            return (state == AL_PLAYING);
    134161        }
    135        
    136        
    137        
    138        
     162
     163
     164
     165
    139166        bool AudioStream::update()
    140167        {
    141168            int processed;
    142169            bool active = true;
    143        
     170
    144171            alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed);
    145        
     172
    146173            while(processed--)
    147174            {
    148175                ALuint buffer;
    149                
     176
    150177                alSourceUnqueueBuffers(source, 1, &buffer);
    151178                check();
    152        
     179
    153180                active = stream(buffer);
    154        
     181
    155182                alSourceQueueBuffers(source, 1, &buffer);
    156183                check();
    157184            }
    158        
     185
    159186                        if (active==false)
    160187                        {
    … …  
    163190            return active;
    164191        }
    165        
    166        
    167        
    168        
     192
     193
     194
     195
    169196        bool AudioStream::stream(ALuint buffer)
    170197        {
    … …  
    173200            int  section;
    174201            int  result;
    175        
     202
    176203            while(size < BUFFER_SIZE)
    177204            {
    178205                result = ov_read(&oggStream, pcm + size, BUFFER_SIZE - size, 0, 2, 1, &section);
    179            
     206
    180207                if(result > 0)
    181208                    size += result;
    … …  
    186213                        break;
    187214            }
    188            
     215
    189216            if(size == 0)
    190217                return false;
    191                
     218
    192219            alBufferData(buffer, format, pcm, size, vorbisInfo->rate);
    193220            check();
    194            
     221
    195222            return true;
    196223        }
    197        
    198        
     224
     225
    199226
    200227        void AudioStream::empty()
    201228        {
    202229            int queued;
    203            
     230
    204231            alGetSourcei(source, AL_BUFFERS_QUEUED, &queued);
    205            
     232
    206233            while(queued--)
    207234            {
    208235                ALuint buffer;
    209            
     236
    210237                alSourceUnqueueBuffers(source, 1, &buffer);
    211238                check();
    212239            }
    213240        }
    214        
    215        
    216        
    217        
     241
     242
     243
     244
    218245        void AudioStream::check()
    219246        {
    220247                int error = alGetError();
    221        
     248
    222249                if(error != AL_NO_ERROR)
    223250                        orxonox::Error("OpenAL error was raised.");
    224251        }
    225        
    226        
    227        
     252
     253
     254
    228255        std::string AudioStream::errorString(int code)
    229256        {

  • code/branches/FICN/src/audio/_AudioObject.cc

    r389 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
     28
    129#include <iostream>
    230#include <string>
    … …  
    3361
    3462                // Initialize OpenAL and clear the error bit.
    35        
     63
    3664                alutInit(NULL, 0);
    3765                alGetError();
    38        
     66
    3967                // Load the wav data.
    40        
     68
    4169                if(LoadALData() == AL_FALSE)
    4270                {
    4371                    printf("Error loading sound data.");
    44                        
     72
    4573                }
    4674
    … …  
    4876                std::cout << "Play sone ambient background sound";
    4977        }
    50        
     78
    5179        AudioObject::~AudioObject()
    52         {       
     80        {
    5381                KillALData();
    5482        }
    55        
     83
    5684        ALboolean AudioObject::LoadALData()
    5785        {
    … …  
    6189                ALsizei freq;
    6290                ALboolean loop;
    63        
    64        
     91
     92
    6593                alGenBuffers(1, &Buffer);
    66        
     94
    6795                if(alGetError() != AL_NO_ERROR)
    6896                        return AL_FALSE;
    69        
     97
    7098                alutLoadWAVFile((ALbyte*)audioFile_.c_str(), &format, &data, &size, &freq, &loop);
    7199                alBufferData(Buffer, format, data, size, freq);
    72100                alutUnloadWAV(format, data, size, freq);
    73        
     101
    74102                alGenSources(1, &Source);
    75        
     103
    76104                if(alGetError() != AL_NO_ERROR)
    77105                        return AL_FALSE;
    78        
     106
    79107                alSourcei (Source, AL_BUFFER,   Buffer   );
    80108                alSourcef (Source, AL_PITCH,    1.0      );
    … …  
    83111                alSourcefv(Source, AL_VELOCITY, SourceVel);
    84112                alSourcei (Source, AL_LOOPING,  loop     );
    85        
     113
    86114                if(alGetError() == AL_NO_ERROR)
    87115                        return AL_TRUE;
    88        
    89        
     116
     117
    90118                return AL_FALSE;
    91         }       
     119        }
    92120
    93121        void AudioObject::SetListenerValues()
    … …  
    97125                alListenerfv(AL_ORIENTATION, ListenerOri);
    98126        }
    99        
     127
    100128        void AudioObject::KillALData()
    101129        {
    … …  
    108136        {
    109137                alSourcePlay(Source);
    110        
     138
    111139        }
    112140}

  • code/branches/FICN/src/hud/hud_overlay.cc

    r502 r513  
    55 *   License notice:
    66 *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
    1111 *
    1212 *   This program is distributed in the hope that it will be useful,
    … …  
    1616 *
    1717 *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    2020 *
    2121 *   Author:
    … …  
    7474                OverlayElement* TimeText = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/Time/Text");
    7575                TimeText->setCaption(StringConverter::toString(TimeMin) + ":" + StringConverter::toString(TimeSec));
    76                
     76
    7777                // set TargetWindow
    7878                String TargetWindowName = "HURRA";
    … …  
    8181                int TargetWindowHitRating = 30;
    8282                OverlayElement* TargetWindowNameText = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/TargetWindow/Name");
    83                 TargetWindowNameText->setCaption( TargetWindowName);           
     83                TargetWindowNameText->setCaption( TargetWindowName);
    8484                OverlayElement* TargetWindowDistanceText = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/TargetWindow/DistanceText");
    8585                TargetWindowDistanceText->setCaption(StringConverter::toString(TargetWindowDistance) + "km" );
    … …  
    8888                OverlayElement* TargetWindowHitRatingText = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/TargetWindow/HitRatingText");
    8989                TargetWindowHitRatingText->setCaption(StringConverter::toString(TargetWindowHitRating) + "%" );
    90                
     90
    9191                // set Energy
    9292                int EnergyValue = 60.0;
    9393                OverlayElement* EnergyLength = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/EnergyBackground");
    9494                EnergyLength->setWidth((int)((double)60/(double)100*200));
    95                
     95
    9696                // set Shild
    9797                bool ShildLeftTopValue = true;
    … …  
    111111                if (ShildRightBottomValue) ShildRightBottom->show();
    112112                else ShildRightBottom->hide();
    113                
     113
    114114                // set Rockets
    115115                int Rocket1 = 11;
    … …  
    125125                OverlayElement* RocketNum4 = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/RocketNum4");
    126126                RocketNum4->setCaption(StringConverter::toString(Rocket4));
    127                
     127
    128128                // set EnergyDistribution
    129129                double EnergyDistrPixelX = 100;
    130                 double EnergyDistrPixelY = 86;         
     130                double EnergyDistrPixelY = 86;
    131131                double EnergyDistrShild = 32;
    132132                double EnergyDistrEngine = 50;
    … …  
    137137                double EnergyDistrY = (double)EnergyDistrEngineInv/((double)EnergyDistrEngineInv+(double)EnergyDistrLaserInv) * EnergyDistrPixelY;
    138138                double EnergyDistrX = EnergyDistrY/1.7321;
    139                
    140                
    141                
     139
     140
     141
    142142                OverlayElement* EnergyDistrPoint = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/EnergyDistrPoint");
    143143//              EnergyDistrPoint->setLeft();

  • code/branches/FICN/src/loader/LevelLoader.cc

    r507 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#include <string>
    229#include <vector>
    … …  
    1946{
    2047        valid_ = false;
    21        
     48
    2249        // Load XML level file
    2350        path.append("/");
    24         path.append(file);     
    25        
     51        path.append(file);
     52
    2653        // Open xml file
    2754        doc.LoadFile(path);
    … …  
    3158        {
    3259                TiXmlHandle hDoc(&doc);
    33                 TiXmlHandle hRoot(0);           
     60                TiXmlHandle hRoot(0);
    3461                TiXmlElement* pElem;
    3562
    … …  
    4673                        if (pElem)
    4774                        {
    48                                 description_ = pElem->GetText();       
     75                                description_ = pElem->GetText();
    4976                        }
    50                        
     77
    5178                        // Set level name
    5279                        name_ = rootElement->Attribute("name");
    5380                        image_ = rootElement->Attribute("image");
    54                        
     81
    5582                        valid_ = true;
    5683                }
    … …  
    5885                {
    5986                        orxonox::Error("Level file has no valid root node");
    60                 }       
     87                }
    6188        }
    6289        else
    6390        {
    6491                orxonox::Error("Could not load level file ");
    65         }       
     92        }
    6693}
    6794
    … …  
    74101                        TiXmlElement* tElem;
    75102                        TiXmlNode* tNode;
    76                        
    77                        
     103
     104
    78105                        // Set loading screen
    79106                        loadElem = rootElement->FirstChildElement("loading");
    … …  
    99126                                showLoadingScreen();
    100127                        }
    101                        
     128
    102129                        // Load audio
    103130                        // TODO
    104                        
     131
    105132                        // Load scripts
    106133                        // TODO
    107                        
     134
    108135                        // Load world
    109136                        worldElem = rootElement->FirstChildElement("world");
    110137                        if (worldElem)
    111                         {       
     138                        {
    112139                                tNode = 0;
    113140                                while( tNode = worldElem->IterateChildren( tNode ) )
    … …  
    116143                                        orxonox::BaseObject* obj = ID(tElem->Value())->fabricate();
    117144                                        obj->loadParams(tElem);
    118                                 }                       
     145                                }
    119146                        }
    120                        
    121                         std::cout << "Loading finished!\n\n\n\n\n";                                             
     147
     148                        std::cout << "Loading finished!\n\n\n\n\n";
    122149                }
    123150        }
    124        
     151
    125152        void LevelLoader::showLoadingScreen()
    126153        {
    … …  
    129156                std::cout << "Backgroundcolor: " << loadingBackgroundColor_ << "\nBackgroundimage:" << loadingBackgroundImage_ << "\n\n\n";
    130157        }
    131        
     158
    132159        LevelLoader::~LevelLoader()
    133160        {
    134161
    135162        }
    136        
    137        
     163
     164
    138165        string LevelLoader::name()
    139166        {
    140167                return this->name_;
    141168        }
    142        
     169
    143170        string LevelLoader::description()
    144171        {
    145172                return this->description_;
    146173        }
    147        
     174
    148175        string LevelLoader::image()
    149176        {

  • code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc

    r497 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#include <fstream>
    229#include <string>

  • code/branches/FICN/src/orxonox/core/Error.cc

    r423 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#include "Error.h"
    229
    … …  
    1946                                                        << "############################ "<< std::endl
    2047                                                        << "An error occured in Orxonox: "<< std::endl;
    21                                                
     48
    2249                if (errorMsg=="")
    2350                {

  • code/branches/FICN/src/orxonox/core/Factory.cc

    r496 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/*!
    229    @file Factory.cc

  • code/branches/FICN/src/orxonox/core/Identifier.cc

    r496 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/*!
    229    @file Identifier.cc

  • code/branches/FICN/src/orxonox/core/IdentifierList.cc

    r496 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/*!
    229    @file IdentifierList.cc

  • code/branches/FICN/src/orxonox/core/MetaObjectList.cc

    r384 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/*!
    229    @file MetaObjectList.cc

  • code/branches/FICN/src/orxonox/core/OrxonoxClass.cc

    r384 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/*!
    229    @file OrxonoxClass.cc

  • code/branches/FICN/src/orxonox/hud/hud_overlay.cc

    r337 r513  
    55 *   License notice:
    66 *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
    1111 *
    1212 *   This program is distributed in the hope that it will be useful,
    … …  
    1616 *
    1717 *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    2020 *
    2121 *   Author:
    … …  
    7474                OverlayElement* TimeText = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/Time/Text");
    7575                TimeText->setCaption(StringConverter::toString(TimeMin) + ":" + StringConverter::toString(TimeSec));
    76                
     76
    7777                // set TargetWindow
    7878                String TargetWindowName = "HURRA";
    … …  
    8181                int TargetWindowHitRating = 30;
    8282                OverlayElement* TargetWindowNameText = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/TargetWindow/Name");
    83                 TargetWindowNameText->setCaption( TargetWindowName);           
     83                TargetWindowNameText->setCaption( TargetWindowName);
    8484                OverlayElement* TargetWindowDistanceText = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/TargetWindow/DistanceText");
    8585                TargetWindowDistanceText->setCaption(StringConverter::toString(TargetWindowDistance) + "km" );
    … …  
    8888                OverlayElement* TargetWindowHitRatingText = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/TargetWindow/HitRatingText");
    8989                TargetWindowHitRatingText->setCaption(StringConverter::toString(TargetWindowHitRating) + "%" );
    90                
     90
    9191                // set Energy
    9292                int EnergyValue = 60.0;
    9393                OverlayElement* EnergyLength = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/EnergyBackground");
    9494                EnergyLength->setWidth((int)((double)60/(double)100*200));
    95                
     95
    9696                // set Shild
    9797                bool ShildLeftTopValue = true;
    … …  
    111111                if (ShildRightBottomValue) ShildRightBottom->show();
    112112                else ShildRightBottom->hide();
    113                
     113
    114114                // set Rockets
    115115                int Rocket1 = 11;
    … …  
    125125                OverlayElement* RocketNum4 = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/RocketNum4");
    126126                RocketNum4->setCaption(StringConverter::toString(Rocket4));
    127                
     127
    128128                // set EnergyDistribution
    129129                double EnergyDistrPixelX = 100;
    130                 double EnergyDistrPixelY = 86;         
     130                double EnergyDistrPixelY = 86;
    131131                double EnergyDistrShild = 32;
    132132                double EnergyDistrEngine = 50;
    … …  
    137137                double EnergyDistrY = (double)EnergyDistrEngineInv/((double)EnergyDistrEngineInv+(double)EnergyDistrLaserInv) * EnergyDistrPixelY;
    138138                double EnergyDistrX = EnergyDistrY/1.7321;
    139                
    140                
    141                
     139
     140
     141
    142142                OverlayElement* EnergyDistrPoint = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/EnergyDistrPoint");
    143143//              EnergyDistrPoint->setLeft();

  • code/branches/FICN/src/orxonox/hud/test_overlay.cc

    r337 r513  
    55 *   License notice:
    66 *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
    1111 *
    1212 *   This program is distributed in the hope that it will be useful,
    … …  
    1616 *
    1717 *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    2020 *
    2121 *   Author:

  • code/branches/FICN/src/orxonox/inertial_node.cc

    r346 r513  
    55 *   License notice:
    66 *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
    1111 *
    1212 *   This program is distributed in the hope that it will be useful,
    … …  
    1616 *
    1717 *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    2020 *
    2121 *   Author:

  • code/branches/FICN/src/orxonox/objects/Ambient.cc

    r507 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#include <OgreSceneManager.h>
    229#include <string>
    … …  
    2552    {
    2653        Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
    27        
     54
    2855        if (xmlElem->Attribute("colourvalue"))
    2956        {
    30                
     57
    3158                std::vector<std::string> colourvalues = tokenize(xmlElem->Attribute("colourvalue"),",");
    3259                float r, g, b;
    … …  
    3461                String2Number<float>(g, colourvalues[1]);
    3562                String2Number<float>(b, colourvalues[2]);
    36                  
     63
    3764                mgr->setAmbientLight(ColourValue(r,g,b));
    38                
     65
    3966                std::cout << "Loader: Set ambient light: "<<r<<" " << g << " " << b  << std::endl << std::endl;
    40         }       
     67        }
    4168   }
    4269}

  • code/branches/FICN/src/orxonox/objects/BaseObject.cc

    r496 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/*!
    229    @file BaseObject.cc

  • code/branches/FICN/src/orxonox/objects/Skybox.cc

    r507 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#include <OgreSceneManager.h>
    229#include <string>
    … …  
    2552    {
    2653        Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
    27        
     54
    2855        if (xmlElem->Attribute("src"))
    2956        {
    3057                std::string skyboxSrc = xmlElem->Attribute("src");
    3158                mgr->setSkyBox(true, skyboxSrc);
    32                
     59
    3360                std::cout << "Loader: Set skybox: "<< skyboxSrc << std::endl << std::endl;
    34         }       
     61        }
    3562   }
    3663}

  • code/branches/FICN/src/orxonox/objects/WorldEntity.cc

    r497 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#include <string>
    229#include <sstream>

  • code/branches/FICN/src/orxonox/orxonox_scene.cc

    r346 r513  
    55 *   License notice:
    66 *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
    1111 *
    1212 *   This program is distributed in the hope that it will be useful,
    … …  
    1616 *
    1717 *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    2020 *
    2121 *   Author:
    … …  
    143143
    144144          lightNode_->setPosition(radius_*sin(5*t), radius_*cos(5*t), sin(1*t)*distance_);
    145        
     145
    146146          light_->setDiffuseColour(sin(1*t), sin(1*t + 2.09), sin(1*t + 2.09*2));
    147147          light_->setSpecularColour(sin(1*t), sin(1*t + 2.09), sin(1*t + 2.09*2));
    … …  
    149149          bbs_->getBillboard(0)->setColour(ColourValue(sin(1*t),
    150150          sin(1*t + 2.09), sin(1*t + 2.09*2)));
    151    
     151
    152152    return true;
    153153  }

  • code/branches/FICN/src/orxonox/orxonox_ship.cc

    r346 r513  
    55 *   License notice:
    66 *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
    1111 *
    1212 *   This program is distributed in the hope that it will be useful,
    … …  
    1616 *
    1717 *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    2020 *
    2121 *   Author:
    … …  
    5252  /**
    5353  * Base class for any kind of flyable ship in Orxonox.
    54   * 
     54  *
    5555  * The ship offers steering methods (like left, right, etc.) and translates
    5656  * them into movement. A ship can also hold more than one weapons (where each

  • code/branches/FICN/src/orxonox/run_manager.cc

    r346 r513  
    11/*
    2 *   ORXONOX - the hottest 3D action shooter ever to exist
    3 *
    4 *
    5 *   License notice:
    6 *
    7 *   This program is free software: you can redistribute it and/or modify
    8 *   it under the terms of the GNU General Public License as published by
    9 *   the Free Software Foundation, either version 3 of the License, or
    10 *   (at your option) any later version.
    11 *
    12 *   This program is distributed in the hope that it will be useful,
    13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 *   GNU General Public License for more details.
    16 *
    17 *   You should have received a copy of the GNU General Public License
    18 *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19 *
    20 *
    21 *   Author:
    22 *      Reto Grieder
    23 *   Co-authors:
    24 *      ...
    25 */
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Reto Grieder
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
    2627
    2728
    … …  
    6667  /**
    6768  * RunManager is the basic control object during the game.
    68   * 
     69  *
    6970  * The RunManger class is designed to actually "run" the main part of the
    7071  * game. The Idea is, that you could derive from the RunManager in order
    … …  
    151152    // HUMAN INTERFACE
    152153
    153     using namespace OIS;   
     154    using namespace OIS;
    154155
    155156    LogManager::getSingletonPtr()->logMessage("*** Initializing OIS ***");
    … …  
    212213  /**
    213214  * Method to compute anything between 2 frames.
    214   * 
     215  *
    215216  * Everything that needs to be computed during the games happens right here.
    216217  * The only exception are the listeners (which should only set variables,
    217218  * not actually do something).
    218   * 
     219  *
    219220  * @param time Absolute play time
    220221  * @param deltaTime Time passed since last frame

  • code/branches/FICN/src/orxonox/spaceship_steering.cc

    r392 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#include "Ogre.h"
    229#include "spaceship_steering.h"

  • code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc

    r341 r513  
    55 *   License notice:
    66 *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
    1111 *
    1212 *   This program is distributed in the hope that it will be useful,
    … …  
    1616 *
    1717 *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    2020 *
    2121 *   Author:
    … …  
    6565  }
    6666
    67  
     67
    6868  int AmmunitionDump::store(const Ogre::String &name, int quantity)
    6969  {

  • code/branches/FICN/src/orxonox/weapon/barrel_gun.cc

    r341 r513  
    55 *   License notice:
    66 *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
    1111 *
    1212 *   This program is distributed in the hope that it will be useful,
    … …  
    1616 *
    1717 *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    2020 *
    2121 *   Author:

  • code/branches/FICN/src/orxonox/weapon/base_weapon.cc

    r341 r513  
    55 *   License notice:
    66 *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
    1111 *
    1212 *   This program is distributed in the hope that it will be useful,
    … …  
    1616 *
    1717 *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    2020 *
    2121 *   Author:

  • code/branches/FICN/src/orxonox/weapon/bullet.cc

    r337 r513  
    55 *   License notice:
    66 *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
    1111 *
    1212 *   This program is distributed in the hope that it will be useful,
    … …  
    1616 *
    1717 *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    2020 *
    2121 *   Author:

  • code/branches/FICN/src/orxonox/weapon/bullet_manager.cc

    r337 r513  
    55 *   License notice:
    66 *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
    1111 *
    1212 *   This program is distributed in the hope that it will be useful,
    … …  
    1616 *
    1717 *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    2020 *
    2121 *   Author:

  • code/branches/FICN/src/orxonox/weapon/weapon_station.cc

    r337 r513  
    55 *   License notice:
    66 *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
    1111 *
    1212 *   This program is distributed in the hope that it will be useful,
    … …  
    1616 *
    1717 *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    2020 *
    2121 *   Author:

  • code/branches/FICN/src/particle/ParticleInterface.cc

    r502 r513  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#include "ParticleInterface.h"
    229#include <Ogre.h>
    … …  
    2249        {
    2350                sceneManager_ = sceneManager;
    24                 particleSystem_ = sceneManager->createParticleSystem(name, templateName);       
     51                particleSystem_ = sceneManager->createParticleSystem(name, templateName);
    2552
    2653                //Variabeln einlesen, Emitter1_ ist Referenz-Emitter
    … …  
    5279        }
    5380
    54         void ParticleInterface::dettachFromSceneNode ( void ) 
     81        void ParticleInterface::dettachFromSceneNode ( void )
    5582        {
    5683                sceneNode_->detachObject(particleSystem_);
    … …  
    5885        }
    5986
    60         Real ParticleInterface::getVelocity() 
     87        Real ParticleInterface::getVelocity()
    6188        {
    6289                return velocity_;
Note: See TracChangeset for help on using the changeset viewer.