Menu
▾
▴
csp-commits — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(140) |
Feb
(98) |
Mar
(152) |
Apr
(104) |
May
(71) |
Jun
(94) |
Jul
(169) |
Aug
(83) |
Sep
(47) |
Oct
(134) |
Nov
(7) |
Dec
(20) |
| 2004 |
Jan
(41) |
Feb
(14) |
Mar
(42) |
Apr
(47) |
May
(68) |
Jun
(143) |
Jul
(65) |
Aug
(29) |
Sep
(40) |
Oct
(34) |
Nov
(33) |
Dec
(97) |
| 2005 |
Jan
(29) |
Feb
(30) |
Mar
(9) |
Apr
(37) |
May
(13) |
Jun
(31) |
Jul
(22) |
Aug
(23) |
Sep
|
Oct
(37) |
Nov
(34) |
Dec
(117) |
| 2006 |
Jan
(48) |
Feb
(6) |
Mar
(2) |
Apr
(71) |
May
(10) |
Jun
(16) |
Jul
(7) |
Aug
(1) |
Sep
(14) |
Oct
(17) |
Nov
(25) |
Dec
(26) |
| 2007 |
Jan
(8) |
Feb
(2) |
Mar
(7) |
Apr
(26) |
May
|
Jun
(12) |
Jul
(30) |
Aug
(14) |
Sep
(9) |
Oct
(4) |
Nov
(7) |
Dec
(6) |
| 2008 |
Jan
(10) |
Feb
(10) |
Mar
(6) |
Apr
(8) |
May
|
Jun
(10) |
Jul
(18) |
Aug
(15) |
Sep
(16) |
Oct
(5) |
Nov
(3) |
Dec
(10) |
| 2009 |
Jan
(11) |
Feb
(2) |
Mar
|
Apr
(15) |
May
(31) |
Jun
(18) |
Jul
(11) |
Aug
(26) |
Sep
(52) |
Oct
(17) |
Nov
(4) |
Dec
|
| 2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@ww...> - 2005-12-11 07:21:04
|
Author: mkrose Date: 2005-12-10 23:20:54 -0800 (Sat, 10 Dec 2005) New Revision: 1753 Modified: trunk/CSP/csp/csplib/util/Trace.h Log: More import/export tweaks for windows. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1753 Modified: trunk/CSP/csp/csplib/util/Trace.h =================================================================== --- trunk/CSP/csp/csplib/util/Trace.h 2005-12-11 06:57:53 UTC (rev 1752) +++ trunk/CSP/csp/csplib/util/Trace.h 2005-12-11 07:20:54 UTC (rev 1753) @@ -83,30 +83,30 @@ public: /** Install segv, abort, and sigterm handlers. */ - static CSPLIB_EXPORT bool install(); + static bool install(); /** Set the logstream used by the signal handlers to log stack traces. */ - static CSPLIB_EXPORT void setLog(LogStream &log); + static void setLog(LogStream &log); /** Disable the abort signal handler. There is no way to reenable the * handler. This is intended to be used before intentionally calling * abort after all relevant information has already been logged. */ - static CSPLIB_EXPORT void inhibitAbortHandler() { _abort = false; } + static void inhibitAbortHandler() { _abort = false; } private: // signal handlers. - static CSPLIB_EXPORT void __sigterm(int /*sig_n*/); - static CSPLIB_EXPORT void __sigsegv(int /*sig_n*/); - static CSPLIB_EXPORT void __sigabort(int /*sig_n*/); + static void __sigterm(int /*sig_n*/); + static void __sigsegv(int /*sig_n*/); + static void __sigabort(int /*sig_n*/); - static CSPLIB_EXPORT LogStream *log(); + static LogStream *log(); - static CSPLIB_EXPORT StackTrace _trace; - static CSPLIB_EXPORT LogStream *_log; - static CSPLIB_EXPORT char *_reserve; - static CSPLIB_EXPORT bool _abort; + static StackTrace _trace; + static LogStream *_log; + static char *_reserve; + static bool _abort; }; CSP_NAMESPACE_END |
|
From: <sv...@ww...> - 2005-12-11 06:58:00
|
Author: mkrose Date: 2005-12-10 22:57:53 -0800 (Sat, 10 Dec 2005) New Revision: 1752 Modified: trunk/CSP/csp/csplib/util/Properties.h Log: Export NonConstructable. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1752 Modified: trunk/CSP/csp/csplib/util/Properties.h =================================================================== --- trunk/CSP/csp/csplib/util/Properties.h 2005-12-11 06:56:17 UTC (rev 1751) +++ trunk/CSP/csp/csplib/util/Properties.h 2005-12-11 06:57:53 UTC (rev 1752) @@ -46,7 +46,7 @@ /** Inheritable property for classes that cannot be (publicly) constructed. */ -class NonConstructable: public NonCopyable { +class CSPLIB_EXPORT NonConstructable: public NonCopyable { private: NonConstructable(); }; |
|
From: <sv...@ww...> - 2005-12-11 06:56:24
|
Author: mkrose Date: 2005-12-10 22:56:17 -0800 (Sat, 10 Dec 2005) New Revision: 1751 Modified: trunk/CSP/csp/csplib/util/Trace.h Log: Fix export macros. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1751 Modified: trunk/CSP/csp/csplib/util/Trace.h =================================================================== --- trunk/CSP/csp/csplib/util/Trace.h 2005-12-11 06:53:16 UTC (rev 1750) +++ trunk/CSP/csp/csplib/util/Trace.h 2005-12-11 06:56:17 UTC (rev 1751) @@ -43,7 +43,7 @@ /** A class that can acquire, store, and display a stack trace. */ -CSPLIB_EXPORT class StackTrace { +class CSPLIB_EXPORT StackTrace { public: StackTrace(); ~StackTrace(); @@ -79,7 +79,7 @@ /** Static methods for installing signal handlers that log stack traces. */ -CSPLIB_EXPORT class AutoTrace: public NonConstructable { +class CSPLIB_EXPORT AutoTrace: public NonConstructable { public: /** Install segv, abort, and sigterm handlers. */ |
|
From: <sv...@ww...> - 2005-12-11 06:53:23
|
Author: mkrose Date: 2005-12-10 22:53:16 -0800 (Sat, 10 Dec 2005) New Revision: 1750 Modified: trunk/CSP/csp/csplib/numeric/NumericalMethod.cpp trunk/CSP/csp/csplib/numeric/Vector.h trunk/CSP/csp/csplib/thread/AtomicCounter.h trunk/CSP/csp/csplib/thread/Synchronization.h trunk/CSP/csp/csplib/thread/Thread.h trunk/CSP/csp/csplib/util/Modules.cpp trunk/CSP/csp/csplib/util/Testing.cpp Log: More min/max macro killing. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1750 Diff omitted (12282 bytes). |
|
From: <sv...@ww...> - 2005-12-11 06:43:17
|
Author: mkrose Date: 2005-12-10 22:43:06 -0800 (Sat, 10 Dec 2005) New Revision: 1749 Modified: trunk/CSP/csp/csplib/numeric/Vector.h Log: Fix unqualified namespace. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1749 Modified: trunk/CSP/csp/csplib/numeric/Vector.h =================================================================== --- trunk/CSP/csp/csplib/numeric/Vector.h 2005-12-11 06:35:43 UTC (rev 1748) +++ trunk/CSP/csp/csplib/numeric/Vector.h 2005-12-11 06:43:06 UTC (rev 1749) @@ -256,9 +256,9 @@ CSP_NAMESPACE_END -template<typename T> std::ostream &operator<<(std::ostream& lhs, const numeric::Vector<T>& rhs) { +template<typename T> std::ostream &operator<<(std::ostream& lhs, const CSP(numeric::Vector<T>)& rhs) { if (!rhs.empty()) { - typename numeric::Vector<T>::cvi iBegin = rhs.begin(); + typename CSP(numeric::Vector<T>)::cvi iBegin = rhs.begin(); lhs << "(" << *iBegin; std::for_each(iBegin+1,rhs.end(),PrintElement<T>(lhs)); lhs << ") "; |
|
From: <sv...@ww...> - 2005-12-11 06:35:50
|
Author: mkrose Date: 2005-12-10 22:35:43 -0800 (Sat, 10 Dec 2005) New Revision: 1748 Modified: trunk/CSP/csp/csplib/net/NetworkInterface.cpp trunk/CSP/csp/csplib/net/NetworkNode.h trunk/CSP/csp/csplib/net/Sockets.h Log: Be more aggressive about removing min/max macros under win32. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1748 Modified: trunk/CSP/csp/csplib/net/NetworkInterface.cpp =================================================================== --- trunk/CSP/csp/csplib/net/NetworkInterface.cpp 2005-12-11 06:32:03 UTC (rev 1747) +++ trunk/CSP/csp/csplib/net/NetworkInterface.cpp 2005-12-11 06:35:43 UTC (rev 1748) @@ -45,6 +45,14 @@ #endif #include <cc++/network.h> #include <cc++/thread.h> +#ifdef _WIN32 +# ifdef min +# undef min +# endif +# ifdef max +# undef max +# endif +#endif #include <string.h> #include <sys/types.h> Modified: trunk/CSP/csp/csplib/net/NetworkNode.h =================================================================== --- trunk/CSP/csp/csplib/net/NetworkNode.h 2005-12-11 06:32:03 UTC (rev 1747) +++ trunk/CSP/csp/csplib/net/NetworkNode.h 2005-12-11 06:35:43 UTC (rev 1748) @@ -39,6 +39,12 @@ #ifdef _WIN32 # pragma warning(pop) +# ifdef min +# undef min +# endif +# ifdef max +# undef max +# endif #endif #include <string> Modified: trunk/CSP/csp/csplib/net/Sockets.h =================================================================== --- trunk/CSP/csp/csplib/net/Sockets.h 2005-12-11 06:32:03 UTC (rev 1747) +++ trunk/CSP/csp/csplib/net/Sockets.h 2005-12-11 06:35:43 UTC (rev 1748) @@ -37,6 +37,12 @@ #ifdef _WIN32 # pragma warning(pop) +# ifdef min +# undef min +# endif +# ifdef max +# undef max +# endif #endif CSP_NAMESPACE |
|
From: <sv...@ww...> - 2005-12-11 06:32:11
|
Author: mkrose Date: 2005-12-10 22:32:03 -0800 (Sat, 10 Dec 2005) New Revision: 1747 Added: trunk/CSP/csp/cspsim/Export.h Modified: trunk/CSP/csp/csplib/data/Archive.h trunk/CSP/csp/csplib/data/DataArchive.h trunk/CSP/csp/csplib/data/DataManager.h trunk/CSP/csp/csplib/data/Date.h trunk/CSP/csp/csplib/data/Enum.h trunk/CSP/csp/csplib/data/External.h trunk/CSP/csp/csplib/data/GeoPos.h trunk/CSP/csp/csplib/data/InterfaceProxy.h trunk/CSP/csp/csplib/data/Key.h trunk/CSP/csp/csplib/data/LUT.cpp trunk/CSP/csp/csplib/data/LUT.h trunk/CSP/csp/csplib/data/Link.h trunk/CSP/csp/csplib/data/Matrix3.h trunk/CSP/csp/csplib/data/Object.h trunk/CSP/csp/csplib/data/Path.h trunk/CSP/csp/csplib/data/Quat.h trunk/CSP/csp/csplib/data/Real.h trunk/CSP/csp/csplib/data/TypeAdapter.h trunk/CSP/csp/csplib/data/Vector3.h trunk/CSP/csp/csplib/net/TaggedRecordRegistry.h trunk/CSP/csp/csplib/thread/AtomicCounter.h trunk/CSP/csp/csplib/thread/Synchronization.h trunk/CSP/csp/csplib/util/Exception.h trunk/CSP/csp/csplib/util/Export.h trunk/CSP/csp/csplib/util/FileUtility.h trunk/CSP/csp/csplib/util/HashUtility.h trunk/CSP/csp/csplib/util/LogStream.cpp trunk/CSP/csp/csplib/util/LogStream.h trunk/CSP/csp/csplib/util/Noise.h trunk/CSP/csp/csplib/util/Properties.h trunk/CSP/csp/csplib/util/Random.h trunk/CSP/csp/csplib/util/Ref.h trunk/CSP/csp/csplib/util/Referenced.h trunk/CSP/csp/csplib/util/Testing.h trunk/CSP/csp/csplib/util/Timing.h trunk/CSP/csp/csplib/util/Trace.h trunk/CSP/csp/cspsim/ObjectModel.h trunk/CSP/csp/cspsim/theater/ElevationCorrection.h trunk/CSP/csp/cspsim/theater/LayoutTransform.h Log: Change CSP_EXPORT to CSPLIB_EXPORT and CSPSIM_EXPORT, since these are separate shared libraries. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1747 Diff omitted (44494 bytes). |
|
From: <sv...@ww...> - 2005-12-11 06:31:56
|
Author: mkrose Date: 2005-12-10 22:31:49 -0800 (Sat, 10 Dec 2005) New Revision: 1746 Modified: trunk/CSP/csp/csplib/thread/Thread.h Log: Remove thread dependence on Conditional (replaced with Event). Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1746 Modified: trunk/CSP/csp/csplib/thread/Thread.h =================================================================== --- trunk/CSP/csp/csplib/thread/Thread.h 2005-12-11 05:56:56 UTC (rev 1745) +++ trunk/CSP/csp/csplib/thread/Thread.h 2005-12-11 06:31:49 UTC (rev 1746) @@ -168,18 +168,18 @@ void setDetached() { m_detached = true; } /** Join this task's thread by for an internal condition variable that - * signals on exit. Used via ThreadBase. + * signals on exit. Used via Thread. * * @param timeout the maximum time in seconds to wait for the task to finish. * @return true if the task ended, false if the timeout expired. */ bool join(double timeout) { - return m_exit.wait(timeout, false); + return m_exit.wait(timeout); } struct StartAndFinish { StartAndFinish(Task &task): m_task(task) { m_task.m_running = true; } - ~StartAndFinish() { m_task.m_complete = true; m_task.m_exit.signalAll(); } + ~StartAndFinish() { m_task.m_complete = true; m_task.m_exit.signal(); } Task &m_task; }; @@ -192,7 +192,7 @@ bool m_detached; bool m_complete; bool m_abort; - Conditional m_exit; + Event m_exit; }; |
|
From: <sv...@ww...> - 2005-12-11 05:57:07
|
Author: mkrose Date: 2005-12-10 21:56:56 -0800 (Sat, 10 Dec 2005) New Revision: 1745 Modified: trunk/CSP/csp/csplib/thread/Synchronization.h trunk/CSP/csp/csplib/thread/ThreadQueue.h Log: Comment out the Conditional wrapper since cc++ does not implement it on win32. Clean up ThreadQueue to use the new synchronization wrappers, but since it relies on Conditional it is not currently usable. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1745 Modified: trunk/CSP/csp/csplib/thread/Synchronization.h =================================================================== --- trunk/CSP/csp/csplib/thread/Synchronization.h 2005-12-10 20:01:31 UTC (rev 1744) +++ trunk/CSP/csp/csplib/thread/Synchronization.h 2005-12-11 05:56:56 UTC (rev 1745) @@ -146,6 +146,13 @@ }; +// CC++ does not yet implement Conditional on win32, so it has been disabled +// here. For more information on the difficulty of implementing condition +// variables using win32 threading primitives, see +// http://www.cs.wustl.edu/~schmidt/win32-cv-1.html and +// http://www.cs.wustl.edu/~schmidt/win32-cv-2.html + +#if 0 /** Thin wrapper for cc++ Conditional. Condition variables provide a signaling * mechanism to synchronize multiple threads. Each condition variable is * associated with a mutex. A thread first locks the mutex, then waits on the @@ -207,6 +214,9 @@ private: ost::Conditional m_cond; }; +#else +class CSP_EXPORT Conditional {}; +#endif /** A thin wrapper around cc++ Event. Modified: trunk/CSP/csp/csplib/thread/ThreadQueue.h =================================================================== --- trunk/CSP/csp/csplib/thread/ThreadQueue.h 2005-12-10 20:01:31 UTC (rev 1744) +++ trunk/CSP/csp/csplib/thread/ThreadQueue.h 2005-12-11 05:56:56 UTC (rev 1745) @@ -73,7 +73,7 @@ m_notFull.unlock(); throw Full(); } - m_notFull.wait(); + m_notFull.wait(0, true); } pushItem(item); m_notFull.unlock(); @@ -94,7 +94,7 @@ m_notEmpty.unlock(); return false; } - m_notEmpty.wait(); + m_notEmpty.wait(0, true); } item = popItem(); m_notEmpty.unlock(); @@ -112,7 +112,7 @@ bool get(TYPE &item, double timeout) { m_notEmpty.lock(); while (empty()) { - if (!m_notEmpty.wait(timeout)) { + if (!m_notEmpty.wait(timeout, true)) { m_notEmpty.unlock(); return false; } @@ -128,8 +128,7 @@ * * @param maxsize the upper limit on the size of the queue; or zero for no limit. */ - ThreadSafeQueueBase(int maxsize) - : m_mutex(), m_notEmpty(m_mutex), m_notFull(m_mutex), m_maxsize(maxsize) {} + ThreadSafeQueueBase(int maxsize): m_maxsize(maxsize) {} /** Destructor. */ @@ -144,9 +143,8 @@ virtual TYPE popItem() = 0; private: - ThreadMutex m_mutex; - ThreadCondition m_notEmpty; - ThreadCondition m_notFull; + Conditional m_notEmpty; + Conditional m_notFull; int m_maxsize; }; |
|
From: <sv...@ww...> - 2005-12-10 20:01:39
|
Author: mkrose Date: 2005-12-10 12:01:31 -0800 (Sat, 10 Dec 2005) New Revision: 1744 Added: trunk/CSP/csp/setup.py trunk/CSP/csp/tools/csp.bootstrap Removed: trunk/CSP/csp/tools/CSP_bootstrap Log: New bootstrap loader to work with lowercase "csp" directory. Should be backwards compatible with "CSP". Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1744 Diff omitted (11232 bytes). |
|
From: <sv...@ww...> - 2005-12-10 19:16:50
|
Author: mkrose Date: 2005-12-10 11:16:42 -0800 (Sat, 10 Dec 2005) New Revision: 1743 Added: trunk/CSP/csp/tools/runtests.py Modified: trunk/CSP/csp/SConstruct trunk/CSP/csp/csplib/SConscript trunk/CSP/csp/cspsim/SConscript trunk/CSP/csp/tools/build.py Log: Simplify the scons scripts and add initial support for windows builds under scons. Needs much testing. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1743 Diff omitted (26164 bytes). |
|
From: <sv...@ww...> - 2005-12-10 17:54:37
|
Author: mkrose Date: 2005-12-10 09:54:27 -0800 (Sat, 10 Dec 2005) New Revision: 1742 Added: trunk/CSP/csp/cspsim/DamageModifier.cpp Removed: trunk/CSP/csp/cspsim/theater/DamageModifier.cpp Log: Move DamageModifier source to the correct directory (the header was already there). Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1742 Copied: trunk/CSP/csp/cspsim/DamageModifier.cpp (from rev 1716, trunk/CSP/csp/cspsim/theater/DamageModifier.cpp) =================================================================== --- trunk/CSP/csp/cspsim/theater/DamageModifier.cpp 2005-12-04 21:17:37 UTC (rev 1716) +++ trunk/CSP/csp/cspsim/DamageModifier.cpp 2005-12-10 17:54:27 UTC (rev 1742) @@ -0,0 +1,39 @@ +// Combat Simulator Project +// Copyright (C) 2002 The Combat Simulator Project +// http://csp.sourceforge.net +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +/** + * @file DamageModifier.cpp + * + **/ + +#include <csp/cspsim/DamageModifier.h> +#include <csp/csplib/data/ObjectInterface.h> + +CSP_NAMESPACE + +CSP_XML_BEGIN(DamageModifier) + CSP_DEF("incediary", m_Incendiary, false) + CSP_DEF("high_explosive", m_HighExplosive, false) + CSP_DEF("penetrating", m_Penetrating, false) + CSP_DEF("armor_piercing", m_ArmorPiercing, false) + CSP_DEF("small_arms", m_SmallArms, false) +CSP_XML_END + +CSP_NAMESPACE_END + Deleted: trunk/CSP/csp/cspsim/theater/DamageModifier.cpp =================================================================== --- trunk/CSP/csp/cspsim/theater/DamageModifier.cpp 2005-12-06 07:20:34 UTC (rev 1741) +++ trunk/CSP/csp/cspsim/theater/DamageModifier.cpp 2005-12-10 17:54:27 UTC (rev 1742) @@ -1,39 +0,0 @@ -// Combat Simulator Project -// Copyright (C) 2002 The Combat Simulator Project -// http://csp.sourceforge.net -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -/** - * @file DamageModifier.cpp - * - **/ - -#include <csp/cspsim/theater/DamageModifier.h> -#include <csp/csplib/data/ObjectInterface.h> - -CSP_NAMESPACE - -CSP_XML_BEGIN(DamageModifier) - CSP_DEF("incediary", m_Incendiary, false) - CSP_DEF("high_explosive", m_HighExplosive, false) - CSP_DEF("penetrating", m_Penetrating, false) - CSP_DEF("armor_piercing", m_ArmorPiercing, false) - CSP_DEF("small_arms", m_SmallArms, false) -CSP_XML_END - -CSP_NAMESPACE_END - |
|
From: <sv...@ww...> - 2005-12-06 07:20:42
|
Author: mkrose Date: 2005-12-05 23:20:34 -0800 (Mon, 05 Dec 2005) New Revision: 1741 Modified: trunk/CSP/csp/tools/hid/maps/aircraft-core.map Log: Patch aircraft input map for new f16dj path. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1741 Modified: trunk/CSP/csp/tools/hid/maps/aircraft-core.map =================================================================== --- trunk/CSP/csp/tools/hid/maps/aircraft-core.map 2005-12-06 07:18:04 UTC (rev 1740) +++ trunk/CSP/csp/tools/hid/maps/aircraft-core.map 2005-12-06 07:20:34 UTC (rev 1741) @@ -5,7 +5,7 @@ device mouse 0 mouse standard_mouse bind sim:vehicles.aircraft.m2k -bind sim:vehicles.aircraft.F16DJ +bind sim:vehicles.aircraft.f16dj mode base |
|
From: <sv...@ww...> - 2005-12-06 07:18:15
|
Author: mkrose Date: 2005-12-05 23:18:04 -0800 (Mon, 05 Dec 2005) New Revision: 1740 Added: trunk/CSP/csp/data/xml/theater/balkan/lightpylon.xml trunk/CSP/csp/data/xml/theater/balkan/lightpylon/ trunk/CSP/csp/data/xml/theater/balkan/lightpylon/model.xml Removed: trunk/CSP/csp/data/xml/theater/balkan/Lightpylon1.xml trunk/CSP/csp/data/xml/theater/balkan/Lightpylon1/ trunk/CSP/csp/data/xml/theater/balkan/lightpylon/model.xml Log: More model renaming. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1740 Deleted: trunk/CSP/csp/data/xml/theater/balkan/Lightpylon1.xml =================================================================== --- trunk/CSP/csp/data/xml/theater/balkan/Lightpylon1.xml 2005-12-06 07:16:54 UTC (rev 1739) +++ trunk/CSP/csp/data/xml/theater/balkan/Lightpylon1.xml 2005-12-06 07:18:04 UTC (rev 1740) @@ -1,6 +0,0 @@ -<?xml version="1.0" standalone="no"?> - -<Object class="FeatureObjectModel"> - <Path name="model">Lightpylon1.model</Path> - <Int name="hit_points">30</Int> -</Object> Copied: trunk/CSP/csp/data/xml/theater/balkan/lightpylon (from rev 1738, trunk/CSP/csp/data/xml/theater/balkan/Lightpylon1) Deleted: trunk/CSP/csp/data/xml/theater/balkan/lightpylon/model.xml =================================================================== --- trunk/CSP/csp/data/xml/theater/balkan/Lightpylon1/model.xml 2005-12-06 07:15:13 UTC (rev 1738) +++ trunk/CSP/csp/data/xml/theater/balkan/lightpylon/model.xml 2005-12-06 07:18:04 UTC (rev 1740) @@ -1,9 +0,0 @@ -<?xml version="1.0" standalone="no"?> - -<Object class="ObjectModel"> - <External name="model_path">Lightpylon1/Lightpylon1.osg</External> - <Vector name="axis_0">1 0 0</Vector> - <Vector name="axis_1">0 1 0</Vector> - <Bool name="smooth">true</Bool> - <Bool name="filter">true</Bool> -</Object> Copied: trunk/CSP/csp/data/xml/theater/balkan/lightpylon/model.xml (from rev 1739, trunk/CSP/csp/data/xml/theater/balkan/Lightpylon1/model.xml) Copied: trunk/CSP/csp/data/xml/theater/balkan/lightpylon.xml (from rev 1738, trunk/CSP/csp/data/xml/theater/balkan/Lightpylon1.xml) |
Author: mkrose Date: 2005-12-05 23:16:54 -0800 (Mon, 05 Dec 2005) New Revision: 1739 Modified: trunk/CSP/csp/data/xml/stores/missiles/aim9.xml trunk/CSP/csp/data/xml/stores/racks/f16/centerline.xml trunk/CSP/csp/data/xml/stores/racks/f16/wingfuel.xml trunk/CSP/csp/data/xml/stores/tanks/f16/centerline_300gal/model.xml trunk/CSP/csp/data/xml/stores/tanks/f16/wing_370gal/model.xml trunk/CSP/csp/data/xml/theater/balkan/Lightpylon1/model.xml trunk/CSP/csp/data/xml/theater/balkan/bureau01/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson01/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson02/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson03/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson04/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson05/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson06/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson07/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson08/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson09/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson10/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson11/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson12/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson13/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson14/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson15/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson16/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson17/model.xml trunk/CSP/csp/data/xml/theater/balkan/flag01/model.xml trunk/CSP/csp/data/xml/theater/balkan/forest.xml trunk/CSP/csp/data/xml/theater/balkan/forest1.xml trunk/CSP/csp/data/xml/theater/balkan/hangar/model.xml trunk/CSP/csp/data/xml/theater/balkan/hangar2/model.xml trunk/CSP/csp/data/xml/theater/balkan/runway/model.xml trunk/CSP/csp/data/xml/theater/balkan/tower1/model.xml trunk/CSP/csp/data/xml/vehicles/aircraft/f16dj/cockpit.xml trunk/CSP/csp/data/xml/vehicles/aircraft/f16dj/model.xml trunk/CSP/csp/data/xml/vehicles/aircraft/m2k/model.xml Log: Model path fixups. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1739 Diff omitted (24040 bytes). |
|
From: <sv...@ww...> - 2005-12-06 07:15:24
|
Author: mkrose Date: 2005-12-05 23:15:13 -0800 (Mon, 05 Dec 2005) New Revision: 1738 Added: trunk/CSP/csp/data/models/airbase/hangar01/ Log: Port one more airbase model. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1738 Copied: trunk/CSP/csp/data/models/airbase/hangar01 (from rev 1678, trunk/CSP/CSPSim/Data/Models/Hangar) |
|
From: <sv...@ww...> - 2005-12-06 05:53:51
|
Author: mkrose Date: 2005-12-05 21:53:34 -0800 (Mon, 05 Dec 2005) New Revision: 1737 Added: trunk/CSP/csp/data/models/aircraft/f16/ trunk/CSP/csp/data/models/aircraft/f16/f16dj-cockpit.osg trunk/CSP/csp/data/models/aircraft/f16/f16dj.osg trunk/CSP/csp/data/models/aircraft/m2k/ trunk/CSP/csp/data/models/aircraft/m2k/m2k.osg Removed: trunk/CSP/csp/data/models/aircraft/f16/f16dj-cockpit.osg trunk/CSP/csp/data/models/aircraft/f16/f16dj.osg trunk/CSP/csp/data/models/aircraft/m2k/m2k.osg trunk/CSP/csp/data/models/f16/ trunk/CSP/csp/data/models/m2k/ Log: Reorganize models and textures. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1737 Diff omitted (22762940 bytes). |
|
From: <sv...@ww...> - 2005-12-06 05:52:01
|
Author: mkrose Date: 2005-12-05 21:51:49 -0800 (Mon, 05 Dec 2005) New Revision: 1736 Added: trunk/CSP/csp/data/models/airbase/lightpylon/lightpylon.osg trunk/CSP/csp/data/models/aircraft/ Removed: trunk/CSP/csp/data/models/airbase/lightpylon/Lightpylon1.osg Modified: trunk/CSP/csp/data/models/f16/f16dj-cockpit.osg trunk/CSP/csp/data/models/f16/f16dj.osg trunk/CSP/csp/data/models/stores/f16/f16_center_fuel_pylon.osg trunk/CSP/csp/data/models/stores/f16/f16_center_fuel_tank.osg trunk/CSP/csp/data/models/stores/f16/f16_wing_fuel_pylon.osg trunk/CSP/csp/data/models/stores/f16/f16_wing_fuel_tank.osg trunk/CSP/csp/data/models/stores/missiles/aim9/aim9.osg Log: Reorganize models and textures. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1736 Diff omitted (448501 bytes). |
|
From: <sv...@ww...> - 2005-12-06 05:33:15
|
Author: mkrose Date: 2005-12-05 21:33:05 -0800 (Mon, 05 Dec 2005) New Revision: 1735 Added: trunk/CSP/csp/data/models/stores/f16/ trunk/CSP/csp/data/models/stores/f16/f16_center_fuel_pylon.osg trunk/CSP/csp/data/models/stores/f16/f16_center_fuel_tank.osg trunk/CSP/csp/data/models/stores/f16/f16_wing_fuel_pylon.osg trunk/CSP/csp/data/models/stores/f16/f16_wing_fuel_tank.osg Removed: trunk/CSP/csp/data/models/stores/f16_center_fuel_pylon.osg trunk/CSP/csp/data/models/stores/f16_center_fuel_tank.osg trunk/CSP/csp/data/models/stores/f16_wing_fuel_pylon.osg trunk/CSP/csp/data/models/stores/f16_wing_fuel_tank.osg Modified: trunk/CSP/csp/data/models/stores/missiles/aim9/aim9.osg Log: Group f16 stores models into a common directory. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1735 Diff omitted (713332 bytes). |
|
From: <sv...@ww...> - 2005-12-06 05:31:46
|
Author: mkrose Date: 2005-12-05 21:31:38 -0800 (Mon, 05 Dec 2005) New Revision: 1734 Added: trunk/CSP/csp/data/models/stores/missiles/ trunk/CSP/csp/data/models/stores/missiles/aim9/ trunk/CSP/csp/data/models/stores/missiles/aim9/aim9-t1.tga trunk/CSP/csp/data/models/stores/missiles/aim9/aim9.osg Removed: trunk/CSP/csp/data/models/stores/aim9.osg Log: Reorganize aim9 missile model and texture. Need to clean up the texture path next. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1734 Diff omitted (87339 bytes). |
|
From: <sv...@ww...> - 2005-12-06 05:29:29
|
Author: mkrose Date: 2005-12-05 21:29:10 -0800 (Mon, 05 Dec 2005) New Revision: 1733 Added: trunk/CSP/csp/data/images/ trunk/CSP/csp/data/images/f16/ trunk/CSP/csp/data/images/f16/T-pit-alpha.tga trunk/CSP/csp/data/images/f16/T-pit-light.tga trunk/CSP/csp/data/images/f16/T-pit01.tga trunk/CSP/csp/data/images/f16/T-pit02.tga trunk/CSP/csp/data/images/f16/T-pit03.tga trunk/CSP/csp/data/images/f16/T-pit04.tga trunk/CSP/csp/data/images/f16/T-pit05.tga trunk/CSP/csp/data/images/f16/T-pit06.tga trunk/CSP/csp/data/images/f16/T1.tga trunk/CSP/csp/data/images/f16/T2.tga trunk/CSP/csp/data/images/f16/T3.tga trunk/CSP/csp/data/images/f16/T4.tga trunk/CSP/csp/data/images/f16/T5.tga trunk/CSP/csp/data/images/f16/T6.tga trunk/CSP/csp/data/images/f16/T7.tga trunk/CSP/csp/data/images/f16/f16-lak.tga trunk/CSP/csp/data/images/m2k/ trunk/CSP/csp/data/images/m2k/Glass.tga trunk/CSP/csp/data/images/m2k/T1.jpg trunk/CSP/csp/data/images/m2k/ailed.jpg trunk/CSP/csp/data/images/m2k/axces.jpg trunk/CSP/csp/data/images/m2k/derive.jpg trunk/CSP/csp/data/images/m2k/dessous.jpg trunk/CSP/csp/data/images/m2k/fuse.jpg trunk/CSP/csp/data/images/m2k/fuseg.jpg trunk/CSP/csp/data/models/ trunk/CSP/csp/data/models/airbase/ trunk/CSP/csp/data/models/airbase/bureau01/ trunk/CSP/csp/data/models/airbase/caissons/ trunk/CSP/csp/data/models/airbase/flag01/ trunk/CSP/csp/data/models/airbase/hangar02/ trunk/CSP/csp/data/models/airbase/lightpylon/ trunk/CSP/csp/data/models/airbase/runway/ trunk/CSP/csp/data/models/airbase/tower1/ trunk/CSP/csp/data/models/f16/ trunk/CSP/csp/data/models/f16/f16dj-cockpit.osg trunk/CSP/csp/data/models/f16/f16dj.osg trunk/CSP/csp/data/models/m2k/ trunk/CSP/csp/data/models/m2k/m2k.osg trunk/CSP/csp/data/models/stores/ trunk/CSP/csp/data/models/stores/aim9.osg trunk/CSP/csp/data/models/stores/f16_center_fuel_pylon.osg trunk/CSP/csp/data/models/stores/f16_center_fuel_tank.osg trunk/CSP/csp/data/models/stores/f16_wing_fuel_pylon.osg trunk/CSP/csp/data/models/stores/f16_wing_fuel_tank.osg Log: Start porting models from the old directories. Much reorganization left to do in order group models into categories and share textures. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1733 Diff omitted (22766758 bytes). |
|
From: <sv...@ww...> - 2005-12-05 07:28:39
|
Author: mkrose Date: 2005-12-04 23:28:32 -0800 (Sun, 04 Dec 2005) New Revision: 1732 Added: trunk/CSP/csp/data/fonts/screeninfo.ttf Log: Port font data to new directory. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1732 Added: trunk/CSP/csp/data/fonts/screeninfo.ttf =================================================================== (Binary files differ) Property changes on: trunk/CSP/csp/data/fonts/screeninfo.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <sv...@ww...> - 2005-12-05 07:28:03
|
Author: mkrose Date: 2005-12-04 23:27:56 -0800 (Sun, 04 Dec 2005) New Revision: 1731 Added: trunk/CSP/csp/data/fonts/ trunk/CSP/csp/data/fonts/f16hud.sfd trunk/CSP/csp/data/fonts/f16hud.sfd.COPYING trunk/CSP/csp/data/fonts/hud.ttf trunk/CSP/csp/data/fonts/hud.ttf.COPYING trunk/CSP/csp/data/fonts/screeninfo.ttf.COPYING Log: Port font data to new directories. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1731 Copied: trunk/CSP/csp/data/fonts/f16hud.sfd (from rev 1678, trunk/CSP/CSPSim/Data/Fonts/f16hud.sfd) Added: trunk/CSP/csp/data/fonts/f16hud.sfd.COPYING =================================================================== --- trunk/CSP/csp/data/fonts/f16hud.sfd.COPYING 2005-12-05 06:39:01 UTC (rev 1730) +++ trunk/CSP/csp/data/fonts/f16hud.sfd.COPYING 2005-12-05 07:27:56 UTC (rev 1731) @@ -0,0 +1,13 @@ +f16hud.sfd - F-16 Heads Up Display Font + +Copyright 2005 Mark Rose (mk...@us...) + +This font is free software; you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any later +version.\n\nThis font is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +details.\n\nYou should have received a copy of the GNU General Public License +along with this font; if not, write to the Free Software Foundation, Inc., 59 +Temple Place - Suite 330, Boston, MA 02111-1307, USA. Copied: trunk/CSP/csp/data/fonts/hud.ttf (from rev 1678, trunk/CSP/CSPSim/Data/Fonts/hud.ttf) Added: trunk/CSP/csp/data/fonts/hud.ttf.COPYING =================================================================== --- trunk/CSP/csp/data/fonts/hud.ttf.COPYING 2005-12-05 06:39:01 UTC (rev 1730) +++ trunk/CSP/csp/data/fonts/hud.ttf.COPYING 2005-12-05 07:27:56 UTC (rev 1731) @@ -0,0 +1,14 @@ +hud.ttf - F-16 Heads Up Display Font +Note that this file is generated from f16hud.sfd using FontForge. + +Copyright 2005 Mark Rose (mk...@us...) + +This font is free software; you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any later +version.\n\nThis font is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +details.\n\nYou should have received a copy of the GNU General Public License +along with this font; if not, write to the Free Software Foundation, Inc., 59 +Temple Place - Suite 330, Boston, MA 02111-1307, USA. Copied: trunk/CSP/csp/data/fonts/screeninfo.ttf.COPYING (from rev 1678, trunk/CSP/CSPSim/Data/Fonts/screeninfo.ttf.COPYING) |
Author: mkrose Date: 2005-12-04 22:39:01 -0800 (Sun, 04 Dec 2005) New Revision: 1730 Modified: trunk/CSP/csp/data/xml/stores/missiles/aim9.xml trunk/CSP/csp/data/xml/stores/racks/f16/centerline.xml trunk/CSP/csp/data/xml/stores/racks/f16/wingfuel.xml trunk/CSP/csp/data/xml/stores/tanks/f16/centerline_300gal/model.xml trunk/CSP/csp/data/xml/stores/tanks/f16/wing_370gal/model.xml trunk/CSP/csp/data/xml/terrain/balkan.xml trunk/CSP/csp/data/xml/theater/balkan/Lightpylon1/model.xml trunk/CSP/csp/data/xml/theater/balkan/bureau01/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson01/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson02/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson03/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson04/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson05/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson06/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson07/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson08/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson09/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson10/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson11/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson12/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson13/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson14/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson15/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson16/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson17/model.xml trunk/CSP/csp/data/xml/theater/balkan/flag01/model.xml trunk/CSP/csp/data/xml/theater/balkan/forest.xml trunk/CSP/csp/data/xml/theater/balkan/forest1.xml trunk/CSP/csp/data/xml/theater/balkan/hangar/model.xml trunk/CSP/csp/data/xml/theater/balkan/hangar2/model.xml trunk/CSP/csp/data/xml/theater/balkan/runway/model.xml trunk/CSP/csp/data/xml/theater/balkan/tower1/model.xml trunk/CSP/csp/data/xml/vehicles/aircraft/f16dj/cockpit.xml trunk/CSP/csp/data/xml/vehicles/aircraft/f16dj/model.xml trunk/CSP/csp/data/xml/vehicles/aircraft/m2k/model.xml trunk/CSP/csp/data/xml/vehicles/tanks/t62/model.xml trunk/CSP/csp/tools/data/parse.py Log: Restore External tags. <enter a description here> Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1730 Diff omitted (25735 bytes). |
|
From: <sv...@ww...> - 2005-12-05 05:59:45
|
Author: mkrose Date: 2005-12-04 21:59:38 -0800 (Sun, 04 Dec 2005) New Revision: 1729 Added: trunk/CSP/csp/data/xml/vehicles/aircraft/f16dj/cockpit.xml trunk/CSP/csp/data/xml/vehicles/aircraft/f16dj/model.xml Removed: trunk/CSP/csp/data/xml/vehicles/aircraft/F16/ trunk/CSP/csp/data/xml/vehicles/aircraft/f16/cockpit.xml trunk/CSP/csp/data/xml/vehicles/aircraft/f16/model.xml Log: Finish f16 xml renaming and reorganization. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1729 Diff omitted (20338 bytes). |
