Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6909


Ignore:
Timestamp:
May 17, 2010, 3:21:51 PM (14 years ago)
Author:
kolibri7
Message:

*fully functional lod implementation
*added file templates/lodinformation.oxt in many maps
*changed some settings in templates/lodinformation.oxt

Location:
code/branches/lod
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r6560 r6909  
    22  include("stats.oxo")
    33  include("hudtemplates3.oxo")
     4  include("templates/lodinformation.oxt")
    45?>
    56
    … …  
    1314 description  = "Just a few tests"
    1415>
     16  <templates>
     17    <Template link=lodtemplate_default />
     18  </templates>
     19
    1520  <Scene
    1621    ambientlight = "0.8, 0.8, 0.8"

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

    r6417 r6909  
    33  include("stats.oxo")
    44  include("templates/spaceship_assff.oxt")
     5  include("templates/lodinformation.oxt")
    56?>
    67
    … …  
    1011 gametype     =  Asteroids
    1112>
     13  <templates>
     14    <Template link=lodtemplate_default />
     15  </templates>
     16
    1217<Scene
    1318 ambientlight = "0.5, 0.5, 0.5"

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

    r6417 r6909  
    55  include("templates/spaceship_assff.oxt")
    66  include("templates/spaceship_pirate.oxt")
     7  include("templates/lodinformation.oxt")
    78?>
    89
    … …  
    1213 gametype     = TeamBaseMatch
    1314>
     15  <templates>
     16    <Template link=lodtemplate_default />
     17  </templates>
     18
    1419  <Scene
    1520   ambientlight = "0.5, 0.5, 0.5"

  • code/branches/lod/data/levels/teamdeathmatch.oxw

    r5781 r6909  
    55  include("templates/spaceship_H2.oxt")
    66  include("templates/spaceship_pirate.oxt")
     7  include("templates/lodinformation.oxt")
    78?>
    89
    … …  
    1213 gametype     = TeamDeathmatch
    1314>
     15  <templates>
     16    <Template link=lodtemplate_default />
     17  </templates>
     18
    1419  <Scene
    1520   ambientlight = "0.7, 0.6, 0.6"

  • code/branches/lod/data/levels/templates/lodinformation.oxt

    r6881 r6909  
    22  <Level>
    33        <lodinformation>
    4           <MeshLodInformation mesh=Carrier.mesh lodQuality=2.4 />
     4          <MeshLodInformation mesh=Carrier.mesh lodQuality=1.8 />
     5          <MeshLodInformation mesh=assff.mesh lodQuality=3 />
    56        </lodinformation>
    67  </Level>

  • code/branches/lod/src/orxonox/Level.cc

    r6877 r6909  
    4949        RegisterObject(Level);
    5050
     51       
    5152        this->registerVariables();
    5253        this->xmlfilename_ = this->getFilename();

  • code/branches/lod/src/orxonox/graphics/Model.cc

    r6877 r6909  
    4949
    5050        this->registerVariables();
     51        //LoD
     52        this->lodLevel_=5;
    5153    }
    5254

  • code/branches/lod/src/orxonox/graphics/Model.h

    r6843 r6909  
    6767           
    6868            //LoD
    69             inline void setLodLevel(unsigned short lodLevel)
     69            inline void setLodLevel(float lodLevel)
    7070                { this->lodLevel_ =  lodLevel; }
    71             inline unsigned short getLodLevel() const
     71            inline float getLodLevel() const
    7272                { return this->lodLevel_; }
    7373            float Model::getBiggestScale(Vector3 scale3d);
    … …  
    7878           
    7979            //LoD
    80             unsigned short lodLevel_;
     80            float lodLevel_;
    8181    };
    8282}
Note: See TracChangeset for help on using the changeset viewer.