diff options
| author | Treeki <treeki@gmail.com> | 2011-03-16 05:15:57 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2011-03-16 05:15:57 +0100 |
| commit | 938dee99403d750c97452b20831a6c549bbac649 (patch) | |
| tree | 95825fc4c44af6960fa17f8c545dd1dacd549201 /src | |
| parent | 562543f0c7658f11595f37c886861efaf76b5d5a (diff) | |
| download | kamek-938dee99403d750c97452b20831a6c549bbac649.tar.gz kamek-938dee99403d750c97452b20831a6c549bbac649.zip | |
yawn. some work on content, including an embarassingly crappy GW scenegen
Diffstat (limited to 'src')
| -rw-r--r-- | src/world_camera.cpp | 24 | ||||
| -rw-r--r-- | src/worldmap.cpp | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/src/world_camera.cpp b/src/world_camera.cpp index 1fc3a5a..3e1cc6b 100644 --- a/src/world_camera.cpp +++ b/src/world_camera.cpp @@ -18,8 +18,15 @@ dWorldCamera_c *dWorldCamera_c::build() { int dWorldCamera_c::onCreate() { - this->camPos = (Point3d){0.0f, 400.0f, 400.0f}; - this->camRotate = (Point3d){-40.0f, 0.0f, 0.0f}; // ZXY order + this->camPos = (Point3d){58.8f, 1163.7f, 2106.2f}; + this->camRotate = (Point3d){-60.0f, 0.0f, 0.0f}; // ZXY order + //this->camRotate = (Point3d){-40.0f, 0.0f, 0.0f}; // ZXY order + + this->camPos = (Point3d){0.0f, 0.0f, 1000.0f}; + this->camRotate = (Point3d){0.0f, 0.0f, 0.0f}; // ZXY order + + this->camPos = (Point3d){0.0f, -2000.0f, 0.0f}; + this->camRotate = (Point3d){-90.0f, 0.0f, 0.0f}; // ZXY order return true; } @@ -71,23 +78,22 @@ int dWorldCamera_c::onDraw() { cam3d.SetViewportJitter(VIGetNextField()); cam3d.SetPerspective(45, (f32)rmode->viWidth / (f32)rmode->viHeight, 0.1f, 2400.0f); + //cam3d.SetOrtho(rmode->efbHeight, 0.0f, 0.0f, rmode->fbWidth * (IsWideScreen() ? 1.3333334f : 1.0f), -100000.0f, 100000.0f); - nw4r::g3d::Camera::PostureInfo posture; + /*nw4r::g3d::Camera::PostureInfo posture; posture.tp = nw4r::g3d::Camera::POSTURE_ROTATE; posture.cameraRotate = this->camRotate; cam3d.SetPosition(this->camPos); - cam3d.SetPosture(posture); + cam3d.SetPosture(posture);*/ - /*nw4r::g3d::Camera::PostureInfo posture; + nw4r::g3d::Camera::PostureInfo posture; posture.tp = nw4r::g3d::Camera::POSTURE_LOOKAT; posture.cameraUp = (Point3d){0,1,0}; posture.cameraTarget = (Point3d){0,0,0}; - cam3d.SetPosition((Point3d){-3,2,3}); - cam3d.SetPosture(posture);*/ - - //cam3d.GetCameraMtx(&T3D::Camera.view_matrix); + cam3d.SetPosition((Point3d){0,400,1000}); + cam3d.SetPosture(posture); return true; } diff --git a/src/worldmap.cpp b/src/worldmap.cpp index dd027f0..12c3486 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -121,7 +121,7 @@ bool WMInit_EndLoading(void *ptr) { bool WMInit_LoadResources(void *ptr) {
dScNewerWorldMap_c *wm = (dScNewerWorldMap_c*)ptr;
- return wm->resMng.loadSet("SMGoldwood");
+ return wm->resMng.loadSet("MMFullWorld");
}
bool WMInit_SetupWait(void *ptr) {
|