Changeset 313
- Timestamp:
- Jan 31, 2011, 2:50:49 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/monsterz/board.cpp
r311 r313 196 196 Entity::TickDraw(deltams); 197 197 198 Scene::GetDefault()->AddTile((data->screen << 16) | 0, 0, 1050, 0, 0);199 Scene::GetDefault()->AddTile((data->board << 16) | 0, 24, 912, 1, 0);198 Scene::GetDefault()->AddTile((data->screen << 16) | 0, 0, 0, 0, 0); 199 Scene::GetDefault()->AddTile((data->board << 16) | 0, 24, 72, 1, 0); 200 200 201 201 if (data->mouse.x >= 0 && data->mouse.y >= 0) 202 202 { 203 int x = data->mouse.x - 2; 204 int y = data->mouse.y + 59; 205 Scene::GetDefault()->AddTile((data->tiles << 16) | 22, x, y, 10, 0); 203 int2 m = data->mouse + int2(-6, 6 - 48); 204 Scene::GetDefault()->AddTile((data->tiles << 16) | 22, m.x, m.y, 10, 0); 206 205 } 207 206 } -
trunk/monsterz/piece.cpp
r311 r313 282 282 if (data->timer < 0.0f) 283 283 { 284 float3 pos(data->pos.x + 24, data->pos.y + 177, 5);284 float3 pos(data->pos.x + 24, data->pos.y + 72, 5); 285 285 int start = data->id + 12; 286 286 int stop = data->id + 15; … … 308 308 int id = data->id; 309 309 int x = data->pos.x + 24; 310 int y = data->pos.y + 177;310 int y = data->pos.y + 72; 311 311 int z = 2; 312 312 -
trunk/src/scene.cpp
r289 r313 97 97 data->tiles = (Tile *)realloc(data->tiles, 98 98 (data->ntiles + 1024) * sizeof(Tile)); 99 /* FIXME: this sorting only works for a 45-degree camera */ 99 100 data->tiles[data->ntiles].prio = -y - 2 * 32 * z + (o ? 0 : 32); 100 101 data->tiles[data->ntiles].code = code; -
trunk/src/tileset.cpp
r280 r313 157 157 float dilate = data->dilate; 158 158 159 int off = o ? data->h : 0;160 159 int dx = data->w; 161 int dy = data->h * 38 / 32; /* Magic... fix this one day */162 int d y2 = data->h * 70 / 32;160 int dy = o ? 0 : data->h; 161 int dz = o ? data->h : 0; 163 162 164 163 if (!data->img) … … 167 166 glBegin(GL_QUADS); 168 167 glTexCoord2f(tx, ty); 169 glVertex3f(x, dilate * (y - dy - off), dilate * (z + off));168 glVertex3f(x, dilate * (y + dy), dilate * (z + dz)); 170 169 glTexCoord2f(tx + data->tx, ty); 171 glVertex3f(x + dx, dilate * (y - dy - off), dilate * (z + off));170 glVertex3f(x + dx, dilate * (y + dy), dilate * (z + dz)); 172 171 glTexCoord2f(tx + data->tx, ty + data->ty); 173 glVertex3f(x + dx, dilate * (y - dy2), dilate * z);172 glVertex3f(x + dx, dilate * y, dilate * z); 174 173 glTexCoord2f(tx, ty + data->ty); 175 glVertex3f(x, dilate * (y - dy2), dilate * z);174 glVertex3f(x, dilate * y, dilate * z); 176 175 glEnd(); 177 176 }
Note: See TracChangeset
for help on using the changeset viewer.