Code reorganization.

[flightgear.git] / src / Main / views.cxx

diff --git a/src/Main/views.cxx b/src/Main/views.cxx
index 275bc3cc9e5700bdc0469a5e173fab9c74ae700b..3e64dc912e329bfdaec054fb1c4d9f48250b2a32 100644 (file)
--- a/src/Main/views.cxx
+++ b/src/Main/views.cxx
@@ -3,7 +3,7 @@
 //
 // Written by Curtis Olson, started August 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  Curtis L. Olson  - curt@flightgear.org
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -26,15 +26,16 @@
 #  include <config.h>
 #endif
 
-#include <ssg.h>               // plib include
+#include <plib/ssg.h>          // plib include
+
+#include <simgear/logstream.hxx>
+#include <simgear/constants.h>
+#include <simgear/point3d.hxx>
+#include <simgear/polar3d.hxx>
+#include <simgear/vector.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Cockpit/panel.hxx>
-#include <Debug/logstream.hxx>
-#include <Include/fg_constants.h>
-#include <Math/point3d.hxx>
-#include <Math/polar3d.hxx>
-#include <Math/vector.hxx>
 #include <Scenery/scenery.hxx>
 #include <Time/fg_time.hxx>
 
@@ -136,6 +137,7 @@ static void print_sgMat4( sgMat4 &in) {
 
 // Update the view parameters
 void FGView::UpdateViewMath( const FGInterface& f ) {
+
     Point3D p;
     sgVec3 v0, minus_z, sgvec, forward;
     sgMat4 VIEWo, TMP;
@@ -251,6 +253,14 @@ void FGView::UpdateViewMath( const FGInterface& f ) {
 
     sgMultMat4( VIEW, VIEW_ROT, TRANS );
 
+//!!!!!!!!!!!!!!!!!!!  
+    // THIS IS THE EXPERIMENTAL VIEWING ANGLE SHIFTER
+    // THE MAJORITY OF THE WORK IS DONE IN GUI.CXX
+    // this in gui.cxx for now just testing
+       extern float quat_mat[4][4];
+       sgPreMultMat4( VIEW, quat_mat);
+// !!!!!!!!!! testing  
+
     sgSetVec3( sgvec, 0.0, 0.0, 1.0 );
     sgXformVec3( forward, sgvec, VIEWo );
     // cout << "forward = " << forward[0] << ","