diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wm_map.cpp | 126 | ||||
| -rw-r--r-- | src/wm_map.h | 12 |
2 files changed, 0 insertions, 138 deletions
diff --git a/src/wm_map.cpp b/src/wm_map.cpp index c84ff18..1fa4065 100644 --- a/src/wm_map.cpp +++ b/src/wm_map.cpp @@ -1,114 +1,4 @@ #include "worldmap.h" -#include <rvl/PPCWGPipe.h> -#include <rvl/GXEnum.h> -#include <rvl/GXCull.h> -#include <rvl/GXVert.h> -#include <rvl/GXTev.h> -#include <rvl/GXGeometry.h> -#include <rvl/GXTexture.h> -#include <rvl/GXLighting.h> -#include <rvl/GXPixel.h> -#include <rvl/GXTransform.h> - -void dPathTest_c::loadTex() { - nw4r::g3d::ResFile rf(dScNewerWorldMap_c::instance->resMng['3D00']); - resTex = rf.GetResTex("W2Road"); - alpha = 255; -} - -void dPathTest_c::drawOpa() { } - -void dPathTest_c::drawXlu() { - GXClearVtxDesc(); - GXSetVtxDesc(GX_VA_POS, GX_DIRECT); - GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); - GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); - GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0); - - m3d::DisableIndirectTexturing(); - - GXSetNumChans(0); - - GXSetNumTexGens(1); - //GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_NRM, GX_IDENTITY, GX_FALSE, GX_PTIDENTITY); - GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY); - - GXSetNumTevStages(0); - GXSetTevSwapModeTable(GX_TEV_SWAP0, GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA); - - GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); - GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C1, GX_CC_C0, GX_CC_TEXC, GX_CC_ZERO); - GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C1, GX_CC_C0, GX_CC_C0, GX_CC_ZERO); - GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); - GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_A0, GX_CA_TEXA, GX_CA_ZERO); - GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_A0, GX_CA_A1, GX_CA_ZERO); - GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); - //GXSetTevOp(GX_TEVSTAGE0, GX_PASSCLR); - - GXSetZCompLoc(0); - GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_SET); - GXSetZMode(GX_TRUE, GX_LEQUAL, GX_FALSE); - GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_AND, GX_ALWAYS, 0); - - GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, (GXColor){0,0,0,0}); - GXSetFogRangeAdj(0, 0, 0); - - GXSetCullMode(GX_CULL_NONE); - GXSetDither(GX_TRUE); - - GXSetTevColor(GX_TEVREG0, (GXColor){128,128,128,128}); - GXSetTevColor(GX_TEVREG1, (GXColor){128,128,128,128}); - - nw4r::g3d::Camera cam(GetCameraByID(GetCurrentCameraID())); - Mtx camMtx; - cam.GetCameraMtx(&camMtx); - //MTXInverse(camMtx, camMtx); - - Mtx viewMatrix; - getViewMatrix(&viewMatrix); - - //camMtx[0][3] = 0.0f; - //camMtx[1][3] = 0.0f; - //camMtx[2][3] = 0.0f; - - //MTXConcat(viewMatrix, camMtx, viewMatrix); - - // TESTING CRAP!! - // Just copying what my old 3D engine had for now - GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_SET); - GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); - GXSetZCompLoc(GX_TRUE); - GXSetNumTevStages(1); - GXSetTevSwapMode(GX_TEVSTAGE0, GX_TEV_SWAP0, GX_TEV_SWAP0); - GXSetTevSwapMode(GX_TEVSTAGE1, GX_TEV_SWAP0, GX_TEV_SWAP0); - GXSetNumChans(1); - //GXSetChanAmbColor(GX_COLOR0A0, (GXColor){128,128,128,255}); - GXSetChanMatColor(GX_COLOR0A0, (GXColor){0,0,0,(u8)alpha}); - GXSetChanCtrl(GX_COLOR0A0, GX_DISABLE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_CLAMP, GX_AF_NONE); - GXSetNumTexGens(1); - GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); - GXSetTevOp(GX_TEVSTAGE0, GX_BLEND); - - GXTexObj to; - m3d::InitTexObjWithResTex(&to, &resTex, GX_REPEAT, GX_REPEAT, GX_LINEAR, GX_LINEAR); - GXLoadTexObj(&to, GX_TEXMAP0); - - GXLoadPosMtxImm(camMtx, GX_PNMTX0); - GXSetCurrentMtx(GX_PNMTX0); - - GXBegin(GX_QUADS, GX_VTXFMT0, 4); - GXPosition3f32(-400, 90, -400); - GXTexCoord2f32(0, 0); - GXPosition3f32(400, 90, -400); - GXTexCoord2f32(1, 0); - GXPosition3f32(400, 90, 400); - GXTexCoord2f32(1, 1); - GXPosition3f32(-400, 90, 400); - GXTexCoord2f32(0, 1); - GXEnd(); -} - - dWMMap_c *dWMMap_c::instance = 0; @@ -155,10 +45,6 @@ int dWMMap_c::onCreate() { node->loadFrom(nodeData, &allocator); } - SpammyReport("Making path test\n"); - pathTest.loadTex(); - pathTest.setup(&allocator); - SpammyReport("Unlinking allocator\n"); allocator.unlink(); @@ -169,22 +55,11 @@ int dWMMap_c::onCreate() { int dWMMap_c::onDelete() { delete[] nodes; - - pathTest.free(); - return true; } int dWMMap_c::onExecute() { - /* TESTING */ - int heldButtons = Remocon_GetButtons(GetActiveRemocon()); - if (heldButtons & WPAD_UP) - pathTest.alpha += 8; - if (heldButtons & WPAD_DOWN) - pathTest.alpha -= 8; - nodes[0].updateAlpha("World2_PathsSinkytoPyramid", pathTest.alpha); - return true; } @@ -192,7 +67,6 @@ int dWMMap_c::onExecute() { int dWMMap_c::onDraw() { SpammyReport("dWMMap_c::onDraw() called\n"); - //pathTest.scheduleForDrawing(); for (int i = 0; i < data->nodeCount; i++) { SpammyReport("Drawing node %d\n", i); nodes[i].draw(); diff --git a/src/wm_map.h b/src/wm_map.h index da392bf..651c071 100644 --- a/src/wm_map.h +++ b/src/wm_map.h @@ -30,16 +30,6 @@ public: void updateAlpha(const char *materialName, u8 alpha); }; -class dPathTest_c : public m3d::proc_c { -public: - void loadTex(); - void drawOpa(); - void drawXlu(); - - void *resTex; - u8 alpha; -}; - class dWMMap_c : public dBase_c { public: @@ -50,8 +40,6 @@ public: mHeapAllocator_c allocator; - dPathTest_c pathTest; - WMSceneDataHeader *data; WMSceneNode *nodes; |