Changeset 1300
- Timestamp:
- Apr 26, 2012, 8:20:48 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/monsterz/board.cpp
r1198 r1300 131 131 Ticker::Ref(data->score); 132 132 133 position = ivec3(24, 72, 1);134 bbox[0] =position;135 bbox[1] =bbox[0] + vec3(384, 384, 0);133 m_position = ivec3(24, 72, 1); 134 m_bbox[0] = m_position; 135 m_bbox[1] = m_bbox[0] + vec3(384, 384, 0); 136 136 137 137 Input::TrackMouse(this); … … 163 163 case BoardData::HUNT_IDLE: 164 164 /* Should we start dragging something? */ 165 if (buttons[0] && !data->oldbuttons[0] && m ousepos.x != -1)166 { 167 ivec2 cell = m ousepos / data->size;165 if (buttons[0] && !data->oldbuttons[0] && m_mousepos.x != -1) 166 { 167 ivec2 cell = m_mousepos / data->size; 168 168 if (data->pairs[cell.x][cell.y].piece->Grab(ivec2(0, 0))) 169 169 { 170 170 Sampler::PlaySample(data->click); 171 171 data->grabbed = data->pairs[cell.x][cell.y]; 172 data->src_cell = m ousepos / data->size;172 data->src_cell = m_mousepos / data->size; 173 173 data->dst_cell = ivec2(-1); 174 174 data->state = BoardData::HUNT_GRAB; … … 180 180 181 181 case BoardData::HUNT_GRAB: 182 if (m ousepos.x != -1)182 if (m_mousepos.x != -1) 183 183 { 184 184 /* Mouse is still in the window, keep grabbing */ 185 data->grabbed.piece->Grab(m ousepos - data->oldmouse);185 data->grabbed.piece->Grab(m_mousepos - data->oldmouse); 186 186 ivec2 cur_pos = data->grabbed.piece->GetPos() 187 187 + data->grabbed.piece->GetOffset(); … … 221 221 222 222 /* Mouse released, or exited window, or dragged too far. */ 223 if (!buttons[0] || m ousepos.x == -1 ||223 if (!buttons[0] || m_mousepos.x == -1 || 224 224 sqlen(data->src_cell * data->size - data->grabbed.piece->GetPos() 225 225 - data->grabbed.piece->GetOffset()) > 100 * 100) … … 246 246 } 247 247 248 data->oldmouse = m ousepos;248 data->oldmouse = m_mousepos; 249 249 data->oldbuttons = buttons; 250 250 } … … 254 254 Entity::TickDraw(deltams); 255 255 256 Scene::GetDefault()->AddTile(data->board, 0, position, 0, vec2(1.0f));256 Scene::GetDefault()->AddTile(data->board, 0, m_position, 0, vec2(1.0f)); 257 257 Scene::GetDefault()->AddTile(data->screen, 0, ivec3(0, 0, 10), 0, vec2(1.0f)); 258 258 -
trunk/monsterz/interface.cpp
r1198 r1300 60 60 data->state = InterfaceData::INIT; 61 61 62 position = ivec3(0, 0, 1);63 bbox[0] =position;64 bbox[1] =bbox[0] + vec3(640, 480, 0);62 m_position = ivec3(0, 0, 1); 63 m_bbox[0] = m_position; 64 m_bbox[1] = m_bbox[0] + vec3(640, 480, 0); 65 65 } 66 66 -
trunk/monsterz/title.cpp
r1198 r1300 136 136 { 137 137 /* FIXME: this should not be hardcoded */ 138 position = ivec3(0, 0, 1);139 bbox[0] =position;140 bbox[1] =bbox[0] + vec3(640, 480, 0);138 m_position = ivec3(0, 0, 1); 139 m_bbox[0] = m_position; 140 m_bbox[1] = m_bbox[0] + vec3(640, 480, 0); 141 141 142 142 srand(rand() ^ time(NULL)); … … 144 144 data->logo = Tiler::Register(PNG_TITLE_LOGO, ivec2(380, 181), ivec2(0)); 145 145 data->logo_sprite = new Sprite(data->logo, 0); 146 data->logo_sprite-> position = vec3(640 / 2 - 380 / 2, 250, 10);146 data->logo_sprite->m_position = vec3(640 / 2 - 380 / 2, 250, 10); 147 147 Ticker::Ref(data->logo_sprite); 148 148 149 149 data->ground = Tiler::Register(PNG_TITLE_GROUND, ivec2(384, 80), ivec2(0)); 150 data->ground_pos = ivec2(( bbox[1] -bbox[0]).xy / vec2(2, 4))150 data->ground_pos = ivec2((m_bbox[1] - m_bbox[0]).xy / vec2(2, 4)) 151 151 - ivec2(192, 80); 152 152 153 153 data->rocks = Tiler::Register(PNG_TITLE_ROCKS, ivec2(640, 155), ivec2(0)); 154 data->rocks_pos = ivec2(( bbox[1] -bbox[0]).xy / vec2(2, 2))154 data->rocks_pos = ivec2((m_bbox[1] - m_bbox[0]).xy / vec2(2, 2)) 155 155 - ivec2(320, 240); 156 156 … … 170 170 data->timer = RandF(2000.0f, 3000.0f); 171 171 /* Time needed for the eagle to cross the screen */ 172 data->eagle.duration = ( bbox[1].x -bbox[0].x + 16) * STEP_EAGLE;172 data->eagle.duration = (m_bbox[1].x - m_bbox[0].x + 16) * STEP_EAGLE; 173 173 data->eagle.timer = RandF(data->eagle.duration, 4 * data->eagle.duration); 174 174 175 175 for (int n = 0; n < MAX_CLOUDS; n++) 176 176 { 177 data->cloudpos[n] = vec2(RandF(( bbox[1] -bbox[0]).x),178 RandF(80) + ( bbox[1] -bbox[0]).y - 300);177 data->cloudpos[n] = vec2(RandF((m_bbox[1] - m_bbox[0]).x), 178 RandF(80) + (m_bbox[1] - m_bbox[0]).y - 300); 179 179 data->cloudspeed[n] = vec2(RandF(-0.01f, 0.01f)); 180 180 } … … 206 206 for (int n = 0; n < MAX_CLOUDS; n++) 207 207 { 208 float wrap = bbox[1].x -bbox[0].x;208 float wrap = m_bbox[1].x - m_bbox[0].x; 209 209 data->cloudpos[n].x += deltams * data->cloudspeed[n].x; 210 210 if (data->cloudpos[n].x > wrap) … … 333 333 vec2(1.0f)); 334 334 Scene::GetDefault()->AddTile(data->clouds, cloudid, 335 ivec3(data->cloudpos[n].x - bbox[1].x336 + bbox[0].x,335 ivec3(data->cloudpos[n].x - m_bbox[1].x 336 + m_bbox[0].x, 337 337 data->cloudpos[n].y, 2), 0, 338 338 vec2(1.0f)); … … 401 401 int Title::IsClicked() const 402 402 { 403 return clicked[0];403 return m_clicked[0]; 404 404 } 405 405 -
trunk/mrpigeon/blueenemy.cpp
r1211 r1300 29 29 enemy_casualblueattack = Tiler::Register("mrpigeon/gfx/enemy_CasualBLUE_walkAttack.png", ivec2(16,24), ivec2(0)); /* 6 frames */ 30 30 31 position = vec3(512, 81, 0);32 velocity = vec3(-0.15f, 0, 0);31 m_position = vec3(512, 81, 0); 32 m_velocity = vec3(-0.15f, 0, 0); 33 33 } 34 34 … … 41 41 enemytime = fmod(deltams + enemytime, 700.0f);; 42 42 43 position +=velocity * deltams;43 m_position += m_velocity * deltams; 44 44 } 45 45 … … 49 49 50 50 /* + 48 because of vertical flip */ 51 Scene::GetDefault()->AddTile( position.x > 255 ? enemy_casualblue : enemy_casualblueattack, (int)(enemytime * 6 / 700.0f),position + vec3(48.0f, 0, 0), 0, vec2(-3.0f, 3.0f));51 Scene::GetDefault()->AddTile(m_position.x > 255 ? enemy_casualblue : enemy_casualblueattack, (int)(enemytime * 6 / 700.0f), m_position + vec3(48.0f, 0, 0), 0, vec2(-3.0f, 3.0f)); 52 52 } 53 53 -
trunk/mrpigeon/mrpigeon.cpp
r1211 r1300 50 50 deco_floorrails = Tiler::Register("mrpigeon/gfx/DECO_floorRails3x.png", ivec2(72,24), ivec2(0)); 51 51 52 position = vec3(0, 0, 0);53 bbox[0] =position;54 bbox[1] = vec3(512, 384, 0);52 m_position = vec3(0, 0, 0); 53 m_bbox[0] = m_position; 54 m_bbox[1] = vec3(512, 384, 0); 55 55 Input::TrackMouse(this); 56 56 } … … 92 92 for (int i = 0; i < 10; i++) 93 93 { 94 if (enemies[i] && enemies[i]-> position.x < -100.0f)94 if (enemies[i] && enemies[i]->m_position.x < -100.0f) 95 95 { 96 96 Ticker::Unref(enemies[i]); -
trunk/mrpigeon/player.cpp
r1211 r1300 33 33 active_set(NULL), 34 34 active_frame(0), 35 velocity(0.0f),36 35 walktime(0.0f), 37 36 flytime(0.0f) … … 49 48 player_walkraisefist = Tiler::Register("mrpigeon/gfx/player_WalkRaiseFist.png", ivec2(16,32), ivec2(0)); /* 8 frames */ 50 49 51 position = vec3(120.0f, 400.0f, 5.0f); 50 m_position = vec3(120.0f, 400.0f, 5.0f); 51 m_velocity = vec3(0.f); 52 52 state = FALLING; 53 53 } … … 64 64 for (int i = 0; i < 10; i++) 65 65 if (enemies[i] 66 && enemies[i]-> position.x >position.x + 60.0f - 30.0f67 && enemies[i]-> position.x <position.x + 60.0f + 30.0f)66 && enemies[i]->m_position.x > m_position.x + 60.0f - 30.0f 67 && enemies[i]->m_position.x < m_position.x + 60.0f + 30.0f) 68 68 { 69 69 must_kick = true; … … 77 77 else 78 78 { 79 velocity.y = JUMPVEL;79 m_velocity.y = JUMPVEL; 80 80 state = JUMPING; 81 81 } … … 87 87 break; 88 88 case FALLING: 89 velocity.y = -JUMPVEL;89 m_velocity.y = -JUMPVEL; 90 90 state = DASHDOWN; 91 91 break; … … 103 103 flytime = fmod(deltams + flytime, 400.0f);; 104 104 105 vec3 oldvel = velocity;105 vec3 oldvel = m_velocity; 106 106 switch (state) 107 107 { … … 116 116 break; 117 117 case FALLING: 118 velocity.y -= deltams * GRAVITY;119 position += (oldvel +velocity) * (0.5 * deltams);120 if ( position.y < 81.0f)121 { 122 position.y = 81.0f;118 m_velocity.y -= deltams * GRAVITY; 119 m_position += (oldvel + m_velocity) * (0.5 * deltams); 120 if (m_position.y < 81.0f) 121 { 122 m_position.y = 81.0f; 123 123 state = WALKING; 124 124 } 125 125 break; 126 126 case JUMPING: 127 velocity.y -= deltams * GRAVITY;128 position += (oldvel +velocity) * (0.5 * deltams);129 if ( velocity.y < 0.0f)127 m_velocity.y -= deltams * GRAVITY; 128 m_position += (oldvel + m_velocity) * (0.5 * deltams); 129 if (m_velocity.y < 0.0f) 130 130 state = FALLING; 131 131 break; … … 134 134 if (walktime >= LEN_KICKAIR) 135 135 { 136 velocity.y = 0.0f;136 m_velocity.y = 0.0f; 137 137 state = FALLING; 138 138 } 139 139 break; 140 140 case DASHDOWN: 141 velocity.y -= deltams * GRAVITY;142 position += (oldvel +velocity) * (0.5 * deltams);143 if ( position.y < 81.0f)144 { 145 position.y = 81.0f;141 m_velocity.y -= deltams * GRAVITY; 142 m_position += (oldvel + m_velocity) * (0.5 * deltams); 143 if (m_position.y < 81.0f) 144 { 145 m_position.y = 81.0f; 146 146 state = FUNKING; 147 147 } … … 188 188 Scene::GetDefault()->AddTile(pigeon_flying, (int)(flytime * 2 / 400.0f), ivec3(81, 147, 5), 0, vec2(3.0f)); 189 189 190 Scene::GetDefault()->AddTile(active_set, active_frame, ivec3( position), 0, vec2(3.0f));190 Scene::GetDefault()->AddTile(active_set, active_frame, ivec3(m_position), 0, vec2(3.0f)); 191 191 } 192 192 -
trunk/mrpigeon/redenemy.cpp
r1211 r1300 30 30 enemy_casualredfall = Tiler::Register("mrpigeon/gfx/enemy_CasualRED_fall.png", ivec2(16,24), ivec2(0)); 31 31 32 position = vec3(512, 81, 0);33 velocity = vec3(-0.15f, 0, 0);32 m_position = vec3(512, 81, 0); 33 m_velocity = vec3(-0.15f, 0, 0); 34 34 } 35 35 … … 42 42 enemytime = fmod(deltams + enemytime, 700.0f);; 43 43 44 position +=velocity * deltams;44 m_position += m_velocity * deltams; 45 45 } 46 46 … … 50 50 51 51 /* + 48 because of vertical flip */ 52 Scene::GetDefault()->AddTile(enemy_casualred, (int)(enemytime * 6 / 700.0f), position + vec3(48.0f, 0, 0), 0, vec2(-3.0f, 3.0f));52 Scene::GetDefault()->AddTile(enemy_casualred, (int)(enemytime * 6 / 700.0f), m_position + vec3(48.0f, 0, 0), 0, vec2(-3.0f, 3.0f)); 53 53 } 54 54 -
trunk/src/gradient.cpp
r1234 r1300 45 45 { 46 46 /* FIXME: this should not be hardcoded */ 47 position = aa;48 bbox[0] = aa;49 bbox[1] = bb;47 m_position = aa; 48 m_bbox[0] = aa; 49 m_bbox[1] = bb; 50 50 51 51 data->shader = NULL; -
trunk/src/input.cpp
r1136 r1300 121 121 for (int n = 0; n < data->nentities; n++) 122 122 { 123 if (coord.x < data->entities[n]-> bbox[0].x124 || coord.x >= data->entities[n]-> bbox[1].x125 || coord.y < data->entities[n]-> bbox[0].y126 || coord.y >= data->entities[n]-> bbox[1].y)123 if (coord.x < data->entities[n]->m_bbox[0].x 124 || coord.x >= data->entities[n]->m_bbox[1].x 125 || coord.y < data->entities[n]->m_bbox[0].y 126 || coord.y >= data->entities[n]->m_bbox[1].y) 127 127 continue; 128 128 129 if (!top || top-> bbox[1].z < data->entities[n]->bbox[1].z)129 if (!top || top->m_bbox[1].z < data->entities[n]->m_bbox[1].z) 130 130 top = data->entities[n]; 131 131 } … … 135 135 if (data->entities[n] == top) 136 136 { 137 data->entities[n]->m ousepos = coord - (ivec2)top->bbox[0].xy;137 data->entities[n]->m_mousepos = coord - (ivec2)top->m_bbox[0].xy; 138 138 if (top != data->lastfocus) 139 data->entities[n]-> pressed = data->buttons;139 data->entities[n]->m_pressed = data->buttons; 140 140 else 141 data->entities[n]-> clicked = ivec3(0);141 data->entities[n]->m_clicked = ivec3(0); 142 142 } 143 143 else 144 144 { 145 data->entities[n]->m ousepos = ivec2(-1);145 data->entities[n]->m_mousepos = ivec2(-1); 146 146 /* FIXME */ 147 data->entities[n]-> released = ivec3(0);148 data->entities[n]-> pressed = ivec3(0);149 data->entities[n]-> clicked = ivec3(0);147 data->entities[n]->m_released = ivec3(0); 148 data->entities[n]->m_pressed = ivec3(0); 149 data->entities[n]->m_clicked = ivec3(0); 150 150 } 151 151 } … … 160 160 if (data->lastfocus) 161 161 { 162 if (!data->lastfocus-> pressed[index])163 data->lastfocus-> clicked[index] = 1;164 data->lastfocus-> pressed[index] = 1;165 data->lastfocus-> released[index] = 0;162 if (!data->lastfocus->m_pressed[index]) 163 data->lastfocus->m_clicked[index] = 1; 164 data->lastfocus->m_pressed[index] = 1; 165 data->lastfocus->m_released[index] = 0; 166 166 } 167 167 } … … 173 173 if (data->lastfocus) 174 174 { 175 if (data->lastfocus-> pressed[index])176 data->lastfocus-> released[index] = 1;177 data->lastfocus-> pressed[index] = 0;178 data->lastfocus-> clicked[index] = 0;175 if (data->lastfocus->m_pressed[index]) 176 data->lastfocus->m_released[index] = 1; 177 data->lastfocus->m_pressed[index] = 0; 178 data->lastfocus->m_clicked[index] = 0; 179 179 } 180 180 } -
trunk/src/sprite.cpp
r1198 r1300 51 51 Entity::TickDraw(deltams); 52 52 53 Scene::GetDefault()->AddTile(data->tileset, data->id, position,53 Scene::GetDefault()->AddTile(data->tileset, data->id, m_position, 54 54 0, vec2(1.0f)); 55 55 } -
trunk/src/worldentity.cpp
r1046 r1300 26 26 WorldEntity::WorldEntity() 27 27 { 28 position = vec3(0);29 rotation = vec3(0);30 velocity = vec3(0);31 bbox[0] =bbox[1] = vec3(0);28 m_position = vec3(0); 29 m_rotation = vec3(0); 30 m_velocity = vec3(0); 31 m_bbox[0] = m_bbox[1] = vec3(0); 32 32 33 m ousepos = ivec2(0);34 m ousebuttons = ivec3(0);35 pressed = ivec3(0);36 clicked = ivec3(0);37 released = ivec3(0);33 m_mousepos = ivec2(0); 34 m_mousebuttons = ivec3(0); 35 m_pressed = ivec3(0); 36 m_clicked = ivec3(0); 37 m_released = ivec3(0); 38 38 } 39 39 -
trunk/src/worldentity.h
r866 r1300 25 25 { 26 26 public: 27 vec3 position;28 vec3 rotation;29 vec3 velocity;30 vec3 bbox[2];27 vec3 m_position; 28 vec3 m_rotation; 29 vec3 m_velocity; 30 vec3 m_bbox[2]; 31 31 32 ivec2 m ousepos;33 ivec3 m ousebuttons;34 ivec3 pressed, clicked,released;32 ivec2 m_mousepos; 33 ivec3 m_mousebuttons; 34 ivec3 m_pressed, m_clicked, m_released; 35 35 36 36 protected: -
trunk/test/tutorial/03_fractal.cpp
r1242 r1300 154 154 #endif 155 155 156 position = ivec3(0, 0, 0);157 bbox[0] =position;158 bbox[1] = ivec3(m_window_size, 0);156 m_position = ivec3(0, 0, 0); 157 m_bbox[0] = m_position; 158 m_bbox[1] = ivec3(m_window_size, 0); 159 159 Input::TrackMouse(this); 160 160 … … 209 209 m_frame = (m_frame + 1) % 4; 210 210 211 f64cmplx worldmouse = m_center + ScreenToWorldOffset(m ousepos);211 f64cmplx worldmouse = m_center + ScreenToWorldOffset(m_mousepos); 212 212 213 213 ivec3 buttons = Input::GetMouseButtons(); … … 217 217 if (!m_drag) 218 218 { 219 m_oldmouse = m ousepos;219 m_oldmouse = m_mousepos; 220 220 m_drag = true; 221 221 } 222 222 m_translate = ScreenToWorldOffset(m_oldmouse) 223 - ScreenToWorldOffset(m ousepos);223 - ScreenToWorldOffset(m_mousepos); 224 224 /* XXX: the purpose of this hack is to avoid translating by 225 225 * an exact number of pixels. If this were to happen, the step() … … 228 228 * would have tie rankings in the distance calculation. */ 229 229 m_translate *= 1023.0 / 1024.0; 230 m_oldmouse = m ousepos;230 m_oldmouse = m_mousepos; 231 231 } 232 232 else … … 241 241 } 242 242 243 if ((buttons[0] || buttons[2]) && m ousepos.x != -1)243 if ((buttons[0] || buttons[2]) && m_mousepos.x != -1) 244 244 { 245 245 double zoom = buttons[0] ? -0.0005 : 0.0005; … … 275 275 m_center += m_translate; 276 276 m_center = (m_center - worldmouse) * zoom + worldmouse; 277 worldmouse = m_center + ScreenToWorldOffset(m ousepos);277 worldmouse = m_center + ScreenToWorldOffset(m_mousepos); 278 278 #endif 279 279
Note: See TracChangeset
for help on using the changeset viewer.