Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv7214/Source
Modified Files:
CSPSim.cpp TerrainObject.cpp VirtualScene.cpp
Log Message:
Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** CSPSim.cpp 23 Jul 2003 01:28:58 -0000 1.34
--- CSPSim.cpp 23 Jul 2003 07:11:57 -0000 1.35
***************
*** 275,278 ****
--- 275,285 ----
assert(m_Terrain.valid());
m_Terrain->activate();
+
+ // configure the atmosphere for the theater location
+ // this affects mean temperatures, and should not need
+ // to be updated for motion within a given theater.
+ double lat = m_Terrain->getCenter().latitude();
+ double lon = m_Terrain->getCenter().longitude();
+ m_Atmosphere.setPosition(lat, lon);
CSP_LOG(APP, DEBUG, "INIT:: scene");
***************
*** 305,308 ****
--- 312,316 ----
// create a test object (other objects can be created via TestObjects.py)
+ #if 0
CSP_LOG(APP, DEBUG, "INIT:: test vehicle");
***************
*** 337,340 ****
--- 345,349 ----
setActiveObject(ao);
+ #endif
CSP_LOG(APP, DEBUG, "INIT:: gamescreen");
***************
*** 456,463 ****
initTime(date);
- // XXX move this elsewhere
- double lat = simdata::DegreesToRadians(g_Config.getFloat("Testing", "Latitude", 0, true));
- double lon = simdata::DegreesToRadians(g_Config.getFloat("Testing", "Longitude", 0, true));
- m_Atmosphere.setPosition(lat, lon);
m_Atmosphere.setDate(date);
m_Atmosphere.reset();
--- 465,468 ----
Index: TerrainObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/TerrainObject.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TerrainObject.cpp 30 Jun 2003 22:27:57 -0000 1.18
--- TerrainObject.cpp 23 Jul 2003 07:11:57 -0000 1.19
***************
*** 54,57 ****
--- 54,58 ----
m_Width = 0;
m_Height = 0;
+ m_Version = 0;
}
***************
*** 63,66 ****
--- 64,69 ----
{
Object::pack(p);
+ p.pack(m_Name);
+ p.pack(m_Version);
p.pack(m_Center);
p.pack(m_Width);
***************
*** 71,74 ****
--- 74,79 ----
{
Object::unpack(p);
+ p.unpack(m_Name);
+ p.unpack(m_Version);
p.unpack(m_Center);
p.unpack(m_Width);
***************
*** 78,83 ****
void TerrainObject::postCreate() {
! CSP_LOG(TERRAIN, INFO, "Terrain Center @ " << getCenter().asString());
! CSP_LOG(TERRAIN, INFO, "Terrain Size " << getWidth() << " x " << getHeight() << " m");
m_Map.set(getCenter(), getWidth(), getHeight());
}
--- 83,89 ----
void TerrainObject::postCreate() {
! CSP_LOG(TERRAIN, INFO, "Terrain " << m_Name << " (version " << m_Version << ")");
! CSP_LOG(TERRAIN, INFO, " center = " << getCenter().asString());
! CSP_LOG(TERRAIN, INFO, " size = " << getWidth() << " x " << getHeight() << " m");
m_Map.set(getCenter(), getWidth(), getHeight());
}
Index: VirtualScene.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/VirtualScene.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** VirtualScene.cpp 30 Jun 2003 22:27:57 -0000 1.9
--- VirtualScene.cpp 23 Jul 2003 07:11:57 -0000 1.10
***************
*** 417,432 ****
static float t = 0.0;
- /*
- // temporary testing purposes only
- static bool init = false;
- static float lat = 0.0;
- static float lon = 0.0;
- if (!init) {
- lat = simdata::DegreesToRadians(g_Config.getFloat("Testing", "Latitude", 0, true));
- lon = simdata::DegreesToRadians(g_Config.getFloat("Testing", "Longitude", 0, true));
- init = true;
- }
- */
-
if (m_SpinTheWorld || m_ResetTheWorld || (int(t) % 10) == 0 ||
(m_SkyPoint - m_Origin).LengthSquared() > 25.0e+6) {
--- 417,420 ----
***************
*** 443,447 ****
m_Sky->update(0.0, 0.0, CSPSim::theSim->getCurrentTime());
}
- //m_Sky->update(lat, lon, CSPSim::theSim->getCurrentTime());
// greenwich, england (for testing)
//m_Sky->update(0.8985, 0.0, CSPSim::theSim->getCurrentTime());
--- 431,434 ----
|
