Changeset 1340


Ignore:
Timestamp:
May 5, 2012, 2:07:01 PM (9 years ago)
Author:
sam
Message:

orbital: tanks! tanks everywhere! OK, time to stop playing around.

Location:
trunk/orbital
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/orbital/orbital.cpp

    r1338 r1340  
    8080    m.SendCommand("fl");
    8181
    82     m_particlesystem = new ParticleSystem();
    83     Ticker::Ref(m_particlesystem);
    84 
    85     m_camera = new Camera(vec3(0, 200, 200),
     82    //m_particlesystem = new ParticleSystem();
     83    //Ticker::Ref(m_particlesystem);
     84
     85    m_camera = new Camera(vec3(0, 300, 300),
    8686                          vec3(0, 0, 0),
    8787                          vec3(0, 1, 0));
    8888    Ticker::Ref(m_camera);
    8989
    90     for (int j = 0; j < 4; j++)
    91     for (int i = 0; i < 4; i++)
     90    for (int j = 0; j < 10; j++)
     91    for (int i = 0; i < 10; i++)
    9292    {
    9393        m_tanks << new Tank();
    94         m_tanks.Last()->m_position = vec3(i * 40.f - 60.f, 0, j * 40.f + 20.f);
    95         m_tanks.Last()->SetTarget(vec3(i * 80.f - 60.f, 0, j * 80.f - 30.f));
     94        m_tanks.Last()->m_position = vec3(i * 40.f - 250.f, 0, j * 40.f - 100.f);
     95        m_tanks.Last()->SetTarget(vec3(i * 80.f - 200.f, 0, j * 80.f - 130.f));
    9696        Ticker::Ref(m_tanks.Last());
    9797    }
     
    177177    for (int i = 0; i < m_tanks.Count(); i++)
    178178        Ticker::Unref(m_tanks[i]);
    179     Ticker::Unref(m_particlesystem);
     179    //Ticker::Unref(m_particlesystem);
    180180    Ticker::Unref(m_camera);
    181181}
  • trunk/orbital/particlesystem.h

    r1338 r1340  
    1717        m_ready(false)
    1818    {
    19         m_mesh.SendCommand("sc.8,.8,.8,1,acg4,2,5,5,1.5,1.5,.1,0,rx15");
     19        m_mesh.SendCommand("sc.8,.8,.8,1,acg8,2,5,5,1.5,1.5,.1,0,rx15");
    2020        m_mesh.SendCommand("t0,-100,-30,fl");
    2121
  • trunk/orbital/tank.h

    r1336 r1340  
    3838        WorldEntity::TickGame(seconds);
    3939
    40 float test = RandF(0.f, +40.f);
     40        float test = RandF(40.f, 70.f);
    4141        m_rotation *= quat::rotate(seconds * test, vec3(0, 1, 0));
    4242        m_velocity = m_rotation.transform(vec3(0, 0, 1));
    43         m_position += seconds * 40.f * m_velocity;
     43        m_position += seconds * 80.f * m_velocity;
    4444
    4545        m_turret_angle += seconds * 50.f;
Note: See TracChangeset for help on using the changeset viewer.