Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6388 for code/branches


Ignore:
Timestamp:
Dec 21, 2009, 1:28:10 PM (15 years ago)
Author:
rgrieder
Message:

Found some end of line leftover spaces.

Location:
code/branches/presentation2
Files:
62 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation2/README

    r1505 r6388  
    33We are proud to present you Orxonox - the most ferious 3D space shooter ever to exist.
    44
    5 This game is free, if you have paid for this, get your money back! The source code of this game is licensed under the GPL (GNU General Public License). 
     5This game is free, if you have paid for this, get your money back! The source code of this game is licensed under the GPL (GNU General Public License).
    66The game content is licensed under the Creative Commons Attribution-Sharealike 2.5 license. For more information read LICENSE in the same folder you found this file.
    77

  • code/branches/presentation2/data/gui/scripts/AudioMenu.lua

    r6370 r6388  
    4242    table.insert(themeList, "Drum n' Bass")
    4343    for k,v in pairs(themeList) do
    44         item = CEGUI.createListboxTextItem(v)       
     44        item = CEGUI.createListboxTextItem(v)
    4545        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
    4646        CEGUI.toListbox(listboxwindow):addItem(item)

  • code/branches/presentation2/data/gui/scripts/GameplayMenu.lua

    r6363 r6388  
    1919    table.insert(themeList, "Theme 3")
    2020    for k,v in pairs(themeList) do
    21         item = CEGUI.createListboxTextItem(v)       
     21        item = CEGUI.createListboxTextItem(v)
    2222        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
    2323        CEGUI.toCombobox(dropdown):addItem(item)

  • code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua

    r6363 r6388  
    6161    table.insert(resolutionList, "1440 x 900")
    6262    for k,v in pairs(resolutionList) do
    63         item = CEGUI.createListboxTextItem(v)       
     63        item = CEGUI.createListboxTextItem(v)
    6464        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
    6565        CEGUI.toListbox(listboxwindow):addItem(item)

  • code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua

    r6363 r6388  
    2929    table.sort(levelList)
    3030    for k,v in pairs(levelList) do
    31         item = CEGUI.createListboxTextItem(v)       
     31        item = CEGUI.createListboxTextItem(v)
    3232        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
    3333        CEGUI.toListbox(listbox):addItem(item)

  • code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua

    r6363 r6388  
    2929    table.sort(levelList)
    3030    for k,v in pairs(levelList) do
    31         item = CEGUI.createListboxTextItem(v)       
     31        item = CEGUI.createListboxTextItem(v)
    3232        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
    3333        CEGUI.toListbox(listbox):addItem(item)

  • code/branches/presentation2/data/levels/empty_level.oxw

    r6387 r6388  
    1818  >
    1919
    20 <!--Rocket position="-10, 3.5,800" velocity="0,0,-100"> 
     20<!--Rocket position="-10, 3.5,800" velocity="0,0,-100">
    2121      <attached>
    2222        <Model pitch=180 position="0,0,0" scale=1.5 mesh="rocket_test.mesh" >

  • code/branches/presentation2/data/levels/gametype_asteroids.oxw

    r5781 r6388  
    2828?>
    2929
    30     <MovableEntity 
    31      position="<?lua print(math.random()* 15000 - 1000) ?>,<?lua print(math.random() * 12000 - 4000) ?>,<?lua print(math.random() * 12000 - 4000) ?>"        collisionType=dynamic 
     30    <MovableEntity
     31     position="<?lua print(math.random()* 15000 - 1000) ?>,<?lua print(math.random() * 12000 - 4000) ?>,<?lua print(math.random() * 12000 - 4000) ?>"        collisionType=dynamic
    3232     linearDamping=0.8
    3333     angularDamping=0
    34      scale=<?lua print(j * 150)?> 
     34     scale=<?lua print(j * 150)?>
    3535     collisiondamage=1
    3636     enablecollisiondamage=true>

  • code/branches/presentation2/data/levels/old/physicstest.oxw

    r5781 r6388  
    1212
    1313<?lua
    14 for i = 1, 226, 1 
     14for i = 1, 226, 1
    1515do ?>
    1616  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
    17 <?lua 
     17<?lua
    1818end
    1919?>

  • code/branches/presentation2/data/levels/old/tutorial_hs08.oxw

    r5781 r6388  
    1919<!-- Embedded lua code (creates random asteroids) -->
    2020<?lua
    21 for i = 1, 226, 1 
     21for i = 1, 226, 1
    2222do ?>
    2323  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
    24 <?lua 
     24<?lua
    2525end
    2626?>

  • code/branches/presentation2/data/levels/presentation09.oxw

    r6387 r6388  
    2424max = 20
    2525for i = 1, max, 1
    26 do 
     26do
    2727    x = math.sin(i/max*6)*40000
    2828    y = math.cos(i/max*6)*40000
    … …  
    3030    ?>
    3131<?lua
    32 for k = 1, 25, 1 
     32for k = 1, 25, 1
    3333do
    3434j = math.random()
    3535?>
    3636
    37     <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 
     37    <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    3838      <attached>
    3939        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
    … …  
    4343      </collisionShapes> <?lua end ?>
    4444    </MovableEntity>
    45 <?lua 
     45<?lua
    4646end
    4747?>

  • code/branches/presentation2/data/levels/presentation09b.oxw

    r6387 r6388  
    121121
    122122<?lua
    123 for i = 1, 10, 1 
     123for i = 1, 10, 1
    124124do
    125125?>
    … …  
    136136      </controller>
    137137    </SpaceShip>
    138 <?lua 
    139 end
    140 ?>
    141 
    142 <?lua
    143 for i = 1, 12, 1 
     138<?lua
     139end
     140?>
     141
     142<?lua
     143for i = 1, 12, 1
    144144do
    145145?>
    … …  
    156156      </controller>
    157157    </SpaceShip>
    158 <?lua 
     158<?lua
    159159end
    160160?>
    … …  
    173173
    174174<?lua
    175 for i = 1, 12, 1 
     175for i = 1, 12, 1
    176176do
    177177?>
    … …  
    190190      </controller>
    191191    </SpaceShip>
    192 <?lua 
     192<?lua
    193193end
    194194?>
    … …  
    320320
    321321<?lua
    322 for i = 1, 10, 1 
     322for i = 1, 10, 1
    323323do
    324324?>
    … …  
    335335      </controller>
    336336    </SpaceShip>
    337 <?lua 
    338 end
    339 ?>
    340 
    341 <?lua
    342 for i = 1, 200, 1 
     337<?lua
     338end
     339?>
     340
     341<?lua
     342for i = 1, 200, 1
    343343do
    344344x = math.random() * 100  + (i-70) * 100
    … …  
    348348?>
    349349
    350     <MovableEntity position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 - 15) ?>"> 
     350    <MovableEntity position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 - 15) ?>">
    351351      <attached>
    352352        <Model position="0,0,0" scale=<?lua print(s) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
    353353      </attached>
    354354    </MovableEntity>
    355 <?lua 
     355<?lua
    356356end
    357357?>
    … …  
    363363    return table.getn(elements)
    364364end
    365 for i = 1, 150, 1 
     365for i = 1, 150, 1
    366366do
    367367x = math.random() * 750 - 4500
    … …  
    371371?>
    372372
    373     <MovableEntity position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 - 15) ?>"> 
     373    <MovableEntity position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 - 15) ?>">
    374374      <attached>
    375375        <Model position="0,0,0" scale="<?lua print(sizes[e]) ?>" mesh="<?lua print( elements[e]) ?>" />
    376376      </attached>
    377377    </MovableEntity>
    378 <?lua 
     378<?lua
    379379end
    380380?>

  • code/branches/presentation2/data/levels/presentationHS09.oxw

    r6387 r6388  
    126126
    127127<?lua
    128 for i = 1, 10, 1 
     128for i = 1, 10, 1
    129129do
    130130?>
    … …  
    141141      </controller>
    142142    </SpaceShip>
    143 <?lua 
    144 end
    145 ?>
    146 
    147 <?lua
    148 for i = 1, 12, 1 
     143<?lua
     144end
     145?>
     146
     147<?lua
     148for i = 1, 12, 1
    149149do
    150150?>
    … …  
    161161      </controller>
    162162    </SpaceShip>
    163 <?lua 
     163<?lua
    164164end
    165165?>
    … …  
    178178
    179179<?lua
    180 for i = 1, 12, 1 
     180for i = 1, 12, 1
    181181do
    182182?>
    … …  
    195195      </controller>
    196196    </SpaceShip>
    197 <?lua 
     197<?lua
    198198end
    199199?>
    … …  
    325325
    326326<?lua
    327 for i = 1, 10, 1 
     327for i = 1, 10, 1
    328328do
    329329?>
    … …  
    340340      </controller>
    341341    </SpaceShip>
    342 <?lua 
     342<?lua
    343343end
    344344?>
    … …  
    349349        return table.getn(elements)
    350350end
    351 for i = 1, 100, 1 
     351for i = 1, 100, 1
    352352do
    353353x = math.random() * 100  + (i) * 100
    … …  
    358358?>
    359359
    360     <MovableEntity mass=90000 position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>"> 
     360    <MovableEntity mass=90000 position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
    361361      <attached>
    362362        <Model position="0,0,0" scale=<?lua print(s) ?> mesh="<?lua print(elements[e])?>" />
    363363      </attached>
    364364    </MovableEntity>
    365 <?lua 
    366 end
    367 ?>
    368 
    369 <?lua
    370 for i = 1, 100, 1 
     365<?lua
     366end
     367?>
     368
     369<?lua
     370for i = 1, 100, 1
    371371do
    372372x = math.random() * 200 + i*200
    … …  
    378378<!-- <Billboard material="Test/Fog" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>"  color="1, 1, 1, 0.01" scale="20" />
    379379-->
    380 <?lua 
     380<?lua
    381381end
    382382?>
    … …  
    388388    return table.getn(elements)
    389389end
    390 for i = 1, 150, 1 
     390for i = 1, 150, 1
    391391do
    392392x = math.random() * 750 - 4500
    … …  
    396396?>
    397397
    398     <MovableEntity mass=90000 position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30- 15) ?>"> 
     398    <MovableEntity mass=90000 position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30- 15) ?>">
    399399      <attached>
    400400        <Model position="0,0,0" scale="<?lua print(sizes[e]) ?>" mesh="<?lua print( elements[e]) ?>" />
    401401      </attached>
    402402    </MovableEntity>
    403 <?lua 
     403<?lua
    404404end
    405405?>
    406406<!--
    407407    <Planet position="1000,0,0" mass=900000 scale=1000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
    408 --> 
     408-->
    409409</Scene>
    410410</Level>

  • code/branches/presentation2/data/levels/presentation_dm.oxw

    r6387 r6388  
    1818
    1919<?lua
    20 for i = 1, 10, 1 
     20for i = 1, 10, 1
    2121do ?>
    2222    <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    23 <?lua 
     23<?lua
    2424end
    2525?>
    … …  
    3535
    3636<?lua
    37 for i = 1, 100, 1 
     37for i = 1, 100, 1
    3838do
    3939j = math.random()
    4040?>
    4141
    42     <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 
     42    <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    4343      <attached>
    4444        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
    … …  
    4848      </collisionShapes>
    4949    </MovableEntity>
    50 <?lua 
     50<?lua
    5151end
    5252?>

  • code/branches/presentation2/data/levels/questsystem2.oxw

    r6387 r6388  
    3737                    <QuestDescription title="The super Hint.3" description="Be proud of yourself.3" />
    3838                </QuestHint>
    39             </hints>   
     39            </hints>
    4040            <subquests>
    4141                <GlobalQuest id="e17f5245-f95b-44a8-b6cf-402274435ed4">
    … …  
    215215max = 20
    216216for i = 1, max, 1
    217 do 
     217do
    218218    x = math.sin(i/max*6)*40000
    219219    y = math.cos(i/max*6)*40000
    … …  
    221221    ?>
    222222<?lua
    223 for k = 1, 25, 1 
     223for k = 1, 25, 1
    224224do
    225225j = math.random()
    226226?>
    227227
    228     <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 
     228    <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    229229      <attached>
    230230        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
    … …  
    234234      </collisionShapes> <?lua end ?>
    235235    </MovableEntity>
    236 <?lua 
     236<?lua
    237237end
    238238?>

  • code/branches/presentation2/data/levels/teambasematchlevel.oxw

    r5781 r6388  
    4141        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
    4242<?lua
    43 for i = 1, 10, 1 
     43for i = 1, 10, 1
    4444do ?>
    4545        <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
    4646          <events><spawn><EventListener event="base 1" /></spawn></events>
    4747        </ParticleSpawner>
    48 <?lua 
     48<?lua
    4949end
    5050?>
    … …  
    7878        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
    7979<?lua
    80 for i = 1, 10, 1 
     80for i = 1, 10, 1
    8181do ?>
    8282        <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
    8383          <events><spawn><EventListener event="base 2" /></spawn></events>
    8484        </ParticleSpawner>
    85 <?lua 
     85<?lua
    8686end
    8787?>
    … …  
    115115        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
    116116<?lua
    117 for i = 1, 10, 1 
     117for i = 1, 10, 1
    118118do ?>
    119119        <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
    120120          <events><spawn><EventListener event="base 3" /></spawn></events>
    121121        </ParticleSpawner>
    122 <?lua 
     122<?lua
    123123end
    124124?>
    … …  
    151151        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
    152152<?lua
    153 for i = 1, 10, 1 
     153for i = 1, 10, 1
    154154do ?>
    155155        <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
    156156          <events><spawn><EventListener event="base 4" /></spawn></events>
    157157        </ParticleSpawner>
    158 <?lua 
     158<?lua
    159159end
    160160?>
    … …  
    188188        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
    189189<?lua
    190 for i = 1, 10, 1 
     190for i = 1, 10, 1
    191191do ?>
    192192        <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
    193193          <events><spawn><EventListener event="base 5" /></spawn></events>
    194194        </ParticleSpawner>
    195 <?lua 
     195<?lua
    196196end
    197197?>

  • code/branches/presentation2/data/levels/test_ghost.oxw

    r6387 r6388  
    2424max = 20
    2525for i = 1, max, 1
    26 do 
     26do
    2727    x = math.sin(i/max*6)*40000
    2828    y = math.cos(i/max*6)*40000
    … …  
    3030    ?>
    3131<?lua
    32 for k = 1, 25, 1 
     32for k = 1, 25, 1
    3333do
    3434j = math.random()
    3535?>
    3636
    37     <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 
     37    <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    3838      <attached>
    3939        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
    … …  
    4343      </collisionShapes> <?lua end ?>
    4444    </MovableEntity>
    45 <?lua 
     45<?lua
    4646end
    4747?>

  • code/branches/presentation2/data/overlays/OrxonoxLoading.overlay

    r5781 r6388  
    1111      material Orxonox/LoadingScreenSample
    1212   }
    13 } 
     13}

  • code/branches/presentation2/doc/CMakeLists.txt

    r2710 r6388  
    1 # Add a "doc" target with CMake build system. 
     1# Add a "doc" target with CMake build system.
    22# And configure doxy.config.in to doxy.config
    33#

  • code/branches/presentation2/doc/api/CMakeLists.txt

    r6387 r6388  
    1 # Add a "doc" target with CMake build system. 
     1# Add a "doc" target with CMake build system.
    22# And configure doxy.config.in to doxy.config
    33#
    44# target "doc" allows building the documentation with doxygen/dot on WIN32 and Linux
    5 # Creates .chm windows help file if MS HTML help workshop 
     5# Creates .chm windows help file if MS HTML help workshop
    66# (available from http://msdn.microsoft.com/workshop/author/htmlhelp)
    77# is installed with its DLLs in PATH.
    … …  
    1212# must be in path.
    1313#
    14 # Note about Visual Studio Projects: 
     14# Note about Visual Studio Projects:
    1515# MSVS hast its own path environment which may differ from the shell.
    1616# See "Menu Tools/Options/Projects/VC++ Directories" in VS 7.1
    … …  
    6262  IF(WIN32)
    6363    FIND_PACKAGE(HTMLHelp)
    64     IF(HTML_HELP_COMPILER)     
     64    IF(HTML_HELP_COMPILER)
    6565      SET(TMP ${DOXY_OUTPUT_DIR}/html/index.hhp)
    6666      STRING(REGEX REPLACE "/" "\\\\" HHP_FILE ${TMP})
    … …  
    7070      SET_TARGET_PROPERTIES(doc doc_chm PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
    7171    ENDIF(HTML_HELP_COMPILER)
    72   ENDIF (WIN32) 
     72  ENDIF (WIN32)
    7373
    7474

  • code/branches/presentation2/src/libraries/core/ConfigValueIncludes.h

    r6368 r6388  
    174174*/
    175175#define ModifyConfigValue(varname, modifier, ...) \
    176     ModifyConfigValueGeneric(this, &varname, #varname, modifier, __VA_ARGS__) 
     176    ModifyConfigValueGeneric(this, &varname, #varname, modifier, __VA_ARGS__)
    177177
    178178#endif /* _ConfigValueIncludes_H__ */

  • code/branches/presentation2/src/libraries/core/EventIncludes.h

    r6387 r6388  
    8282/**
    8383    @brief This macro is needed to fire an event with this name. The event name must previously be declared with @ref CreateEventName.
    84 */   
     84*/
    8585#define FireEventName(classname, name) \
    8686    eventname##classname##name

  • code/branches/presentation2/src/libraries/core/GUIManager.h

    r6371 r6388  
    6767        ~GUIManager();
    6868
    69         void preUpdate(const Clock& time); 
     69        void preUpdate(const Clock& time);
    7070
    7171        static void showGUI(const std::string& name, bool hidePrevious=false, bool showCursor=true);

  • code/branches/presentation2/src/libraries/core/MemoryArchive.cc

    r5940 r6388  
    6464    }
    6565
    66     void MemoryArchive::findFiles(const String& pattern, bool bRecursive, 
     66    void MemoryArchive::findFiles(const String& pattern, bool bRecursive,
    6767        bool bDirs, StringVector* simpleList, FileInfoList* detailList)
    6868    {
    … …  
    118118    }
    119119
    120     FileInfoListPtr MemoryArchive::findFileInfo(const String& pattern, 
     120    FileInfoListPtr MemoryArchive::findFileInfo(const String& pattern,
    121121        bool recursive, bool dirs)
    122122    {

  • code/branches/presentation2/src/libraries/core/MemoryArchive.h

    r5781 r6388  
    7979
    8080    private:
    81         void findFiles(const Ogre::String& pattern, bool bRecursive, 
     81        void findFiles(const Ogre::String& pattern, bool bRecursive,
    8282            bool bDirs, Ogre::StringVector* simpleList, Ogre::FileInfoList* detailList);
    8383

  • code/branches/presentation2/src/libraries/core/Resource.h

    r6203 r6388  
    7373            must provide a fully qualified name to this method.
    7474        @param groupName
    75             The name of the resource group; this determines which 
    76             locations are searched. 
     75            The name of the resource group; this determines which
     76            locations are searched.
    7777        @param searchGroupsIfNotFound
    78             If true, if the resource is not found in 
     78            If true, if the resource is not found in
    7979            the group specified, other groups will be searched.
    8080        @return
    … …  
    9696        @brief
    9797            Open all resources matching a given pattern (which can contain
    98             the character '*' as a wildcard), and return a collection of 
     98            the character '*' as a wildcard), and return a collection of
    9999            DataStream objects on them.
    100100        @param pattern
    … …  
    112112
    113113        /**
    114             Find out if the named file exists in a group. 
     114            Find out if the named file exists in a group.
    115115        @param filename
    116116            Fully qualified name of the file to test for

  • code/branches/presentation2/src/libraries/core/input/InputCommands.h

    r5781 r6388  
    7171    @brief
    7272        Executes a simple command with no additional paramters.
    73     @return 
     73    @return
    7474        True if command execution was successful, false otherwise.
    7575    */

  • code/branches/presentation2/src/libraries/core/input/InputManager.cc

    r6183 r6388  
    508508        if (mouseStates.empty())
    509509            requestedMode = MouseMode::Nonexclusive;
    510         else 
     510        else
    511511            requestedMode = mouseStates.front()->getMouseMode();
    512512        if (requestedMode != MouseMode::Dontcare && mouseMode_ != requestedMode)
    … …  
    554554    }
    555555
    556     //! Gets called by WindowEventListener upon focus change --> clear buffers 
     556    //! Gets called by WindowEventListener upon focus change --> clear buffers
    557557    void InputManager::windowFocusChanged()
    558558    {

  • code/branches/presentation2/src/libraries/core/input/JoyStickQuantityListener.h

    r5781 r6388  
    2929/**
    3030@file
    31 @brief 
     31@brief
    3232*/
    3333

  • code/branches/presentation2/src/libraries/core/input/KeyBinder.cc

    r6387 r6388  
    285285
    286286     void KeyBinder::addButtonToCommand(std::string command, Button* button)
    287      { 
     287     {
    288288        std::ostringstream stream;
    289289        stream << button->groupName_  << "." << button->name_;

  • code/branches/presentation2/src/libraries/network/ClientConnection.cc

    r6387 r6388  
    148148
    149149  uint32_t ClientConnection::getRTT()
    150   { 
     150  {
    151151    assert(server_);
    152152    return server_->roundTripTime;

  • code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc

    r6387 r6388  
    3636{
    3737    ClientConnectionListener::ClientConnectionListener()
    38     { 
    39         RegisterRootObject(ClientConnectionListener); 
     38    {
     39        RegisterRootObject(ClientConnectionListener);
    4040    }
    4141

  • code/branches/presentation2/src/libraries/network/FunctionCallManager.cc

    r6387 r6388  
    3737
    3838void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID)
    39 { 
    40   if(clientMap_.find(clientID)==clientMap_.end()) 
     39{
     40  if(clientMap_.find(clientID)==clientMap_.end())
    4141  {
    42     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    43     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    44   } 
     42    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     43    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     44  }
    4545  FunctionCallManager::clientMap_[clientID]->addCallStatic(functionID);
    4646}
    4747void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1)
    48 { 
    49   if(clientMap_.find(clientID)==clientMap_.end()) 
     48{
     49  if(clientMap_.find(clientID)==clientMap_.end())
    5050  {
    51     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    52     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    53   } 
     51    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     52    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     53  }
    5454  FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1);
    5555}
    5656void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2)
    57 { 
    58   if(clientMap_.find(clientID)==clientMap_.end()) 
     57{
     58  if(clientMap_.find(clientID)==clientMap_.end())
    5959  {
    60     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    61     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    62   } 
     60    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     61    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     62  }
    6363  FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2);
    6464}
    6565void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
    66 { 
    67   if(clientMap_.find(clientID)==clientMap_.end()) 
     66{
     67  if(clientMap_.find(clientID)==clientMap_.end())
    6868  {
    69     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    70     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    71   } 
     69    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     70    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     71  }
    7272  FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2, &mt3);
    7373}
    7474void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
    75 { 
    76   if(clientMap_.find(clientID)==clientMap_.end()) 
     75{
     76  if(clientMap_.find(clientID)==clientMap_.end())
    7777  {
    78     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    79     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    80   } 
     78    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     79    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     80  }
    8181  FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2, &mt3, &mt4);
    8282}
    8383void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
    84 { 
    85   if(clientMap_.find(clientID)==clientMap_.end()) 
     84{
     85  if(clientMap_.find(clientID)==clientMap_.end())
    8686  {
    87     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    88     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    89   } 
     87    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     88    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     89  }
    9090  FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2, &mt3, &mt4, &mt5);
    9191}
    … …  
    9595
    9696void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID)
    97 { 
    98   if(clientMap_.find(clientID)==clientMap_.end()) 
     97{
     98  if(clientMap_.find(clientID)==clientMap_.end())
    9999  {
    100     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    101     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    102   } 
     100    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     101    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     102  }
    103103  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID);
    104104}
    105105void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1)
    106 { 
    107   if(clientMap_.find(clientID)==clientMap_.end()) 
     106{
     107  if(clientMap_.find(clientID)==clientMap_.end())
    108108  {
    109     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    110     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    111   } 
     109    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     110    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     111  }
    112112  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1);
    113113}
    114114void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2)
    115 { 
    116   if(clientMap_.find(clientID)==clientMap_.end()) 
     115{
     116  if(clientMap_.find(clientID)==clientMap_.end())
    117117  {
    118     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    119     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    120   } 
     118    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     119    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     120  }
    121121  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2);
    122122}
    123123void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
    124 { 
    125   if(clientMap_.find(clientID)==clientMap_.end()) 
     124{
     125  if(clientMap_.find(clientID)==clientMap_.end())
    126126  {
    127     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    128     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    129   } 
     127    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     128    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     129  }
    130130  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2, &mt3);
    131131}
    132132void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
    133 { 
    134   if(clientMap_.find(clientID)==clientMap_.end()) 
     133{
     134  if(clientMap_.find(clientID)==clientMap_.end())
    135135  {
    136     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    137     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    138   } 
     136    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     137    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     138  }
    139139  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2, &mt3, &mt4);
    140140}
    141141void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
    142 { 
    143   if(clientMap_.find(clientID)==clientMap_.end()) 
     142{
     143  if(clientMap_.find(clientID)==clientMap_.end())
    144144  {
    145     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    146     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    147   } 
     145    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     146    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     147  }
    148148  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2, &mt3, &mt4, &mt5);
    149149}

  • code/branches/presentation2/src/libraries/network/GamestateManager.cc

    r6387 r6388  
    159159      clientGamestates.push(0);
    160160      finishGamestate( cid, &clientGamestates.back(), client, reference );
    161       //FunctorMember<GamestateManager>* functor = 
     161      //FunctorMember<GamestateManager>* functor =
    162162//       ExecutorMember<GamestateManager>* executor = createExecutor( createFunctor(&GamestateManager::finishGamestate, this) );
    163163//       executor->setDefaultValues( cid, &clientGamestates.back(), client, reference );

  • code/branches/presentation2/src/libraries/network/NetworkFunction.h

    r6387 r6388  
    8383    {
    8484        std::map<std::string, NetworkFunctionBase*>& map = NetworkFunctionBase::getNameMap();
    85         assert( map.find(name)!=map.end() ); 
     85        assert( map.find(name)!=map.end() );
    8686        map[name]->setNetworkID(id);
    8787    }
    … …  
    139139    static NetworkMemberFunctionBase* getFunction( const NetworkFunctionPointer& p ){ assert( functorMap_.find(p) != functorMap_.end() ); return functorMap_[p]; }
    140140
    141     // 
     141    //
    142142    virtual void call(uint32_t objectID)=0;
    143143    virtual void call(uint32_t objectID, const MultiType& mt1)=0;
    … …  
    159159
    160160    inline void call(uint32_t objectID)
    161     { 
     161    {
    162162      if ( Synchronisable::getSynchronisable(objectID)!=0 )
    163163        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)));
    164164    }
    165165    inline void call(uint32_t objectID, const MultiType& mt1)
    166     { 
     166    {
    167167      if ( Synchronisable::getSynchronisable(objectID)!=0 )
    168168        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1);
    169169    }
    170170    inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2)
    171     { 
     171    {
    172172      if ( Synchronisable::getSynchronisable(objectID)!=0 )
    173173        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2);
    174174    }
    175175    inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
    176     { 
     176    {
    177177      if ( Synchronisable::getSynchronisable(objectID)!=0 )
    178178        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3);
    179179    }
    180180    inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
    181     { 
     181    {
    182182      if ( Synchronisable::getSynchronisable(objectID)!=0 )
    183183        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4);
    184184    }
    185185    inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
    186     { 
     186    {
    187187      if ( Synchronisable::getSynchronisable(objectID)!=0 )
    188188        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4, mt5);

  • code/branches/presentation2/src/libraries/network/Server.cc

    r6387 r6388  
    162162
    163163  /**
    164    * @brief: returns ping time to client in milliseconds 
     164   * @brief: returns ping time to client in milliseconds
    165165   */
    166166  unsigned int Server::getRTT(unsigned int clientID){

  • code/branches/presentation2/src/libraries/network/TrafficControl.h

    r6387 r6388  
    105105    *evaluates Data given (list) and produces result(->Data to be updated)
    106106    */
    107     void evaluateList(unsigned int clientID, std::list<obj>& list);//done   
     107    void evaluateList(unsigned int clientID, std::list<obj>& list);//done
    108108    void ack(unsigned int clientID, unsigned int gamestateID);  // this function gets called when the server receives an ack from the client
    109109
    … …  
    121121    /**
    122122    *is being used by GSManager from Server:
    123     *list contains: ObjIds, CreatorIds, Size (in this order) from Client XY 
     123    *list contains: ObjIds, CreatorIds, Size (in this order) from Client XY
    124124    *Elements of list are accessed by *list[i]
    125125    *Elements of struct i are therefore: *list[i].objID

  • code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc

    r6387 r6388  
    4848FunctionIDs::FunctionIDs( ) : Packet(){
    4949  std::string functionname;
    50   unsigned int nrOfFunctions=0; 
     50  unsigned int nrOfFunctions=0;
    5151  unsigned int packetSize=2*sizeof(uint32_t); //space for the packetID and for the nroffunctions
    5252  uint32_t networkID;

  • code/branches/presentation2/src/libraries/network/packet/Gamestate.cc

    r6387 r6388  
    437437//   uint8_t *ndata = new uint8_t[dest_length*sizeof(uint8_t)+GamestateHeader::getSize()];
    438438//   uint8_t *dest = ndata + GamestateHeader::getSize();
    439 //   
    440 //   
     439//
     440//
    441441//   // LOOP-UNROLLED DIFFING
    442442//   uint32_t *dest32 = (uint32_t*)dest, *base32 = (uint32_t*)basep, *gs32 = (uint32_t*)gs;
    … …  
    465465//     }
    466466//   }
    467 // 
     467//
    468468//   Gamestate *g = new Gamestate(ndata, getClientID());
    469469//   *(g->header_) = *header_;

  • code/branches/presentation2/src/libraries/network/packet/Packet.cc

    r6387 r6388  
    102102    Destroys a packet completely.
    103103
    104     That also means destroying the ENetPacket if one exists. There 
     104    That also means destroying the ENetPacket if one exists. There
    105105*/
    106106Packet::~Packet(){

  • code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc

    r6387 r6388  
    3636
    3737  void NetworkCallbackManager::registerCallback(NetworkCallbackBase *cb)
    38   { 
    39     callbackSet_.insert(cb); 
     38  {
     39    callbackSet_.insert(cb);
    4040  }
    4141  void NetworkCallbackManager::deleteCallback(NetworkCallbackBase *cb)

  • code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h

    r6387 r6388  
    6666
    6767  /**
    68    * @brief: stores information about a Synchronisable 
    69    * 
     68   * @brief: stores information about a Synchronisable
     69   *
    7070   * This class stores the information about a Synchronisable (objectID_, classID_, creatorID_, dataSize)
    7171   * in an emulated bitset.

  • code/branches/presentation2/src/libraries/util/Serialise.h

    r6387 r6388  
    616616    template <> inline uint32_t returnSize( const mbool& variable )
    617617    {
    618         return returnSize( (unsigned char&)((mbool&)variable).getMemory() ); 
     618        return returnSize( (unsigned char&)((mbool&)variable).getMemory() );
    619619    }
    620620

  • code/branches/presentation2/src/modules/objects/collisionshapes/BoxCollisionShape.cc

    r5781 r6388  
    6666        XMLPortParam(BoxCollisionShape, "halfExtents",  setHalfExtents,  getHalfExtents,  xmlelement, mode);
    6767        XMLPortParamLoadOnly(BoxCollisionShape, "width",  setWidth,  xmlelement, mode);
    68         XMLPortParamLoadOnly(BoxCollisionShape, "height", setHeight, xmlelement, mode);   
    69         XMLPortParamLoadOnly(BoxCollisionShape, "length", setLength, xmlelement, mode);   
     68        XMLPortParamLoadOnly(BoxCollisionShape, "height", setHeight, xmlelement, mode);
     69        XMLPortParamLoadOnly(BoxCollisionShape, "length", setLength, xmlelement, mode);
    7070    }
    7171

  • code/branches/presentation2/src/modules/objects/collisionshapes/ConeCollisionShape.cc

    r5781 r6388  
    6666
    6767        XMLPortParam(ConeCollisionShape, "radius", setRadius, getRadius, xmlelement, mode);
    68         XMLPortParam(ConeCollisionShape, "height", setHeight, getHeight, xmlelement, mode);   
     68        XMLPortParam(ConeCollisionShape, "height", setHeight, getHeight, xmlelement, mode);
    6969    }
    7070

  • code/branches/presentation2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc

    r5781 r6388  
    6767
    6868        XMLPortParam(PlaneCollisionShape, "normal", setNormal, getNormal, xmlelement, mode);
    69         XMLPortParam(PlaneCollisionShape, "offset", setOffset, getOffset, xmlelement, mode);   
     69        XMLPortParam(PlaneCollisionShape, "offset", setOffset, getOffset, xmlelement, mode);
    7070    }
    7171

  • code/branches/presentation2/src/modules/questsystem/QuestGUI.cc

    r6387 r6388  
    268268        index = tempIndex; //!< Reset the index to the original level.
    269269
    270         return index;       
     270        return index;
    271271    }
    272272

  • code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc

    r6387 r6388  
    7171    QuestGUINode::QuestGUINode(QuestGUI* gui, QuestGUINode* parent, QuestItem* item, int depth, int index)
    7272    {
    73         this->initialize();   
     73        this->initialize();
    7474
    7575        this->gui_ = gui;
    … …  
    154154
    155155        if(this->details_ == NULL) //!< If the details window was not already created.
    156         { 
     156        {
    157157            std::ostringstream stream;
    158158
    … …  
    297297    */
    298298    bool QuestGUINode::closeDetails(const CEGUI::EventArgs& e)
    299     {       
     299    {
    300300        //CEGUI::Window* window = this->gui_->getRootWindow();
    301301        CEGUI::Window* window = this->gui_->getWindowManager()->getWindow("orxonox/QuestGUI/Background");

  • code/branches/presentation2/src/modules/questsystem/QuestGUINode.h

    r6387 r6388  
    5454            /**
    5555            @brief Retreive the window of this node.
    56             @return The CEGUI Window of this node. 
     56            @return The CEGUI Window of this node.
    5757            */
    5858            inline CEGUI::Window* getWindow(void)

  • code/branches/presentation2/src/modules/questsystem/QuestListener.cc

    r6387 r6388  
    193193        Returns the questId of the Quest the QuestListener reacts to.
    194194    */
    195     const std::string & QuestListener::getQuestId(void)   
     195    const std::string & QuestListener::getQuestId(void)
    196196    {
    197197        return this->quest_->getId();

  • code/branches/presentation2/src/modules/questsystem/QuestManager.h

    r5929 r6388  
    7272            static QuestManager& getInstance() { return Singleton<QuestManager>::getInstance(); } // tolua_export
    7373
    74             //! Retreive the main window for the GUI. 
     74            //! Retreive the main window for the GUI.
    7575            CEGUI::Window* getQuestGUI(const std::string & guiName); // tolua_export
    7676

  • code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc

    r6387 r6388  
    5454    void LightningGunProjectile::setMaterial(const std::string& material)
    5555    {
    56         this->materialBase_ = material;   
     56        this->materialBase_ = material;
    5757
    5858        BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_));

  • code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc

    r6307 r6388  
    5757
    5858    void LightningGun::fire()
    59     {       
     59    {
    6060        LightningGunProjectile* projectile = new LightningGunProjectile(this);
    6161        projectile->setMaterial("Flares/LightningBall_");

  • code/branches/presentation2/src/orxonox/controllers/HumanController.h

    r6356 r6388  
    3838namespace orxonox
    3939{
    40     class _OrxonoxExport HumanController 
     40    class _OrxonoxExport HumanController
    4141// tolua_end
    4242        : public Controller, public Tickable

  • code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc

    r6387 r6388  
    248248                    HumanController::moveFrontBack(Vector2(1, 0));
    249249                else
    250                     HumanController::moveFrontBack(Vector2(this->acceleration_, 0)); 
     250                    HumanController::moveFrontBack(Vector2(this->acceleration_, 0));
    251251                this->accelerating_ = false;
    252252                //HumanController::moveFrontBack(Vector2(clamp(this->acceleration_ + this->currentAcceleration_, 0.0f, 1.0f), 0));

  • code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h

    r6310 r6388  
    177177        inline OverlayGroup* getOverlayGroup() const
    178178            { return this->group_; }
    179         virtual void changedOverlayGroup() 
     179        virtual void changedOverlayGroup()
    180180            { this->changedVisibility(); }
    181181

  • code/branches/presentation2/src/orxonox/pickup/UsableItem.cc

    r6387 r6388  
    4141        @param creator Pointer to the object which created this item.
    4242    */
    43     UsableItem::UsableItem(BaseObject* creator) : BaseItem(creator) 
     43    UsableItem::UsableItem(BaseObject* creator) : BaseItem(creator)
    4444    {
    4545        RegisterObject(UsableItem);

  • code/branches/presentation2/src/orxonox/sound/AmbientSound.cc

    r6387 r6388  
    118118                this->setSource(path);
    119119            else
    120                 COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;       
     120                COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;
    121121        }
    122122    }
    … …  
    134134        if (this->isActive())
    135135            this->play();
    136         else 
     136        else
    137137            this->stop();
    138138    }

  • code/branches/presentation2/src/orxonox/sound/BaseSound.cc

    r6387 r6388  
    177177            pitch = pitch > 2 ? 2 : pitch;
    178178            pitch = pitch < 0.5 ? 0.5 : pitch;
    179         }       
     179        }
    180180        this->pitch_ = pitch;
    181181        if (alIsSource(this->audioSource_))
    … …  
    224224        if (alIsSource(this->audioSource_)) // already playing or paused
    225225        {
    226             // Set new buffer 
     226            // Set new buffer
    227227            alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
    228228            if (ALuint error = alGetError())

  • code/branches/presentation2/src/orxonox/sound/SoundManager.cc

    r6387 r6388  
    254254    }
    255255
    256     float SoundManager::getVolume(SoundType::Value type) 
     256    float SoundManager::getVolume(SoundType::Value type)
    257257    {
    258258        if (type < 0 || type > SoundType::Effects)
    … …  
    261261    }
    262262
    263     float SoundManager::getRealVolume(SoundType::Value type) 
     263    float SoundManager::getRealVolume(SoundType::Value type)
    264264    {
    265265        if (type != SoundType::Music && type != SoundType::Effects)
    … …  
    339339            }
    340340
    341             if (!this->ambientSounds_.empty()) 
     341            if (!this->ambientSounds_.empty())
    342342            {
    343343                this->fadeOut(ambientSounds_.front().first);
    … …  
    354354            return;
    355355
    356         if (this->ambientSounds_.front().first == oldAmbient) 
     356        if (this->ambientSounds_.front().first == oldAmbient)
    357357        {
    358358            this->fadeOut(oldAmbient);

  • code/branches/presentation2/src/orxonox/sound/WorldSound.cc

    r6387 r6388  
    110110    }
    111111
    112     void WorldSound::changedActivity() 
     112    void WorldSound::changedActivity()
    113113    {
    114114        SUPER(WorldSound, changedActivity);
    115115        if (this->isActive())
    116116            this->play();
    117         else 
     117        else
    118118            this->stop();
    119119    }

  • code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h

    r5929 r6388  
    7070
    7171            inline void setEnableCollisionDamage(bool c)
    72             { 
    73                 this->enableCollisionDamage_ = c; 
     72            {
     73                this->enableCollisionDamage_ = c;
    7474                this->enableCollisionCallback();
    75             } 
     75            }
    7676
    7777            inline bool getEnableCollisionDamage()
Note: See TracChangeset for help on using the changeset viewer.