[Gcblue-commits] gcb_wx/src/common AError.cpp,1.8,1.9 math_constants.cpp,1.5,1.6 nsNav.cpp,1.8,1.9 s
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
[Gcblue-commits] gcb_wx/src/common AError.cpp,1.8,1.9 math_constants.cpp,1.5,1.6 nsNav.cpp,1.8,1.9 simmath.cpp,1.29,1.30 tcFile.cpp,1.6,1.7 tcObjStream.cpp,1.2,1.3 tcOggStreamer.cpp,1.18,1.19 tcOptions.cpp,1.18,1.19 tcOptionsView.cpp,1.14,1.15 tcRect.cpp,1.1,1.2 tcSound.cpp,1.34,1.35 tcSoundConsole.cpp,1.14,1.15 tcStream.cpp,1.13,1.14 tcString.cpp,1.4,1.5 util.cpp,1.3,1.4
|
From: Dewitt C. <ddc...@us...> - 2006-03-23 01:11:21
|
Update of /cvsroot/gcblue/gcb_wx/src/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10630/src/common Modified Files: AError.cpp math_constants.cpp nsNav.cpp simmath.cpp tcFile.cpp tcObjStream.cpp tcOggStreamer.cpp tcOptions.cpp tcOptionsView.cpp tcRect.cpp tcSound.cpp tcSoundConsole.cpp tcStream.cpp tcString.cpp util.cpp Log Message: vc8 updates Index: tcSoundConsole.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcSoundConsole.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tcSoundConsole.cpp 2 Jan 2006 15:40:52 -0000 1.14 --- tcSoundConsole.cpp 23 Mar 2006 01:11:01 -0000 1.15 *************** *** 1,5 **** /** @file tcSoundConsole.cpp */ /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,5 ---- /** @file tcSoundConsole.cpp */ /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@gc...) ** All rights reserved. Index: AError.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/AError.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AError.cpp 8 Aug 2004 00:31:33 -0000 1.8 --- AError.cpp 23 Mar 2006 01:11:01 -0000 1.9 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@gc...) ** All rights reserved. Index: tcOggStreamer.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcOggStreamer.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** tcOggStreamer.cpp 8 Apr 2005 01:54:11 -0000 1.18 --- tcOggStreamer.cpp 23 Mar 2006 01:11:01 -0000 1.19 *************** *** 2,6 **** ** @file tcOggStreamer.cpp */ ! /* Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** @file tcOggStreamer.cpp */ ! /* Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...) ** All rights reserved. Index: tcSound.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcSound.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** tcSound.cpp 26 Jul 2005 00:37:03 -0000 1.34 --- tcSound.cpp 23 Mar 2006 01:11:01 -0000 1.35 *************** *** 2,6 **** ** @file tcSound.cpp */ ! /* Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** @file tcSound.cpp */ ! /* Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...) ** All rights reserved. Index: tcRect.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcRect.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcRect.cpp 14 Nov 2004 22:52:20 -0000 1.1 --- tcRect.cpp 23 Mar 2006 01:11:01 -0000 1.2 *************** *** 2,6 **** ** @file tcRect.cpp */ ! /* Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** @file tcRect.cpp */ ! /* Copyright (C) 2003 Dewitt Colclough (de...@gc...) ** All rights reserved. Index: tcString.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcString.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcString.cpp 14 Sep 2004 02:01:46 -0000 1.4 --- tcString.cpp 23 Mar 2006 01:11:01 -0000 1.5 *************** *** 2,6 **** ** tcString.cpp ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcString.cpp ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@gc...) ** All rights reserved. Index: simmath.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/simmath.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** simmath.cpp 10 Sep 2005 21:47:38 -0000 1.29 --- simmath.cpp 23 Mar 2006 01:11:01 -0000 1.30 *************** *** 2,6 **** ** @file simmath.cpp */ ! /* Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** @file simmath.cpp */ ! /* Copyright (C) 2003 Dewitt Colclough (de...@gc...) ** All rights reserved. *************** *** 20,23 **** --- 20,24 ---- */ + #pragma warning (disable : 4996) // 'strdup' was declared deprecated #include "simmath.h" *************** *** 27,30 **** --- 28,32 ---- + void ConformLonLatRad(float &lon_rad, float &lat_rad) { if (lon_rad < -C_PI) {lon_rad = -C_PI;} Index: tcOptionsView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcOptionsView.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tcOptionsView.cpp 27 Jan 2005 01:01:47 -0000 1.14 --- tcOptionsView.cpp 23 Mar 2006 01:11:01 -0000 1.15 *************** *** 2,6 **** ** @file tcOptionsView.cpp */ ! /* Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** @file tcOptionsView.cpp */ ! /* Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...) ** All rights reserved. *************** *** 62,66 **** void tcOptionsView::Draw() { ! static nTestCount = 0; --- 62,66 ---- void tcOptionsView::Draw() { ! static int nTestCount = 0; *************** *** 105,109 **** } ! for(i=0; i<mpOptions->mnNumOptions; i++) { for(int j=0; j<mpOptions->maOptionInfo[i].mnStateCount; j++) --- 105,109 ---- } ! for(int i=0; i<mpOptions->mnNumOptions; i++) { for(int j=0; j<mpOptions->maOptionInfo[i].mnStateCount; j++) *************** *** 242,246 **** mnXStart = 100; ! mnYStart = 150; for(int i=0; i<tcOptions::N_OPTIONS; i++) --- 242,246 ---- mnXStart = 100; ! mnYStart = 100; for(int i=0; i<tcOptions::N_OPTIONS; i++) Index: util.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/util.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** util.cpp 8 Aug 2004 00:31:33 -0000 1.3 --- util.cpp 23 Mar 2006 01:11:01 -0000 1.4 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@gc...) ** All rights reserved. Index: tcStream.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcStream.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tcStream.cpp 10 Sep 2005 21:47:38 -0000 1.13 --- tcStream.cpp 23 Mar 2006 01:11:01 -0000 1.14 *************** *** 2,6 **** ** @file tcStream.cpp ** ! ** Copyright (C) 2004 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** @file tcStream.cpp ** ! ** Copyright (C) 2004 Dewitt Colclough (de...@gc...) ** All rights reserved. Index: tcOptions.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcOptions.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** tcOptions.cpp 20 Jul 2005 16:24:54 -0000 1.18 --- tcOptions.cpp 23 Mar 2006 01:11:01 -0000 1.19 *************** *** 2,6 **** ** @file tcOptions.cpp */ ! /* Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** @file tcOptions.cpp */ ! /* Copyright (C) 2003-2004 Dewitt Colclough (de...@gc...) ** All rights reserved. *************** *** 95,99 **** oi.meType = tsOptionInfo::OT_RADIOBUTTON; oi.mnStateCount = 2; ! oi.mnValue = 1; oi.mpAssociated = &mbUseNTDS; oi.mzCaption[0] = "Icon (2525B) symbols"; --- 95,99 ---- oi.meType = tsOptionInfo::OT_RADIOBUTTON; oi.mnStateCount = 2; ! oi.mnValue = 0; oi.mpAssociated = &mbUseNTDS; oi.mzCaption[0] = "Icon (2525B) symbols"; *************** *** 123,126 **** --- 123,142 ---- oi.mnStateCount = 2; oi.mnValue = 1; + oi.mpAssociated = &terrainShaderOn; + oi.mzCaption[0] = "Terrain shader OFF"; + oi.mzCaption[1] = "Terrain shader ON"; + AddOption(oi); + + oi.meType = tsOptionInfo::OT_RADIOBUTTON; + oi.mnStateCount = 2; + oi.mnValue = 1; + oi.mpAssociated = &shadersOn; + oi.mzCaption[0] = "Shaders OFF"; + oi.mzCaption[1] = "Shaders ON"; + AddOption(oi); + + oi.meType = tsOptionInfo::OT_RADIOBUTTON; + oi.mnStateCount = 2; + oi.mnValue = 1; oi.mpAssociated = &useFarSceneView; oi.mzCaption[0] = "Faster sceneview"; *************** *** 276,280 **** } } ! /******************************************************************************/ tcOptions::tcOptions() { --- 292,299 ---- } } ! ! /** ! * ! */ tcOptions::tcOptions() { *************** *** 305,329 **** } - /* test code - SetOptionString("testOption", "This is a test option 1 2 3"); - fprintf(stdout, "TEST STRING: [%s]\n", GetOptionString("testOption")); - - SetOptionString("testOption", "This is the modified test option 4 5 6"); - fprintf(stdout, "TEST STRING2: [%s]\n", GetOptionString("testOption")); - - TiXmlNode* node = rootNode->InsertEndChild(TiXmlElement("Test")); - node->InsertEndChild(TiXmlText("This is some example text")); - TiXmlNode* testNode = rootNode->FirstChild("Test"); - TiXmlNode* childNode = testNode->FirstChild(); - if (childNode) - { - fprintf(stdout, "TEST VALUE: [%s]\n", childNode->Value()); - } - */ Init(); // initializes binary options data } ! /******************************************************************************/ tcOptions::~tcOptions() { --- 324,334 ---- } Init(); // initializes binary options data } ! /** ! * ! */ tcOptions::~tcOptions() { Index: tcObjStream.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcObjStream.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcObjStream.cpp 17 Apr 2005 22:35:30 -0000 1.2 --- tcObjStream.cpp 23 Mar 2006 01:11:01 -0000 1.3 *************** *** 2,6 **** ** @file tcObjStream.cpp ** ! ** Copyright (C) 2004 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** @file tcObjStream.cpp ** ! ** Copyright (C) 2004 Dewitt Colclough (de...@gc...) ** All rights reserved. Index: tcFile.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcFile.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcFile.cpp 10 Dec 2005 16:52:02 -0000 1.6 --- tcFile.cpp 23 Mar 2006 01:11:01 -0000 1.7 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@gc...) ** All rights reserved. Index: math_constants.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/math_constants.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** math_constants.cpp 1 Jun 2005 00:13:28 -0000 1.5 --- math_constants.cpp 23 Mar 2006 01:11:01 -0000 1.6 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@gc...) ** All rights reserved. Index: nsNav.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/nsNav.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** nsNav.cpp 1 Jun 2005 00:13:28 -0000 1.8 --- nsNav.cpp 23 Mar 2006 01:11:01 -0000 1.9 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@gc...) ** All rights reserved. |
