Latest changes from John.

diff --git a/simgear/scene/sky/clouds3d/SkyArchive.cpp b/simgear/scene/sky/clouds3d/SkyArchive.cpp
index 3ca8e5ef47b757baac3268d84a8aa0debaa01109..30344f374c03bc3da25f08ce4bdcacd6950302a7 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyArchive.cpp
+++ b/simgear/scene/sky/clouds3d/SkyArchive.cpp
@@ -957,7 +957,7 @@ bool SkyArchive::IsEmpty() const
  * @fn SkyArchive::Load(const char* pFileName)
  * @brief Load the contents of a SkyArchive from file storage.
  */ 
-bool SkyArchive::Load(const char* pFileName)
+SKYRESULT SkyArchive::Load(const char* pFileName)
 {
   if (!pFileName) {
     FAIL_RETURN_MSG(SKYRESULT_FAIL, "Error: SkyArchive::Load(): file name is NULL.");
@@ -966,14 +966,14 @@ bool SkyArchive::Load(const char* pFileName)
   if (NULL == (pSrcFile = fopen(pFileName, "rb"))) // file opened successfully   
   {
     SkyTrace("Error: SkyArchive::Load(): failed to open file for reading.");
-    return false;
+    return SKYRESULT_FAIL;
   }
     
   SKYRESULT retVal = _Load(pSrcFile);
   fclose(pSrcFile);
 
   FAIL_RETURN(retVal);
-  return true;
+  return SKYRESULT_OK;
 }
 
 //------------------------------------------------------------------------------

diff --git a/simgear/scene/sky/clouds3d/SkyArchive.hpp b/simgear/scene/sky/clouds3d/SkyArchive.hpp
index 55990c8736324b985faf7572b7891a4f94f0578a..a93dfbf26d582f03cd23bc6af52614698b1038bd 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyArchive.hpp
+++ b/simgear/scene/sky/clouds3d/SkyArchive.hpp
@@ -208,7 +208,7 @@ public:
     SKYRESULT MakeEmpty();
 
     // Loads the contents from a file.
-    bool Load(const char* pFileName);
+    SKYRESULT Load(const char* pFileName);
     
     // Commits the contents of a SkyArchive to file storage.
     SKYRESULT Save(const char* pFileName) const;

diff --git a/simgear/scene/sky/clouds3d/SkyBoundingVolume.hpp b/simgear/scene/sky/clouds3d/SkyBoundingVolume.hpp
index 1e5ee026f207e57401833e84e1e11a57a496983a..4a9e32cb43e364c8965caa7851cc94b56b6538c8 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyBoundingVolume.hpp
+++ b/simgear/scene/sky/clouds3d/SkyBoundingVolume.hpp
@@ -23,8 +23,8 @@
 #ifndef __SKYBOUNDINGVOLUME_HPP__
 #define __SKYBOUNDINGVOLUME_HPP__
 
-#include <vec3f.hpp>
-#include <mat44.hpp>
+#include "vec3f.hpp"
+#include "mat44.hpp"
 
 // forward to reduce unnecessary dependencies
 class Camera;

diff --git a/simgear/scene/sky/clouds3d/SkyCloud.cpp b/simgear/scene/sky/clouds3d/SkyCloud.cpp
index c3cbbd77aa22012c63b306d613f03012240a69d6..cf3574f8dac45573fd865c89be264285d9f3874c 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyCloud.cpp
+++ b/simgear/scene/sky/clouds3d/SkyCloud.cpp
@@ -666,7 +666,8 @@ SKYRESULT SkyCloud::Load(const SkyArchive &archive,
     _particles.push_back(pParticle);
   }
   // this is just a bad hack to align cloud field from skyworks with local horizon at KSFO
-  // we need to develop out own scheme for loading and positioning clouds
+  // this "almost" works not quite the right solution okay to get some up and running
+  // we need to develop our own scheme for loading and positioning clouds
   Mat33f rot_mat;
   Vec3f  moveit;
 
@@ -676,9 +677,9 @@ SKYRESULT SkyCloud::Load(const SkyArchive &archive,
   // flip the y and z axis, clouds now sit in the x-y plane
   Rotate( rot_mat ); 
     
-   // adjust for lon af KSFO           -122.357                                 
-  rot_mat.Set( -0.76604f, 0.64277f, 0.0f,
-                                                -0.64277f, -0.76604f, 0.0f,
+   // adjust for lon af KSFO plus              -122.357                                 
+  rot_mat.Set( -0.84473f, 0.53519f, 0.0f,
+                                                -0.53519f, -0.84473f, 0.0f,
                                                 0.0f, 0.0f, 1.0f);
                                                 
   //Rotate( rot_mat );
@@ -690,7 +691,7 @@ SKYRESULT SkyCloud::Load(const SkyArchive &archive,
    
   Rotate( rot_mat );
     
-  moveit.Set( 0.0, 0.0, 4050.0  );
+  moveit.Set( 1000.0, 0.0, 4050.0  );
   
   Translate( moveit );
   

diff --git a/simgear/scene/sky/clouds3d/SkyRenderableInstance.hpp b/simgear/scene/sky/clouds3d/SkyRenderableInstance.hpp
index 9c09a509a57ac424c2b330c13d5abcb37719ff8d..513dddbadaeaa75451d3de048db1f84a996a3b25 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyRenderableInstance.hpp
+++ b/simgear/scene/sky/clouds3d/SkyRenderableInstance.hpp
@@ -24,8 +24,8 @@
 #define __SKYRENDERABLEINSTANCE_HPP__
 
 #include <vector>
-#include <mat33.hpp>
-#include <mat44.hpp>
+#include "mat33.hpp"
+#include "mat44.hpp"
 #include "SkyUtil.hpp"
 
 // forward to reduce unnecessary dependencies

diff --git a/simgear/scene/sky/clouds3d/SkySceneLoader.cpp b/simgear/scene/sky/clouds3d/SkySceneLoader.cpp
index 4ceac4997607ad2f6d52309a8de97df4ea574e6d..ad9af54671ab519c6c31bc0c5aecd63c0f71792d 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkySceneLoader.cpp
+++ b/simgear/scene/sky/clouds3d/SkySceneLoader.cpp
@@ -121,7 +121,7 @@ bool SkySceneLoader::Load(std::string filename)
       FAIL_RETURN(archive.FindString("CloudFile", &pFilename, i));\r  
       float rScale = 1.0;
       FAIL_RETURN(archive.FindFloat32("CloudScale", &rScale, i));
-      rScale = 20.0;
+      rScale = 30.0;
       SkyArchive cloudArchive;
       FAIL_RETURN(cloudArchive.Load(pFilename));
       FAIL_RETURN(SceneManager::InstancePtr()->LoadClouds(cloudArchive, rScale)); 
@@ -129,7 +129,7 @@ bool SkySceneLoader::Load(std::string filename)
   }
   
   Vec3f dir(0, 0, 1);
-  pLight->SetPosition(Vec3f(3000, 0, 7000));
+  pLight->SetPosition(Vec3f(0, 0, 7000));
   pLight->SetDirection(dir);
   pLight->SetAmbient(Vec4f( 0.0f, 0.0f, 0.0f, 0.0f));
   pLight->SetDiffuse(Vec4f(1.0f, 1.0f, 1.0f, 0.0f));
@@ -146,8 +146,7 @@ bool SkySceneLoader::Load(std::string filename)
 }
 
 void SkySceneLoader::Set_Cloud_Orig( Point3D *posit )
-{ // use this to adjust camera position for a new tile center
-
+{ 
        // set origin for cloud coordinates to initial tile center
        origin = *posit;
        sgdSetVec3( delta, origin[0], origin[1], origin[2]);    
@@ -157,6 +156,12 @@ void SkySceneLoader::Set_Cloud_Orig( Point3D *posit )
 
 void SkySceneLoader::Update( double *view_pos )
 {
+       
+       double wind_x, wind_y, wind_z;
+       wind_x = -0.05; wind_z =  0.05;
+       // just a dumb test to see if we can move the clouds en masse via the camera
+       delta[0] += wind_x; delta[2] += wind_z;
+       
        sgdSubVec3( cam_pos, view_pos, delta );
        //cout << "ORIGIN: " << delta[0] << " " << delta[1] << " " << delta[2] << endl;
        //cout << "CAM   : " << cam_pos[0] << " " << cam_pos[1] << " "  << cam_pos[2] << endl;

diff --git a/simgear/scene/sky/clouds3d/SkySceneManager.cpp b/simgear/scene/sky/clouds3d/SkySceneManager.cpp
index a316f19d45e0aa663f1711200c640d491dbad474..26af872b6c01281c8f64b7a1702e4c03151a358e 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkySceneManager.cpp
+++ b/simgear/scene/sky/clouds3d/SkySceneManager.cpp
@@ -33,8 +33,6 @@
 #include "SkyRenderable.hpp"
 #include "SkyRenderableInstance.hpp"
 #include "SkyRenderableInstanceCloud.hpp"
-//#include "SkyHeavens.hpp"
-//#include "SkyHeightField.hpp"
 
 #include "camutils.hpp"
 #include <algorithm>
@@ -518,7 +516,7 @@ SKYRESULT SkySceneManager::LoadClouds(SkyArchive& cloudArchive, float rScale /*
   SkyArchive subArchive;
        //iNumClouds = 5;  //set this value to reduce cloud field for debugging
   for (int i = 0; i < iNumClouds; ++i)
-  {\rprintf("Loading # %d of %d clouds\n", i, iNumClouds);
+  {\rprintf("Loading # %d of %d clouds\n", i+1, iNumClouds);
     cloudArchive.FindArchive("Cloud", &subArchive, i);
     SkyCloud *pCloud = new SkyCloud();
     pCloud->Load(subArchive, rScale);

diff --git a/simgear/scene/sky/clouds3d/SkyTextureManager.cpp b/simgear/scene/sky/clouds3d/SkyTextureManager.cpp
index 346d7e785b48f5c93756c6bf04757250d1e2d0ee..92f017973e8e3ae39b46eb6ec3b8f6589d917af3 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyTextureManager.cpp
+++ b/simgear/scene/sky/clouds3d/SkyTextureManager.cpp
@@ -872,12 +872,12 @@ SKYRESULT SkyTextureManager::_Create3DTextureObject(SkyTexture &texture,
  * Deletes the data as well as the OpenGL texture ID(s).
  */ 
 void SkyTextureManager::DestroyTextureObject(SkyTexture &texture)
-{
-  /*if (texture.GetID)
+{ /*
+  if (texture.GetID)
     glDeleteTextures(1, &(texture.iTextureID));
   if (texture.bSliced3D && texture.pSliceIDs)
   {
     glDeleteTextures(texture.iDepth, texture.pSliceIDs);
     delete [] texture.pSliceIDs;
-  }*/
+  } */
 }

diff --git a/simgear/scene/sky/clouds3d/SkyTextureState.cpp b/simgear/scene/sky/clouds3d/SkyTextureState.cpp
index e8ee29b2cdeb78d3257da631ec1e020fb137755f..f8a0d1ed8a854a7039d9eb279f46569a703023df 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyTextureState.cpp
+++ b/simgear/scene/sky/clouds3d/SkyTextureState.cpp
@@ -126,7 +126,7 @@ SKYRESULT SkyTextureState::Activate()
       if (pCurrent->GetTextureParameter(i, GL_TEXTURE_WRAP_R) != paramValue) 
       {
         FAIL_RETURN(pCurrent->SetTextureParameter(i, GL_TEXTURE_WRAP_R, paramValue));
-        //glTexParameteri(eTarget, GL_TEXTURE_WRAP_R, paramValue);
+        glTexParameteri(eTarget, GL_TEXTURE_WRAP_R, paramValue);
       }
       //GLVU::CheckForGLError("SkyTextureState::Activate(2)");
       paramValue = GetTextureParameter(i, GL_TEXTURE_MIN_FILTER);

diff --git a/simgear/scene/sky/clouds3d/camera.hpp b/simgear/scene/sky/clouds3d/camera.hpp
index 42a24c89fb5e2aaf1800da14efdb88a6ea87a1b7..4be6d7323a2c4af37a3b3eaafa8e784782dccdfd 100644 (file)
--- a/simgear/scene/sky/clouds3d/camera.hpp
+++ b/simgear/scene/sky/clouds3d/camera.hpp
@@ -31,8 +31,8 @@
 #define CAMERA
 
 #include <stdio.h>
-#include <vec3f.hpp>
-#include <mat16fv.hpp>
+#include "vec3f.hpp"
+#include "mat16fv.hpp"
 
 class Camera
 {

diff --git a/simgear/scene/sky/clouds3d/mat44test.cpp b/simgear/scene/sky/clouds3d/mat44test.cpp
index c99b809ce1365ca1fabc1183c82be63354bf7d81..cdde7f33963d5933125e9067fc45e7736b13533b 100644 (file)
--- a/simgear/scene/sky/clouds3d/mat44test.cpp
+++ b/simgear/scene/sky/clouds3d/mat44test.cpp
@@ -21,8 +21,8 @@
 // $Id$
 //----------------------------------------------------------------------------
 #include <iostream.h>
-#include <vec3f.hpp>
-#include <mat44.hpp>
+#include "vec3f.hpp"
+#include "mat44.hpp"
 
 int main(int argc, char *argv[])
 {