added W2 map definition. updated worldmap_gen.rb a bit

1 files changed, 10 insertions, 8 deletions

diff --git a/src/world_camera.cpp b/src/world_camera.cpp
index 3e1cc6b..5c7c903 100644
--- a/src/world_camera.cpp
+++ b/src/world_camera.cpp
@@ -22,11 +22,11 @@ int dWorldCamera_c::onCreate() {
 	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, 500.0f, 1000.0f};
+	this->camRotate = (Point3d){-40.0f, -30.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
+	//this->camPos = (Point3d){0.0f, -2000.0f, 0.0f};
+	//this->camRotate = (Point3d){-90.0f, 0.0f, 0.0f}; // ZXY order
 
 	return true;
 }
@@ -80,20 +80,22 @@ int dWorldCamera_c::onDraw() {
 	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){0,400,1000});
-	cam3d.SetPosture(posture);
+	cam3d.SetPosture(posture);*/
 
 	return true;
 }