[Supertuxkart-commit] SF.net SVN: supertuxkart:[4823] main/branches/switch_coordinate_system/src/ tracks/quad_graph.cpp

[<hik...@us...>]

Revision: 4823
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=4823&view=rev
Author:   hikerstk
Date:     2010-02-24 12:10:49 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
Fixed minimap.

Modified Paths:
--------------
    main/branches/switch_coordinate_system/src/tracks/quad_graph.cpp

Modified: main/branches/switch_coordinate_system/src/tracks/quad_graph.cpp
===================================================================
--- main/branches/switch_coordinate_system/src/tracks/quad_graph.cpp	2010-02-24 05:23:00 UTC (rev 4822)
+++ main/branches/switch_coordinate_system/src/tracks/quad_graph.cpp	2010-02-24 12:10:49 UTC (rev 4823)
@@ -489,15 +489,15 @@
     Vec3 center = (bb_max+bb_min)*0.5f;
     core::matrix4 projection;
     projection.buildProjectionMatrixOrthoLH(bb_max.getX()-bb_min.getX(), 
-                                            bb_max.getY()-bb_min.getY(),
-                                            -1, bb_max.getZ()-bb_min.getZ()+1);
+                                            bb_max.getZ()-bb_min.getZ(),
+                                            -1, bb_max.getY()-bb_min.getY()+1);
     camera->setProjectionMatrix(projection, true);
     // Adjust z position by +1 for max, -1 for min - this helps in case that
     // the maximum z coordinate is negative (otherwise the minimap is mirrored)
     // and avoids problems for tracks which have a flat (max z = min z) minimap.
-    camera->setPosition(core::vector3df(center.getX(), bb_max.getZ()+1, center.getY()));
-    camera->setUpVector(core::vector3df(0,0,1));
-    camera->setTarget(core::vector3df(center.getX(),bb_min.getZ()-1,center.getY()));
+    camera->setPosition(core::vector3df(center.getX(), bb_max.getY()+1, center.getZ()));
+    camera->setUpVector(core::vector3df(0, 0, 1));
+    camera->setTarget(core::vector3df(center.getX(),bb_min.getY()-1,center.getZ()));
     
     video::ITexture *texture = rttProvider.renderToTexture();
     
@@ -505,7 +505,7 @@
     irr_driver->removeCameraSceneNode(camera);
     m_min_coord = bb_min;
     m_scaling.setX(dimension.Width/(bb_max.getX()-bb_min.getX()));
-    m_scaling.setY(dimension.Width/(bb_max.getY()-bb_min.getY()));
+    m_scaling.setZ(dimension.Width/(bb_max.getZ()-bb_min.getZ()));
     return texture;
 }   // drawMiniMap
 
@@ -519,6 +519,6 @@
 void QuadGraph::mapPoint2MiniMap(const Vec3 &xyz,Vec3 *draw_at) const
 {
     draw_at->setX((xyz.getX()-m_min_coord.getX())*m_scaling.getX());
-    draw_at->setY((xyz.getY()-m_min_coord.getY())*m_scaling.getY());
+    draw_at->setY((xyz.getZ()-m_min_coord.getZ())*m_scaling.getZ());
 
 }   // mapPoint


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.