|
@@ -18,7 +18,6 @@ World::~World()
|
18
|
18
|
|
19
|
19
|
|
20
|
20
|
// Temp methods for rendering use until more refactoring is done
|
21
|
|
-#ifdef BAD_BLOOD
|
22
|
21
|
model_mesh_t *World::getMesh(int index)
|
23
|
22
|
{
|
24
|
23
|
return mMeshes[index];
|
|
@@ -29,32 +28,11 @@ skeletal_model_t *World::getModel(int index)
|
29
|
28
|
return mModels[index];
|
30
|
29
|
}
|
31
|
30
|
|
32
|
|
-room_mesh_t *World::getRoom(int index)
|
33
|
|
-{
|
34
|
|
- return mRooms[index];
|
35
|
|
-}
|
36
|
|
-
|
37
|
31
|
std::vector<entity_t *> *World::getEntities()
|
38
|
32
|
{
|
39
|
33
|
return &mEntities;
|
40
|
34
|
}
|
41
|
35
|
|
42
|
|
-std::vector<sprite_seq_t *> *World::getSprites()
|
43
|
|
-{
|
44
|
|
- return &mSprites;
|
45
|
|
-}
|
46
|
|
-
|
47
|
|
-std::vector<room_mesh_t *> *World::getRooms()
|
48
|
|
-{
|
49
|
|
- return &mRooms;
|
50
|
|
-}
|
51
|
|
-
|
52
|
|
-void World::addRoom(room_mesh_t *room)
|
53
|
|
-{
|
54
|
|
- mRooms.push_back(room);
|
55
|
|
-}
|
56
|
|
-
|
57
|
|
-
|
58
|
36
|
void World::addMesh(model_mesh_t *mesh)
|
59
|
37
|
{
|
60
|
38
|
if (mesh)
|
|
@@ -86,13 +64,6 @@ int World::addModel(skeletal_model_t *model)
|
86
|
64
|
}
|
87
|
65
|
|
88
|
66
|
|
89
|
|
-void World::addSprite(sprite_seq_t *sprite)
|
90
|
|
-{
|
91
|
|
- if (sprite)
|
92
|
|
- mSprites.push_back(sprite);
|
93
|
|
-}
|
94
|
|
-
|
95
|
|
-
|
96
|
67
|
void World::moveEntity(entity_t *e, char movement)
|
97
|
68
|
{
|
98
|
69
|
const float moved = 180.0f;
|
|
@@ -271,128 +242,95 @@ void World::moveEntity(entity_t *e, char movement)
|
271
|
242
|
e->moving = true;
|
272
|
243
|
}
|
273
|
244
|
|
274
|
|
-#else
|
275
|
245
|
|
276
|
246
|
void World::addRoom(Room &room) {
|
277
|
247
|
mRooms.push_back(&room);
|
278
|
248
|
}
|
279
|
249
|
|
|
250
|
+unsigned int World::sizeRoom() {
|
|
251
|
+ return mRooms.size();
|
|
252
|
+}
|
|
253
|
+
|
|
254
|
+Room &World::getRoom(unsigned int index) {
|
|
255
|
+ assert(index < mRooms.size());
|
|
256
|
+ return *mRooms.at(index);
|
|
257
|
+}
|
|
258
|
+
|
280
|
259
|
void World::addSprite(SpriteSequence &sprite) {
|
281
|
260
|
mSprites.push_back(&sprite);
|
282
|
261
|
}
|
283
|
262
|
|
284
|
|
-#endif
|
|
263
|
+unsigned int World::sizeSprite() {
|
|
264
|
+ return mSprites.size();
|
|
265
|
+}
|
|
266
|
+
|
|
267
|
+SpriteSequence &World::getSprite(unsigned int index) {
|
|
268
|
+ assert(index < mSprites.size());
|
|
269
|
+ return *mSprites.at(index);
|
|
270
|
+}
|
285
|
271
|
|
286
|
272
|
|
287
|
273
|
int World::getRoomByLocation(int index, float x, float y, float z)
|
288
|
274
|
{
|
289
|
|
- room_mesh_t *room = mRooms[index];
|
290
|
|
-
|
291
|
|
- if (room)
|
292
|
|
- {
|
293
|
|
- if (x > room->bbox_min[0] && x < room->bbox_max[0] &&
|
294
|
|
- z > room->bbox_min[2] && z < room->bbox_max[2])
|
295
|
|
- {
|
296
|
|
- if (y > room->bbox_min[1] && y < room->bbox_max[1])
|
297
|
|
- return index;
|
298
|
|
- }
|
299
|
|
- }
|
|
275
|
+ assert(index >= 0);
|
|
276
|
+ assert(index < mRooms.size());
|
|
277
|
+ Room &room = *mRooms.at(index);
|
300
|
278
|
|
301
|
|
- return getRoomByLocation(x, y, z);
|
|
279
|
+ if (room.inBox(x, y, z))
|
|
280
|
+ return index;
|
|
281
|
+ else
|
|
282
|
+ return getRoomByLocation(x, y, z);
|
302
|
283
|
}
|
303
|
284
|
|
304
|
285
|
|
305
|
|
-int World::getRoomByLocation(float x, float y, float z)
|
306
|
|
-{
|
307
|
|
- room_mesh_t *room;
|
|
286
|
+int World::getRoomByLocation(float x, float y, float z) {
|
308
|
287
|
int hop = -1;
|
309
|
288
|
|
310
|
|
-
|
311
|
|
- for(std::vector<int>::size_type i = 0; i < mRooms.size(); i++)
|
312
|
|
- {
|
313
|
|
- room = mRooms[i];
|
314
|
|
-
|
315
|
|
- if (!room)
|
316
|
|
- continue;
|
317
|
|
-
|
318
|
|
- if ((x > room->bbox_min[0]) && (x < room->bbox_max[0]) &&
|
319
|
|
- (z > room->bbox_min[2]) && (z < room->bbox_max[2]))
|
320
|
|
- {
|
321
|
|
- // This room contains current position
|
322
|
|
- if ((y > room->bbox_min[1]) && (y < room->bbox_max[1]))
|
|
289
|
+ for (unsigned int i = 0; i < mRooms.size(); i++) {
|
|
290
|
+ if (mRooms.at(i)->inBoxPlane(x, z)) {
|
|
291
|
+ if (mRooms.at(i)->inBox(x, y, z))
|
323
|
292
|
return i;
|
324
|
|
-
|
325
|
|
- // This room is above or below current position
|
326
|
|
- hop = i;
|
|
293
|
+ else
|
|
294
|
+ hop = i; // This room is above or below current position
|
327
|
295
|
}
|
328
|
296
|
}
|
329
|
297
|
|
330
|
|
- // Room is -1? Must be in void, try to hop to room with same X,Z
|
331
|
298
|
return hop;
|
332
|
|
- //return -1;
|
333
|
299
|
}
|
334
|
300
|
|
335
|
301
|
|
336
|
302
|
int World::getAdjoiningRoom(int index,
|
337
|
303
|
float x, float y, float z,
|
338
|
|
- float x2, float y2, float z2)
|
339
|
|
-{
|
340
|
|
- room_mesh_t *room = mRooms[index];
|
341
|
|
- portal_t * portal;
|
|
304
|
+ float x2, float y2, float z2) {
|
|
305
|
+ assert(index >= 0);
|
|
306
|
+ assert(index < mRooms.size());
|
|
307
|
+ Room &room = *mRooms.at(index);
|
342
|
308
|
vec3_t intersect, p1, p2;
|
343
|
309
|
|
344
|
|
-
|
345
|
310
|
p1[0] = x; p1[1] = y; p1[2] = z;
|
346
|
311
|
p2[0] = x2; p2[1] = y2; p2[2] = z2;
|
347
|
312
|
|
348
|
|
- if (room)
|
349
|
|
- {
|
350
|
|
- for(std::vector<int>::size_type i = 0; i != room->portals.size(); i++)
|
351
|
|
- {
|
352
|
|
- portal = room->portals[i];
|
353
|
|
-
|
354
|
|
- if (!portal)
|
355
|
|
- continue;
|
356
|
|
-
|
357
|
|
- if (intersectionLinePolygon(intersect, p1, p2, // 4,
|
358
|
|
- portal->vertices))
|
359
|
|
- {
|
360
|
|
- return portal->adjoining_room;
|
361
|
|
- }
|
362
|
|
- }
|
|
313
|
+ for (unsigned int i = 0; i < room.sizePortals(); i++) {
|
|
314
|
+ if (intersectionLinePolygon(intersect, p1, p2, //4,
|
|
315
|
+ room.getPortal(i).getVertices()))
|
|
316
|
+ return room.getPortal(i).getAdjoiningRoom();
|
363
|
317
|
}
|
364
|
318
|
|
365
|
319
|
return -1;
|
366
|
320
|
}
|
367
|
321
|
|
368
|
322
|
|
369
|
|
-int World::getSector(int room, float x, float z, float *floor, float *ceiling)
|
370
|
|
-{
|
371
|
|
- room_mesh_t *r;
|
372
|
|
- sector_t * s;
|
373
|
|
- int sector;
|
374
|
|
-
|
|
323
|
+int World::getSector(int room, float x, float z, float *floor, float *ceiling) {
|
375
|
324
|
assert(room >= 0);
|
|
325
|
+ assert(room < mRooms.size());
|
376
|
326
|
assert(floor != NULL);
|
377
|
327
|
assert(ceiling != NULL);
|
378
|
328
|
|
379
|
|
- r = mRooms[room];
|
380
|
|
-
|
381
|
|
- if (!r)
|
382
|
|
- return -1;
|
383
|
|
-
|
384
|
|
- sector = (((((int)x - (int)r->pos[0]) / 1024) * r->numZSectors) +
|
385
|
|
- (((int)z - (int)r->pos[2]) / 1024));
|
386
|
|
-
|
387
|
|
- if (sector > -1)
|
388
|
|
- {
|
389
|
|
- s = r->sectors[sector];
|
|
329
|
+ int sector = getSector(room, x, z);
|
390
|
330
|
|
391
|
|
- if (!s)
|
392
|
|
- return -1;
|
393
|
|
-
|
394
|
|
- *floor = s->floor;
|
395
|
|
- *ceiling = s->ceiling;
|
|
331
|
+ if ((sector >= 0) && (sector < mRooms.at(room)->sizeSectors())) {
|
|
332
|
+ *floor = mRooms.at(room)->getSector(sector).getFloor();
|
|
333
|
+ *ceiling = mRooms.at(room)->getSector(sector).getCeiling();
|
396
|
334
|
}
|
397
|
335
|
|
398
|
336
|
return sector;
|
|
@@ -400,19 +338,13 @@ int World::getSector(int room, float x, float z, float *floor, float *ceiling)
|
400
|
338
|
|
401
|
339
|
|
402
|
340
|
int World::getSector(int room, float x, float z) {
|
403
|
|
- int sector;
|
404
|
|
- room_mesh_t *r;
|
405
|
|
-
|
406
|
|
- if ((room < 0) || (room >= (int)mRooms.size()))
|
407
|
|
- return -1;
|
408
|
|
-
|
409
|
|
- r = mRooms[room];
|
410
|
|
-
|
411
|
|
- if (!r)
|
412
|
|
- return -1;
|
|
341
|
+ assert(room >= 0);
|
|
342
|
+ assert(room < mRooms.size());
|
413
|
343
|
|
414
|
|
- sector = (((((int)x - (int)r->pos[0]) / 1024) * r->numZSectors) +
|
415
|
|
- (((int)z - (int)r->pos[2]) / 1024));
|
|
344
|
+ vec3_t pos;
|
|
345
|
+ mRooms.at(room)->getPos(pos);
|
|
346
|
+ int sector = (((((int)x - (int)pos[0]) / 1024) *
|
|
347
|
+ mRooms.at(room)->getNumZSectors()) + (((int)z - (int)pos[2]) / 1024));
|
416
|
348
|
|
417
|
349
|
if (sector < 0)
|
418
|
350
|
return -1;
|
|
@@ -422,73 +354,43 @@ int World::getSector(int room, float x, float z) {
|
422
|
354
|
|
423
|
355
|
|
424
|
356
|
unsigned int World::getRoomInfo(int room) {
|
425
|
|
- room_mesh_t *r;
|
426
|
|
-
|
427
|
|
- if ((room >= (int)mRooms.size()) || (room < 0))
|
428
|
|
- return 0;
|
429
|
|
-
|
430
|
|
- r = mRooms[room];
|
431
|
|
-
|
432
|
|
- if (!r)
|
433
|
|
- return 0;
|
|
357
|
+ assert(room >= 0);
|
|
358
|
+ assert(room < mRooms.size());
|
434
|
359
|
|
435
|
|
- return r->flags;
|
|
360
|
+ return mRooms.at(room)->getFlags();
|
436
|
361
|
}
|
437
|
362
|
|
438
|
363
|
|
439
|
364
|
bool World::isWall(int room, int sector) {
|
440
|
|
- room_mesh_t *r;
|
441
|
|
- sector_t *sect;
|
442
|
|
-
|
443
|
|
- if ((room >= (int)mRooms.size()) || (room < 0))
|
444
|
|
- return true;
|
445
|
|
-
|
446
|
|
- r = mRooms[room];
|
447
|
|
-
|
448
|
|
- if ((!r) || (sector >= (int)r->sectors.size()) || (sector < 0))
|
449
|
|
- return true;
|
450
|
|
-
|
451
|
|
- sect = r->sectors[sector];
|
452
|
|
-
|
453
|
|
- if (!sect)
|
454
|
|
- return true;
|
|
365
|
+ assert(room >= 0);
|
|
366
|
+ assert(room < mRooms.size());
|
|
367
|
+ assert(sector >= 0);
|
|
368
|
+ assert(sector < mRooms.at(room)->sizeSectors());
|
455
|
369
|
|
456
|
|
- return ((sector > 0) && sect->wall); //! \fixme is (sector > 0) correct??
|
|
370
|
+ //! \fixme is (sector > 0) correct??
|
|
371
|
+ return ((sector > 0) && mRooms.at(room)->getSector(sector).isWall());
|
457
|
372
|
}
|
458
|
373
|
|
459
|
374
|
|
460
|
|
-bool World::getHeightAtPosition(int index, float x, float *y, float z)
|
461
|
|
-{
|
462
|
|
- room_mesh_t *room = mRooms[index];
|
463
|
|
- int sector;
|
464
|
|
- sector_t *sect;
|
465
|
|
-
|
466
|
|
- if (!room)
|
467
|
|
- {
|
468
|
|
- return false;
|
469
|
|
- }
|
470
|
|
-
|
471
|
|
- // Mongoose 2002.08.14, Remember sector_z is width of sector array
|
472
|
|
- sector = getSector(index, x, z);
|
473
|
|
-
|
474
|
|
- sect = room->sectors[sector];
|
|
375
|
+void World::getHeightAtPosition(int index, float x, float *y, float z) {
|
|
376
|
+ assert(index >= 0);
|
|
377
|
+ assert(index < mRooms.size());
|
475
|
378
|
|
476
|
|
- if (!sect)
|
477
|
|
- {
|
478
|
|
- return true;
|
479
|
|
- }
|
480
|
|
-
|
481
|
|
- *y = sect->floor;
|
482
|
|
-
|
483
|
|
- return true;
|
|
379
|
+ int sector = getSector(index, x, z);
|
|
380
|
+ if ((sector >= 0) && (sector < mRooms.at(index)->sizeSectors()))
|
|
381
|
+ *y = mRooms.at(index)->getSector(sector).getFloor();
|
484
|
382
|
}
|
485
|
383
|
|
486
|
384
|
|
487
|
385
|
void World::destroy()
|
488
|
386
|
{
|
489
|
|
- room_mesh_t *room;
|
|
387
|
+ for (unsigned int i = 0; i != mRooms.size(); i++)
|
|
388
|
+ delete mRooms[i];
|
|
389
|
+
|
|
390
|
+ for (unsigned int i = 0; i != mSprites.size(); i++)
|
|
391
|
+ delete mSprites[i];
|
|
392
|
+
|
490
|
393
|
model_mesh_t *mesh;
|
491
|
|
- sprite_seq_t *sprite;
|
492
|
394
|
skeletal_model_t *model;
|
493
|
395
|
bone_frame_t *boneframe;
|
494
|
396
|
bone_tag_t *tag;
|
|
@@ -497,37 +399,6 @@ void World::destroy()
|
497
|
399
|
|
498
|
400
|
for (std::vector<int>::size_type i = 0; i != mEntities.size(); i++)
|
499
|
401
|
delete mEntities[i];
|
500
|
|
- mEntities.clear();
|
501
|
|
-
|
502
|
|
- for (std::vector<int>::size_type i = 0; i != mRooms.size(); i++) {
|
503
|
|
- room = mRooms[i];
|
504
|
|
-
|
505
|
|
- if (room) {
|
506
|
|
- //! \fixme Causes "freeing already freed pointer" exceptions or EXEC_BAD_ACCESS
|
507
|
|
-
|
508
|
|
- //for (std::vector<int>::size_type j = 0; j != room->portals.size(); j++)
|
509
|
|
- // delete room->portals[i];
|
510
|
|
- room->portals.clear();
|
511
|
|
-
|
512
|
|
- //for (std::vector<int>::size_type j = 0; j != room->models.size(); j++)
|
513
|
|
- // delete room->models[i];
|
514
|
|
- room->models.clear();
|
515
|
|
-
|
516
|
|
- //for (std::vector<int>::size_type j = 0; j != room->sprites.size(); j++)
|
517
|
|
- // delete room->sprites[i];
|
518
|
|
- room->sprites.clear();
|
519
|
|
-
|
520
|
|
- //for (std::vector<int>::size_type j = 0; j != room->sectors.size(); j++)
|
521
|
|
- // delete room->sectors[i];
|
522
|
|
- room->sectors.clear();
|
523
|
|
-
|
524
|
|
- //for (std::vector<int>::size_type j = 0; j != room->boxes.size(); j++)
|
525
|
|
- // delete room->boxes[i];
|
526
|
|
- room->boxes.clear();
|
527
|
|
-
|
528
|
|
- delete room;
|
529
|
|
- }
|
530
|
|
- }
|
531
|
402
|
|
532
|
403
|
for (std::vector<int>::size_type i = 0; i != mMeshes.size(); i++) {
|
533
|
404
|
mesh = mMeshes[i];
|
|
@@ -569,20 +440,6 @@ void World::destroy()
|
569
|
440
|
|
570
|
441
|
mMeshes.clear();
|
571
|
442
|
|
572
|
|
- for (std::vector<int>::size_type i = 0; i != mSprites.size(); i++) {
|
573
|
|
- sprite = mSprites[i];
|
574
|
|
-
|
575
|
|
- if (!sprite)
|
576
|
|
- continue;
|
577
|
|
-
|
578
|
|
- if (sprite->sprite)
|
579
|
|
- delete [] sprite->sprite;
|
580
|
|
-
|
581
|
|
- delete sprite;
|
582
|
|
- }
|
583
|
|
-
|
584
|
|
- mSprites.clear();
|
585
|
|
-
|
586
|
443
|
for (std::vector<int>::size_type i = 0; i != mModels.size(); i++) {
|
587
|
444
|
model = mModels[i];
|
588
|
445
|
|