From e88fd1dcef52d4375fef655918886fc14bb1f40c Mon Sep 17 00:00:00 2001 From: Treeki Date: Thu, 15 Mar 2012 02:54:33 +0100 Subject: optimisations to reduce code size --- src/koopatlas/camera.cpp | 3 --- src/koopatlas/hud.cpp | 3 --- src/koopatlas/map.cpp | 12 ------------ src/koopatlas/mapdata.cpp | 4 ---- src/koopatlas/player.cpp | 6 ------ 5 files changed, 28 deletions(-) (limited to 'src/koopatlas') diff --git a/src/koopatlas/camera.cpp b/src/koopatlas/camera.cpp index 87547d9..47b68a5 100644 --- a/src/koopatlas/camera.cpp +++ b/src/koopatlas/camera.cpp @@ -4,12 +4,10 @@ dWorldCamera_c *dWorldCamera_c::instance = 0; dWorldCamera_c *dWorldCamera_c::build() { - OSReport("Creating WorldCamera\n"); void *buffer = AllocFromGameHeap1(sizeof(dWorldCamera_c)); dWorldCamera_c *c = new(buffer) dWorldCamera_c; - OSReport("Created WorldCamera @ %p\n", c); instance = c; return c; @@ -96,7 +94,6 @@ int dWorldCamera_c::onExecute() { change = true; } if (change) { - OSReport("%f, %f (%f)\n", currentX, currentY, zoomLevel); } } calculateScreenGeometry(); diff --git a/src/koopatlas/hud.cpp b/src/koopatlas/hud.cpp index 183e85f..531c3b1 100644 --- a/src/koopatlas/hud.cpp +++ b/src/koopatlas/hud.cpp @@ -3,12 +3,10 @@ dWMHud_c *dWMHud_c::instance = 0; dWMHud_c *dWMHud_c::build() { - OSReport("Creating WM_Hud\n"); void *buffer = AllocFromGameHeap1(sizeof(dWMHud_c)); dWMHud_c *c = new(buffer) dWMHud_c; - OSReport("Created WM_Hud @ %p\n", c); instance = c; return c; @@ -98,7 +96,6 @@ void dWMHud_c::setPointName() { dKPNode_s *node = dScKoopatlas_c::instance->pathManager.currentNode; if (node->type == dKPNode_s::LEVEL) { - OSReport("Trying level %d-%d\n", node->levelNumber[0], node->levelNumber[1]); dLevelInfo_c *li = &dScKoopatlas_c::instance->levelInfo; dLevelInfo_c::entry_s *entry = li->search(node->levelNumber[0] - 1, node->levelNumber[1] - 1); diff --git a/src/koopatlas/map.cpp b/src/koopatlas/map.cpp index 4600556..258cf7c 100644 --- a/src/koopatlas/map.cpp +++ b/src/koopatlas/map.cpp @@ -6,19 +6,16 @@ //#define DOODAD_DEBUGGING #ifdef TILE_DEBUGGING -#define TileReport OSReport #else inline void TileReport(const char *str, ...) { } #endif #ifdef BOUND_DEBUGGING -#define BoundReport OSReport #else inline void BoundReport(const char *str, ...) { } #endif #ifdef DOODAD_DEBUGGING -#define DoodadReport OSReport #else inline void DoodadReport(const char *str, ...) { } #endif @@ -26,12 +23,10 @@ inline void DoodadReport(const char *str, ...) { } dWMMap_c *dWMMap_c::instance = 0; dWMMap_c *dWMMap_c::build() { - OSReport("Creating WM_Map\n"); void *buffer = AllocFromGameHeap1(sizeof(dWMMap_c)); dWMMap_c *c = new(buffer) dWMMap_c; - OSReport("Created WM_Map @ %p\n", c); instance = c; return c; @@ -45,12 +40,9 @@ dWMMap_c::dWMMap_c() { int dWMMap_c::onCreate() { renderer.allocator.setup(GameHeaps[0], 0x20); - OSReport("Setting up Renderer\n"); bool result = renderer.setup(&renderer.allocator); if (result) - OSReport("Set up Renderer\n"); else - OSReport(":(\n"); bgMatrix.translation(1140.0f, -2910.0f, -500.0f); s16 rot = 0x4000; @@ -135,10 +127,6 @@ void dWMMap_c::renderer_c::beginRendering() { nw4r::g3d::Camera cam3d(GetCameraByID(0)); cam3d.GetCameraMtx(&renderMtx); MTXTransApply(renderMtx, renderMtx, 0, 0, baseZ); - /*OSReport("MTX:\n"); - OSReport("%f, %f, %f, %f:\n", renderMtx[0][0], renderMtx[0][1], renderMtx[0][2], renderMtx[0][3]); - OSReport("%f, %f, %f, %f:\n", renderMtx[1][0], renderMtx[1][1], renderMtx[1][2], renderMtx[1][3]); - OSReport("%f, %f, %f, %f:\n", renderMtx[2][0], renderMtx[2][1], renderMtx[2][2], renderMtx[2][3]);//*/ GXSetCurrentMtx(GX_PNMTX0); diff --git a/src/koopatlas/mapdata.cpp b/src/koopatlas/mapdata.cpp index 5b38126..eaf9c75 100644 --- a/src/koopatlas/mapdata.cpp +++ b/src/koopatlas/mapdata.cpp @@ -40,9 +40,7 @@ dKPMapData_c::~dKPMapData_c() { } bool dKPMapData_c::load(const char *filename) { - OSReport("Loading %s\n", filename); data = (dKPMapFile_s*)m_fileLoader.load(filename); - OSReport("%p\n", data); if (data == 0) return false; @@ -60,7 +58,6 @@ bool dKPMapData_c::loadTilesets() { if (tilesetsLoaded) return true; - OSReport("Loading tilesets: %d\n", data->tilesetCount); if (tilesetLoaders == 0) tilesetLoaders = new dDvdLoader_c[data->tilesetCount]; @@ -68,7 +65,6 @@ bool dKPMapData_c::loadTilesets() { for (int i = 0; i < data->tilesetCount; i++) { char *filename = ((char*)data) + (data->tilesets[i].dummy[3] - 0x10000000); - OSReport("Loading tileset: %s\n", filename); result &= (tilesetLoaders[i].load(filename) != 0); } diff --git a/src/koopatlas/player.cpp b/src/koopatlas/player.cpp index c89535f..709fe43 100644 --- a/src/koopatlas/player.cpp +++ b/src/koopatlas/player.cpp @@ -3,15 +3,12 @@ daWMPlayer_c *daWMPlayer_c::instance; int daWMPlayer_c::onCreate() { - OSReport("* dWMPlayer_c created\n"); - OSReport("Init handler...\n"); this->modelHandler = new dPlayerModelHandler_c(0); this->modelHandler->loadModel(0, 3, 2); this->modelHandler->mdlClass->startAnimation(0, 1.2, 10.0, 0.0); this->modelHandler->setSRT((Vec){0.0,100.0,-100.0}, (S16Vec){0,0,0}, (Vec){2.0,2.0,2.0}); this->modelHandler->draw(); - OSReport("Init done!\n"); pos = (Vec){0.0f,0.0f,3000.0f}; rot = (S16Vec){0,0,0}; @@ -24,7 +21,6 @@ int daWMPlayer_c::onCreate() { int daWMPlayer_c::onDelete() { delete modelHandler; - OSReport("* dWMPlayer_c deleted\n"); return true; } @@ -130,12 +126,10 @@ void daWMPlayer_c::startAnimation(int id, float frame, float unk, float updateRa daWMPlayer_c *daWMPlayer_c::build() { - OSReport("Creating WMPlayer\n"); void *buffer = AllocFromGameHeap1(sizeof(daWMPlayer_c)); daWMPlayer_c *c = new(buffer) daWMPlayer_c; - OSReport("Created WMPlayer @ %p\n", c); instance = c; return c; -- cgit v1.2.3