Changeset 3344

Show
Ignore:
Timestamp:
01/31/10 14:40:50 (7 months ago)
Author:
Azaezel
Message:

shifts creating the zone into the createScene methodadds setCurrentPhysicsZone, removes setting an uninitialized zone as a default

Location:
Starter/branches/0185_GEN_PHYSICS_REFACTOR_2/Base/BaseCommon
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • Starter/branches/0185_GEN_PHYSICS_REFACTOR_2/Base/BaseCommon/I_BaseGame.hpp

    r3240 r3344  
    118118 
    119119    virtual pPhysicsZone_type getCurrentPhysicsZone() = 0; 
     120    virtual void setCurrentPhysicsZone(pPhysicsZone_type _pPhysicsZone) = 0; 
    120121 
    121122    /// Get the primary action map 

  • Starter/branches/0185_GEN_PHYSICS_REFACTOR_2/Base/BaseCommon/src/BaseGame.cpp

    r3236 r3344  
    375375    } 
    376376 
    377     // Initialize the first world 
    378     m_pPhysicsZone = getPhysicsService()->createZone(); 
    379  
    380     std::cout << "Zone created, checking for scripting support." << std::endl; 
     377    std::cout << "Physics Service created, checking for scripting support." << std::endl; 
    381378 
    382379    // Register the script engine with the Physics Manager 
    … …  
    397394} 
    398395 
     396//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ 
     397void 
     398BaseGame::setCurrentPhysicsZone(BaseGame::pPhysicsZone_type _pPhysicsZone) 
     399{ 
     400    m_pPhysicsZone = _pPhysicsZone; 
     401} 
    399402//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ 
    400403bool 

  • Starter/branches/0185_GEN_PHYSICS_REFACTOR_2/Base/BaseCommon/src/BaseGame.hpp

    r2946 r3344  
    5757    virtual pPhysicsResourceService_type getPhysicsResourceService(); 
    5858    virtual pPhysicsZone_type getCurrentPhysicsZone(); 
     59    virtual void setCurrentPhysicsZone(pPhysicsZone_type _pPhysicsZone); 
    5960 
    6061    virtual Core::I_ActionMap& getActionMap(const std::string& _actionMapName = "default");