Changeset 1362
- Timestamp:
- May 10, 2012, 1:37:00 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/orbital/player.h
r1360 r1362 14 14 public: 15 15 Player(int type) 16 : m_stick(0), 16 : m_type(type), 17 m_stick(0), 17 18 m_ready(false) 18 19 { … … 72 73 if (m_stick && m_stick->GetAxisCount() >= 4) 73 74 { 74 rightleft += 1.f * m_stick->GetAxis( 2);75 updown += -1.f * m_stick->GetAxis( 3);75 rightleft += 1.f * m_stick->GetAxis(m_type * 2 + 0); 76 updown += -1.f * m_stick->GetAxis(m_type * 2 + 1); 76 77 } 77 78 … … 130 131 131 132 private: 133 int m_type; 132 134 Mesh m_ship_mesh, m_option_mesh, m_exhaust_mesh; 133 135 Stick *m_stick; -
trunk/src/camera.cpp
r1353 r1362 86 86 - Input::GetButtonState('f')); 87 87 88 #if 0 88 89 /* Hackish stick support */ 89 90 static Stick *stick = NULL; … … 95 96 updown += -2.f * stick->GetAxis(1) * std::abs(stick->GetAxis(1)); 96 97 } 98 #endif 97 99 98 100 m_position += vec3(rightleft, pgupdown, -updown) * 200.f * seconds;
Note: See TracChangeset
for help on using the changeset viewer.