Changeset 280

Show
Ignore:
Timestamp:
08/25/08 15:31:27 (3 months ago)
Author:
zzzzrrr
Message:

newBlaze work

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/newBlaze/blaze/blaze/all.d

    r277 r280  
    2828                blaze.collision.shapes.polygon, 
    2929                blaze.collision.shapes.segment, 
     30                blaze.collision.collision, 
    3031                blaze.dynamics.forces.attractor, 
    3132                blaze.dynamics.forces.bungee1, 
  • branches/newBlaze/blaze/blaze/dynamics/contact/contact.d

    r273 r280  
    3434import blaze.collision.collision; 
    3535import blaze.dynamics.contact.contactNode; 
     36import blaze.dynamics.worldCallbacks; 
    3637import blaze.dynamics.Body; 
    3738 
     
    141142 
    142143    // m_flags 
    143     enum { 
     144    static enum { 
    144145        e_nonSolidFlag  = 0x0001, 
    145146        e_slowFlag      = 0x0002, 
  • branches/newBlaze/blaze/blaze/dynamics/contact/generator/circleContact.d

    r273 r280  
    2323import blaze.collision.collision; 
    2424import blaze.collision.pairwise.collideCircle; 
     25import blaze.dynamics.worldCallbacks; 
    2526import blaze.dynamics.contact.contact; 
    2627 
  • branches/newBlaze/blaze/blaze/dynamics/contact/generator/nullContact.d

    r270 r280  
    2020 
    2121import blaze.collision.collision; 
     22import blaze.dynamics.worldCallbacks; 
    2223 
    2324class NullContact : Contact 
  • branches/newBlaze/blaze/blaze/dynamics/contact/generator/polyCircleContact.d

    r273 r280  
    2323import blaze.collision.shapes.circle; 
    2424import blaze.collision.pairwise.collideCircle; 
     25import blaze.dynamics.worldCallbacks; 
    2526import blaze.collision.collision; 
    2627import blaze.dynamics.contact.contact; 
  • branches/newBlaze/blaze/blaze/dynamics/contact/generator/polyContact.d

    r273 r280  
    2222import blaze.collision.shapes.polygon; 
    2323import blaze.collision.pairwise.collidePoly; 
     24import blaze.dynamics.worldCallbacks; 
    2425import blaze.collision.collision; 
    2526import blaze.dynamics.contact.contact; 
  • branches/newBlaze/blaze/blaze/dynamics/island.d

    r276 r280  
    2525import blaze.dynamics.contact.contact; 
    2626import blaze.dynamics.contact.contactSolver; 
     27import blaze.dynamics.worldCallbacks; 
    2728 
    2829/** 
  • branches/newBlaze/blaze/blaze/dynamics/worldCallbacks.d

    r275 r280  
    6868/// This is called when a body's shape passes outside of the world boundary. 
    6969abstract class BoundaryListener { 
    70 public: 
    7170    /// This is called for each body that leaves the world boundary. 
    7271    /// @warning you can't modify the world inside this callback. 
  • branches/newBlaze/blaze/blaze/world.d

    r277 r280  
    3434import blaze.collision.nbody.bruteForce; 
    3535import blaze.collision.collision; 
    36  
     36import blaze.dynamics.worldCallbacks; 
    3737 
    3838struct TimeStep { 
     
    334334        step.velocityIterations = velocityIterations; 
    335335        step.positionIterations = positionIterations; 
     336 
    336337        if (dt > 0.0f) { 
    337338            step.inv_dt = 1.0f / dt; 
     
    356357            solveTOI(step); 
    357358        } 
    358  
    359         // Draw debug information. 
    360         drawDebugData(); 
    361359 
    362360        m_inv_dt0 = step.inv_dt; 
     
    460458    /// Perform validation of internal data structures. 
    461459    void validate() { 
    462         m_broadPhase.Validate(); 
     460        //m_broadPhase.validate(); 
    463461    } 
    464462 
    465463    /// Get the number of broad-phase proxies. 
    466464    int proxyCount() { 
    467         return m_broadPhase.m_proxyCount; 
     465        //return m_broadPhase.m_proxyCount; 
    468466    } 
    469467 
    470468    /// Get the number of broad-phase pairs. 
    471469    int pairCount() { 
    472         return m_broadPhase.m_pairManager.m_pairCount; 
     470        //return m_broadPhase.m_pairManager.m_pairCount; 
    473471    } 
    474472 
  • branches/newBlaze/blaze/testBlaze.d

    r272 r280  
    1919 
    2020import tango.io.Console; 
    21  
    2221import blaze.all; 
    2322