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...> - 2007-04-09 03:13:43
|
Author: mkrose Date: 2007-04-08 20:13:29 -0700 (Sun, 08 Apr 2007) New Revision: 2072 Modified: trunk/csp/csplib/__init__.py Log: Remove explicit hash_string alias in csplib/__init__.py since the alias is already done through a swig %rename directive in csplib/util/swig/HashUtility.i. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2072 Modified: trunk/csp/csplib/__init__.py =================================================================== --- trunk/csp/csplib/__init__.py 2007-04-08 02:39:46 UTC (rev 2071) +++ trunk/csp/csplib/__init__.py 2007-04-09 03:13:29 UTC (rev 2072) @@ -61,8 +61,6 @@ libexc.has_trace = __libexc_has_trace libexc.details = __libexc_details -hash_string = _csplib.newhasht_cstring - ## Specialized Link class for Python. This class behaves like ## Object, but automatically combines C++ and Python reference ## counting to handle object lifetime in a sane way. Both C++ |
|
From: <sv...@ww...> - 2007-04-08 02:39:54
|
Author: mkrose Date: 2007-04-07 19:39:46 -0700 (Sat, 07 Apr 2007) New Revision: 2071 Modified: trunk/csp/csplib/csplib.i trunk/csp/csplib/data/Link.h Log: Suppress swig warnings about deprecated typemap syntax, and fix a warning about an unwrapped operator method. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2071 Modified: trunk/csp/csplib/csplib.i =================================================================== --- trunk/csp/csplib/csplib.i 2007-04-08 01:15:31 UTC (rev 2070) +++ trunk/csp/csplib/csplib.i 2007-04-08 02:39:46 UTC (rev 2071) @@ -43,6 +43,14 @@ if (cspPyException) PyDict_SetItemString(d, "libexc", cspPyException); %} +/* For now, suppress warning 124: + * Specifying the language name in %typemap is >deprecated - use + * #ifdef SWIG<LANG> instead. + * We'll do this after a few minor version releases of swig (or when + * support for languages in typmap is removed. + */ +#pragma SWIG nowarn=124 + // standard includes %include "std_string.i" %include "std_vector.i" Modified: trunk/csp/csplib/data/Link.h =================================================================== --- trunk/csp/csplib/data/Link.h 2007-04-08 01:15:31 UTC (rev 2070) +++ trunk/csp/csplib/data/Link.h 2007-04-08 02:39:46 UTC (rev 2071) @@ -96,11 +96,13 @@ * * This method is used by subclasses to assign after checking type compatibility. */ +#ifndef SWIG LinkCore& operator=(const LinkCore& r) { Path::operator=(r); _reassign(r._reference); return *this; } +#endif public: |
|
From: <sv...@ww...> - 2007-04-08 01:15:38
|
Author: mkrose Date: 2007-04-07 18:15:31 -0700 (Sat, 07 Apr 2007) New Revision: 2070 Modified: trunk/csp/csplib/util/Endian.h Log: Fix 'loss of precision' warnings under windows. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2070 Modified: trunk/csp/csplib/util/Endian.h =================================================================== --- trunk/csp/csplib/util/Endian.h 2007-04-07 22:32:21 UTC (rev 2069) +++ trunk/csp/csplib/util/Endian.h 2007-04-08 01:15:31 UTC (rev 2070) @@ -295,8 +295,8 @@ }; #define CSP_ENDIAN_TEMPLATE(TYPE, CAPTYPE) \ template<> struct endian<TYPE> { \ - inline static TYPE to_le(TYPE x) { return CSP_##CAPTYPE##_TO_LE(x); } \ - inline static TYPE from_le(TYPE x) { return CSP_##CAPTYPE##_FROM_LE(x); } \ + inline static TYPE to_le(TYPE x) { return static_cast<TYPE>(CSP_##CAPTYPE##_TO_LE(x)); } \ + inline static TYPE from_le(TYPE x) { return static_cast<TYPE>(CSP_##CAPTYPE##_FROM_LE(x)); } \ }; CSP_ENDIAN_TEMPLATE(int16, INT16) CSP_ENDIAN_TEMPLATE(int32, INT32) |
|
From: <sv...@ww...> - 2007-04-07 22:32:28
|
Author: mkrose Date: 2007-04-07 15:32:21 -0700 (Sat, 07 Apr 2007) New Revision: 2069 Modified: trunk/csp/csplib/util/Namespace.h Log: Remove leading :: from csp namespace macro to avoid compile errors in swig generated code. For the curious, ::csp::xxx gets used as a template argument by swig, producing "<::csp::xxx>". The leading "<:" is a digraph in C++ and C99, and is interpreted as "[". So you have to put a space after the "<" for it to parse correctly. This is somewhat similar (in effect) to the problem of having ">>" at the end of nested template arguments. In any event, the leading namespace qualifier isn't actually needed, so removing it is the simplest solution (although really swig should be more careful). Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2069 Modified: trunk/csp/csplib/util/Namespace.h =================================================================== --- trunk/csp/csplib/util/Namespace.h 2007-04-06 13:04:31 UTC (rev 2068) +++ trunk/csp/csplib/util/Namespace.h 2007-04-07 22:32:21 UTC (rev 2069) @@ -4,6 +4,6 @@ #define CSP_NAMESPACE namespace csp { #define CSP_NAMESPACE_END } -#define CSP(x) ::csp::x +#define CSP(x) csp::x #endif // __CSPLIB_UTIL_NAMESPACE_H__ |
|
From: <sv...@ww...> - 2007-04-06 13:04:39
|
Author: nsmoooose Date: 2007-04-06 06:04:31 -0700 (Fri, 06 Apr 2007) New Revision: 2068 Added: branches/python_bindings_for_ui/csp/cspsim/swig/Screens.i branches/python_bindings_for_ui/csp/cspsim/swig/wf.i branches/python_bindings_for_ui/csp/cspsim/swig/windows.i Modified: branches/python_bindings_for_ui/csp/csplib/util/Referenced.h branches/python_bindings_for_ui/csp/cspsim/BaseScreen.h branches/python_bindings_for_ui/csp/cspsim/cspsim.i branches/python_bindings_for_ui/csp/cspsim/swig/CSPSim.i branches/python_bindings_for_ui/csp/cspsim/wf/Button.h branches/python_bindings_for_ui/csp/cspsim/wf/CheckBox.h branches/python_bindings_for_ui/csp/cspsim/wf/Container.h branches/python_bindings_for_ui/csp/cspsim/wf/Control.h branches/python_bindings_for_ui/csp/cspsim/wf/Label.h branches/python_bindings_for_ui/csp/cspsim/wf/ListBox.h branches/python_bindings_for_ui/csp/cspsim/wf/ListBoxItem.h branches/python_bindings_for_ui/csp/cspsim/wf/MultiControlContainer.h branches/python_bindings_for_ui/csp/cspsim/wf/Serialization.h branches/python_bindings_for_ui/csp/cspsim/wf/SingleControlContainer.h branches/python_bindings_for_ui/csp/cspsim/wf/Tab.h branches/python_bindings_for_ui/csp/cspsim/wf/TabPage.h branches/python_bindings_for_ui/csp/cspsim/wf/TableControlContainer.h branches/python_bindings_for_ui/csp/cspsim/wf/Window.h branches/python_bindings_for_ui/csp/cspsim/wf/WindowManager.h branches/python_bindings_for_ui/csp/cspsim/windows/MenuScreen.cpp branches/python_bindings_for_ui/csp/cspsim/windows/MenuScreen.h Log: * Added initial support for python scripting for the csp::wf namespace. This has been done by adding interface files for swig. wf.i, windows.i, screens.i * added dll export of all classes in csp::wf and csp::windows namespace. * Referenced base class is now exposing the _incref and _decref methods as public members. This means that python can use reference counting on these kind of objects. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2068 Diff omitted (20012 bytes). |
|
From: <sv...@ww...> - 2007-04-05 14:09:20
|
Author: nsmoooose Date: 2007-04-05 07:09:12 -0700 (Thu, 05 Apr 2007) New Revision: 2067 Added: branches/python_bindings_for_ui/ Log: A branch to be used to experiment with python bindings and the window framework. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2067 Copied: branches/python_bindings_for_ui (from rev 2066, trunk) |
|
From: <sv...@ww...> - 2007-04-02 18:47:37
|
Author: nsmoooose Date: 2007-04-02 11:47:23 -0700 (Mon, 02 Apr 2007) New Revision: 2066 Added: trunk/csp/csplib/util/WeakRef.h trunk/csp/csplib/util/WeakReferenced.cpp trunk/csp/csplib/util/WeakReferenced.h trunk/csp/cspsim/wf/ControlCallback.cpp trunk/csp/cspsim/wf/ControlCallback.h trunk/csp/cspsim/wf/Rectangle.h Modified: trunk/csp/csplib/SConscript trunk/csp/cspsim/SConscript trunk/csp/cspsim/VirtualScene.cpp trunk/csp/cspsim/wf/Button.cpp trunk/csp/cspsim/wf/Button.h trunk/csp/cspsim/wf/CheckBox.cpp trunk/csp/cspsim/wf/CheckBox.h trunk/csp/cspsim/wf/Container.cpp trunk/csp/cspsim/wf/Container.h trunk/csp/cspsim/wf/Control.cpp trunk/csp/cspsim/wf/Control.h trunk/csp/cspsim/wf/ControlGeometryBuilder.cpp trunk/csp/cspsim/wf/ListBox.cpp trunk/csp/cspsim/wf/ListBox.h trunk/csp/cspsim/wf/ListBoxItem.cpp trunk/csp/cspsim/wf/ListBoxItem.h trunk/csp/cspsim/wf/Point.h trunk/csp/cspsim/wf/Size.h trunk/csp/cspsim/wf/StyleBuilder.cpp trunk/csp/cspsim/wf/TableControlContainer.cpp trunk/csp/cspsim/wf/Window.cpp trunk/csp/cspsim/wf/WindowManager.cpp trunk/csp/cspsim/wf/WindowManager.h trunk/csp/cspsim/windows/MainMenu.cpp trunk/csp/cspsim/windows/MainMenu.h trunk/csp/cspsim/windows/MenuScreen.cpp trunk/csp/cspsim/windows/MenuScreen.h trunk/csp/cspsim/windows/MessageBox.cpp trunk/csp/cspsim/windows/MessageBox.h trunk/csp/cspsim/windows/Options.cpp trunk/csp/cspsim/windows/Options.h trunk/csp/cspsim/windows/QuitResume.cpp trunk/csp/cspsim/windows/QuitResume.h Log: * Added WeakRef<T> and WeakReferenced classes. * Control class now supports weak references. * Re factored event handling of clicks. * Extracted Rect class into Rectangle class with its own header file. * Changed naming of members of the Point and Rectangle classes. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2066 Diff omitted (56120 bytes). |
|
From: <sv...@ww...> - 2007-03-27 20:04:56
|
Author: mkrose Date: 2007-03-27 13:04:48 -0700 (Tue, 27 Mar 2007) New Revision: 2065 Modified: trunk/csp/csplib/data/Quat.cpp Log: Fix bug in euler to quat transformation. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2065 Modified: trunk/csp/csplib/data/Quat.cpp =================================================================== --- trunk/csp/csplib/data/Quat.cpp 2007-03-25 08:38:03 UTC (rev 2064) +++ trunk/csp/csplib/data/Quat.cpp 2007-03-27 20:04:48 UTC (rev 2065) @@ -168,7 +168,7 @@ double ch2 = cos(0.5*yaw); _x = sh0 * ch1 * ch2 - ch0 * sh1 * sh2; _y = ch0 * sh1 * ch2 + sh0 * ch1 * sh2; - _z = ch0 * ch1 * sh2 - sh0 * sh1 * sh2; + _z = ch0 * ch1 * sh2 - sh0 * sh1 * ch2; _w = ch0 * ch1 * ch2 + sh0 * sh1 * sh2; } |
|
From: <sv...@ww...> - 2007-03-25 08:38:11
|
Author: nsmoooose Date: 2007-03-25 01:38:03 -0700 (Sun, 25 Mar 2007) New Revision: 2064 Removed: branches/mainmenu_and_style/ Log: Removed mainmenu_and_style branch since it has been merged to the trunk. This branch is no longer in use. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2064 |
|
From: <sv...@ww...> - 2007-03-12 19:34:02
|
Author: nsmoooose Date: 2007-03-12 12:33:53 -0700 (Mon, 12 Mar 2007) New Revision: 2063 Modified: trunk/csp/cspsim/wf/Serialization.cpp trunk/csp/cspsim/windows/MainMenu.cpp trunk/csp/dist/win/demo/makedemo.py Log: Fixed some issues. * Misspelled include. Build broken on linux. * Compiler warnings on linux. * Fixed path to readme file used by the python script to make the demo. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2063 Modified: trunk/csp/cspsim/wf/Serialization.cpp =================================================================== --- trunk/csp/cspsim/wf/Serialization.cpp 2007-03-11 18:41:29 UTC (rev 2062) +++ trunk/csp/cspsim/wf/Serialization.cpp 2007-03-12 19:33:53 UTC (rev 2063) @@ -283,7 +283,7 @@ } } -void ToValue(XMLNode& node, const std::string& src, osg::Vec4* dst) { +void ToValue(XMLNode& /* node */, const std::string& src, osg::Vec4* dst) { std::istringstream data(src); unsigned int rgba = 0; @@ -302,7 +302,7 @@ dst->_v[3] = alpha * step; } -void ToValue(XMLNode& node, const std::string& src, bool* dst) { +void ToValue(XMLNode& /* node */, const std::string& src, bool* dst) { if(src == "1" || src == "true") { *dst = true; } @@ -311,19 +311,19 @@ } } -void ToValue(XMLNode& node, const std::string& src, float* dst) { +void ToValue(XMLNode& /* node */, const std::string& src, float* dst) { *dst = (float)atof(src.c_str()); } -void ToValue(XMLNode& node, const std::string& src, double* dst) { +void ToValue(XMLNode& /* node */, const std::string& src, double* dst) { *dst = atof(src.c_str()); } -void ToValue(XMLNode& node, const std::string& src, std::string* dst) { +void ToValue(XMLNode& /* node */, const std::string& src, std::string* dst) { *dst = src; } -void ToValue(XMLNode& node, const std::string& src, Ref<wf::Control>* dst) { +void ToValue(XMLNode& node, const std::string& /* src */, Ref<wf::Control>* dst) { int childNodeCount = node.nChildNode(); if(childNodeCount > 0) { XMLNode childNode = node.getChildNode(0); @@ -331,7 +331,7 @@ } } -void ToValue(XMLNode& node, const std::string& src, ControlVector* dst) { +void ToValue(XMLNode& node, const std::string& /* src */, ControlVector* dst) { int childNodeCount = node.nChildNode(); for(int index = 0;index < childNodeCount;++index) { XMLNode childNode = node.getChildNode(index); @@ -342,7 +342,7 @@ } } -void ToValue(XMLNode& node, const std::string& src, ListBoxItemVector* dst) { +void ToValue(XMLNode& node, const std::string& /* src */, ListBoxItemVector* dst) { int childNodeCount = node.nChildNode(); for(int index = 0;index < childNodeCount;++index) { XMLNode childNode = node.getChildNode(index); @@ -353,12 +353,12 @@ } } -void ToValue(XMLNode& node, const std::string& src, Style* dst) { +void ToValue(XMLNode& node, const std::string& /* src */, Style* dst) { ReadingArchive archive; archive.load(dst, node); } -void ToValue(XMLNode& node, const std::string& src, NamedStyleMap* dst) { +void ToValue(XMLNode& node, const std::string& /* src */, NamedStyleMap* dst) { int childNodeCount = node.nChildNode(); for(int index = 0;index < childNodeCount;++index) { XMLNode childNode = node.getChildNode(index); @@ -372,7 +372,7 @@ } } -void ToValue(XMLNode& node, const std::string& src, TabPageVector* dst) { +void ToValue(XMLNode& node, const std::string& /* src */, TabPageVector* dst) { int childNodeCount = node.nChildNode(); for(int index = 0;index < childNodeCount;++index) { XMLNode childNode = node.getChildNode(index); @@ -383,7 +383,7 @@ } } -void ToValue(XMLNode& node, const std::string& src, TableControlContainer::ColumnVector* dst) { +void ToValue(XMLNode& node, const std::string& /* src */, TableControlContainer::ColumnVector* dst) { int childNodeCount = node.nChildNode(); for(int index = 0;index < childNodeCount;++index) { XMLNode childNode = node.getChildNode(index); @@ -396,7 +396,7 @@ } } -void ToValue(XMLNode& node, const std::string& src, TableControlContainer::RowVector* dst) { +void ToValue(XMLNode& node, const std::string& /* src */, TableControlContainer::RowVector* dst) { int childNodeCount = node.nChildNode(); for(int index = 0;index < childNodeCount;++index) { XMLNode childNode = node.getChildNode(index); @@ -409,7 +409,7 @@ } } -void ToValue(XMLNode& node, const std::string& src, TableControlContainer::XYVector* dst) { +void ToValue(XMLNode& node, const std::string& /* src */, TableControlContainer::XYVector* dst) { bool resizeVector = true; // Iterate all rows that is found. Modified: trunk/csp/cspsim/windows/MainMenu.cpp =================================================================== --- trunk/csp/cspsim/windows/MainMenu.cpp 2007-03-11 18:41:29 UTC (rev 2062) +++ trunk/csp/cspsim/windows/MainMenu.cpp 2007-03-12 19:33:53 UTC (rev 2063) @@ -25,7 +25,7 @@ #include <csp/csplib/data/DataManager.h> #include <csp/cspsim/CSPSim.h> #include <csp/cspsim/DynamicObject.h> -#include <csp/cspsim/battlefield/LocalBattleField.h> +#include <csp/cspsim/battlefield/LocalBattlefield.h> #include <csp/cspsim/wf/Button.h> #include <csp/cspsim/wf/Serialization.h> #include <csp/cspsim/wf/WindowManager.h> Modified: trunk/csp/dist/win/demo/makedemo.py =================================================================== --- trunk/csp/dist/win/demo/makedemo.py 2007-03-11 18:41:29 UTC (rev 2062) +++ trunk/csp/dist/win/demo/makedemo.py 2007-03-12 19:33:53 UTC (rev 2063) @@ -158,7 +158,7 @@ copy_tree(DATA, DATA_TARGET, exclude=r'^\.svn$') print 'Writing README header' - README = os.path.join(DEMO, 'README') + README = os.path.join(DEMO, 'README.txt') readme = open(README).read() open(README, 'wt').write(readme % {'VERSION': version, 'DATE': time.strftime('%Y-%m-%d')}) |
|
From: <sv...@ww...> - 2007-03-11 18:42:04
|
Author: nsmoooose Date: 2007-03-11 11:41:29 -0700 (Sun, 11 Mar 2007) New Revision: 2062 Modified: trunk/csp/cspsim/wf/ControlGeometryBuilder.h trunk/csp/cspsim/wf/Window.h Log: Fixed some compilation errors on linux. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2062 Modified: trunk/csp/cspsim/wf/ControlGeometryBuilder.h =================================================================== --- trunk/csp/cspsim/wf/ControlGeometryBuilder.h 2007-03-11 18:30:28 UTC (rev 2061) +++ trunk/csp/cspsim/wf/ControlGeometryBuilder.h 2007-03-11 18:41:29 UTC (rev 2062) @@ -87,9 +87,6 @@ virtual osg::Geometry* buildTriangle( const Point& p1, const Point& p2, const Point& p3, float z, const osg::Vec4& c1, const osg::Vec4& c2, const osg::Vec4& c3) const; - -protected: - std::string m_Text; }; } // namespace wf Modified: trunk/csp/cspsim/wf/Window.h =================================================================== --- trunk/csp/cspsim/wf/Window.h 2007-03-11 18:30:28 UTC (rev 2061) +++ trunk/csp/cspsim/wf/Window.h 2007-03-11 18:41:29 UTC (rev 2062) @@ -46,8 +46,6 @@ class Window : public SingleControlContainer { public: - friend WindowManager; - Window(); virtual ~Window(); |
|
From: <sv...@ww...> - 2007-03-11 18:31:06
|
Author: nsmoooose Date: 2007-03-11 11:30:28 -0700 (Sun, 11 Mar 2007) New Revision: 2061 Modified: trunk/csp/cspsim/wf/Style.h Log: Added a #include to make the make_nvp method known to the compiler. Hopefully this fixes linux compiler errors. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2061 Modified: trunk/csp/cspsim/wf/Style.h =================================================================== --- trunk/csp/cspsim/wf/Style.h 2007-03-10 21:48:20 UTC (rev 2060) +++ trunk/csp/cspsim/wf/Style.h 2007-03-11 18:30:28 UTC (rev 2061) @@ -29,6 +29,7 @@ #include <string> #include <csp/csplib/util/Optional.h> +#include <csp/cspsim/wf/Serialization.h> CSP_NAMESPACE |
Author: nsmoooose Date: 2007-03-10 13:48:20 -0800 (Sat, 10 Mar 2007) New Revision: 2060 Added: trunk/csp/csplib/util/Optional.h trunk/csp/cspsim/wf/ResourceLocator.cpp trunk/csp/cspsim/wf/ResourceLocator.h trunk/csp/cspsim/wf/Style.h trunk/csp/cspsim/wf/StyleBuilder.cpp trunk/csp/cspsim/wf/StyleBuilder.h trunk/csp/cspsim/windows/MainMenu.cpp trunk/csp/cspsim/windows/MainMenu.h trunk/csp/cspsim/windows/MenuScreen.cpp trunk/csp/cspsim/windows/MenuScreen.h trunk/csp/cspsim/windows/MessageBox.cpp trunk/csp/cspsim/windows/MessageBox.h trunk/csp/data/fonts/prima_sans_bt.ttf trunk/csp/data/ui/localization/english/ trunk/csp/data/ui/localization/swedish/ trunk/csp/data/ui/themes/default/desktop.xml trunk/csp/data/ui/themes/default/main_menu.xml trunk/csp/data/ui/themes/default/messagebox.xml trunk/csp/data/ui/themes/default/styles.xml trunk/csp/data/ui/themes/experimental/ trunk/csp/data/ui/themes/experimental/desktop.xml trunk/csp/data/ui/themes/experimental/main_menu.xml trunk/csp/data/ui/themes/experimental/messagebox.xml trunk/csp/data/ui/themes/experimental/options.xml trunk/csp/data/ui/themes/experimental/quit_resume.xml trunk/csp/data/ui/themes/experimental/styles.xml trunk/csp/data/ui/themes/red/ trunk/csp/data/ui/themes/red/desktop.xml trunk/csp/data/ui/themes/red/main_menu.xml trunk/csp/data/ui/themes/red/messagebox.xml trunk/csp/data/ui/themes/red/options.xml trunk/csp/data/ui/themes/red/quit_resume.xml trunk/csp/data/ui/themes/red/styles.xml Removed: trunk/csp/cspsim/wf/MessageBox.cpp trunk/csp/cspsim/wf/MessageBox.h trunk/csp/data/ui/localization/en/ trunk/csp/data/ui/themes/experimental/desktop.xml trunk/csp/data/ui/themes/experimental/main_menu.xml trunk/csp/data/ui/themes/experimental/messagebox.xml trunk/csp/data/ui/themes/experimental/options.xml trunk/csp/data/ui/themes/experimental/quit_resume.xml trunk/csp/data/ui/themes/experimental/styles.xml trunk/csp/data/ui/themes/red/desktop.xml trunk/csp/data/ui/themes/red/main_menu.xml trunk/csp/data/ui/themes/red/messagebox.xml trunk/csp/data/ui/themes/red/options.xml trunk/csp/data/ui/themes/red/quit_resume.xml trunk/csp/data/ui/themes/red/styles.xml Modified: trunk/csp/base/ trunk/csp/bin/ trunk/csp/bin/sim.py trunk/csp/csplib/ trunk/csp/csplib/data/ trunk/csp/csplib/net/ trunk/csp/csplib/numeric/ trunk/csp/csplib/spatial/ trunk/csp/csplib/thread/ trunk/csp/csplib/util/ trunk/csp/csplib/xml/ trunk/csp/cspsim/ trunk/csp/cspsim/BaseScreen.h trunk/csp/cspsim/CSPSim.cpp trunk/csp/cspsim/CSPSim.h trunk/csp/cspsim/Config.cpp trunk/csp/cspsim/Config.h trunk/csp/cspsim/GameScreen.cpp trunk/csp/cspsim/SConscript trunk/csp/cspsim/VirtualScene.cpp trunk/csp/cspsim/ai/ trunk/csp/cspsim/battlefield/ trunk/csp/cspsim/f16/ trunk/csp/cspsim/hud/ trunk/csp/cspsim/sky/ trunk/csp/cspsim/sound/ trunk/csp/cspsim/sound/SoundEngine.cpp trunk/csp/cspsim/sound/SoundEngine.h trunk/csp/cspsim/stores/ trunk/csp/cspsim/swig/CSPSim.i trunk/csp/cspsim/systems/ trunk/csp/cspsim/theater/ trunk/csp/cspsim/views/ trunk/csp/cspsim/wf/ trunk/csp/cspsim/wf/Button.cpp trunk/csp/cspsim/wf/Button.h trunk/csp/cspsim/wf/CheckBox.cpp trunk/csp/cspsim/wf/CheckBox.h trunk/csp/cspsim/wf/Container.cpp trunk/csp/cspsim/wf/Container.h trunk/csp/cspsim/wf/Control.cpp trunk/csp/cspsim/wf/Control.h trunk/csp/cspsim/wf/ControlGeometryBuilder.cpp trunk/csp/cspsim/wf/ControlGeometryBuilder.h trunk/csp/cspsim/wf/Label.cpp trunk/csp/cspsim/wf/Label.h trunk/csp/cspsim/wf/ListBox.cpp trunk/csp/cspsim/wf/ListBox.h trunk/csp/cspsim/wf/ListBoxItem.cpp trunk/csp/cspsim/wf/ListBoxItem.h trunk/csp/cspsim/wf/MultiControlContainer.cpp trunk/csp/cspsim/wf/MultiControlContainer.h trunk/csp/cspsim/wf/Serialization.cpp trunk/csp/cspsim/wf/SingleControlContainer.cpp trunk/csp/cspsim/wf/SingleControlContainer.h trunk/csp/cspsim/wf/Tab.cpp trunk/csp/cspsim/wf/Tab.h trunk/csp/cspsim/wf/TabPage.cpp trunk/csp/cspsim/wf/TabPage.h trunk/csp/cspsim/wf/TableControlContainer.cpp trunk/csp/cspsim/wf/TableControlContainer.h trunk/csp/cspsim/wf/Window.cpp trunk/csp/cspsim/wf/Window.h trunk/csp/cspsim/wf/WindowManager.cpp trunk/csp/cspsim/wf/WindowManager.h trunk/csp/cspsim/windows/ trunk/csp/cspsim/windows/Options.cpp trunk/csp/cspsim/windows/QuitResume.cpp trunk/csp/data/ trunk/csp/data/ui/themes/default/options.xml trunk/csp/data/ui/themes/default/quit_resume.xml trunk/csp/data/ui/window_document.xsd trunk/csp/modules/chunklod/ trunk/csp/modules/demeter/ trunk/csp/tools/ trunk/csp/tools/build/ trunk/csp/tools/data/ trunk/csp/tools/trc/ Log: Merged r2047:2059 from the mainmenu_and_style2 branch. The following features has been added: * A main menu that is displayed after loading of the game. * Color, background, borders and font is style able on all controls. (width, height and position is still lacking support) * Full support for several ui themes. * Class for optional values. This class is imitating the equivalent boost version. * Added svn:ignore on files that shouldn't be version controlled. * Several themes. * A new free true type font to use. ...and some more things that i have forgotten to mention... Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2060 Diff omitted (157063 bytes). |
Author: nsmoooose Date: 2007-03-10 12:57:22 -0800 (Sat, 10 Mar 2007) New Revision: 2059 Added: branches/mainmenu_and_style/csp/cspsim/wf/ResourceLocator.cpp branches/mainmenu_and_style/csp/cspsim/wf/ResourceLocator.h branches/mainmenu_and_style/csp/data/ui/localization/english/ branches/mainmenu_and_style/csp/data/ui/localization/swedish/ branches/mainmenu_and_style/csp/data/ui/themes/experimental/ branches/mainmenu_and_style/csp/data/ui/themes/experimental/desktop.xml branches/mainmenu_and_style/csp/data/ui/themes/experimental/main_menu.xml branches/mainmenu_and_style/csp/data/ui/themes/experimental/messagebox.xml branches/mainmenu_and_style/csp/data/ui/themes/experimental/options.xml branches/mainmenu_and_style/csp/data/ui/themes/experimental/quit_resume.xml branches/mainmenu_and_style/csp/data/ui/themes/experimental/styles.xml Removed: branches/mainmenu_and_style/csp/data/ui/localization/en/ Modified: branches/mainmenu_and_style/csp/bin/sim.ini branches/mainmenu_and_style/csp/cspsim/Config.cpp branches/mainmenu_and_style/csp/cspsim/Config.h branches/mainmenu_and_style/csp/cspsim/SConscript branches/mainmenu_and_style/csp/cspsim/VirtualScene.cpp branches/mainmenu_and_style/csp/cspsim/sound/SoundEngine.cpp branches/mainmenu_and_style/csp/cspsim/sound/SoundEngine.h branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.cpp branches/mainmenu_and_style/csp/cspsim/windows/Options.cpp branches/mainmenu_and_style/csp/data/ui/themes/default/desktop.xml branches/mainmenu_and_style/csp/data/ui/themes/default/main_menu.xml branches/mainmenu_and_style/csp/data/ui/themes/default/messagebox.xml branches/mainmenu_and_style/csp/data/ui/themes/default/options.xml branches/mainmenu_and_style/csp/data/ui/themes/default/quit_resume.xml branches/mainmenu_and_style/csp/data/ui/themes/default/styles.xml Log: Added some new localization features for the simulator. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2059 Diff omitted (33386 bytes). |
|
From: <sv...@ww...> - 2007-02-26 11:16:27
|
Author: nsmoooose Date: 2007-02-26 03:16:17 -0800 (Mon, 26 Feb 2007) New Revision: 2058 Modified: branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.h branches/mainmenu_and_style/csp/cspsim/wf/Serialization.cpp branches/mainmenu_and_style/csp/cspsim/wf/Style.h branches/mainmenu_and_style/csp/cspsim/wf/StyleBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/Tab.cpp branches/mainmenu_and_style/csp/cspsim/wf/Window.cpp branches/mainmenu_and_style/csp/cspsim/wf/Window.h branches/mainmenu_and_style/csp/data/ui/themes/default/main_menu.xml branches/mainmenu_and_style/csp/data/ui/themes/default/messagebox.xml branches/mainmenu_and_style/csp/data/ui/themes/default/options.xml branches/mainmenu_and_style/csp/data/ui/themes/default/quit_resume.xml branches/mainmenu_and_style/csp/data/ui/themes/red/main_menu.xml branches/mainmenu_and_style/csp/data/ui/themes/red/messagebox.xml branches/mainmenu_and_style/csp/data/ui/themes/red/options.xml branches/mainmenu_and_style/csp/data/ui/themes/red/quit_resume.xml branches/mainmenu_and_style/csp/data/ui/window_document.xsd Log: Added support for background image to a control. Removed caption property of window control. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2058 Diff omitted (24358 bytes). |
|
From: <sv...@ww...> - 2007-02-20 16:02:39
|
Author: nsmoooose Date: 2007-02-20 08:02:26 -0800 (Tue, 20 Feb 2007) New Revision: 2057 Added: branches/mainmenu_and_style/csp/cspsim/windows/MessageBox.cpp branches/mainmenu_and_style/csp/cspsim/windows/MessageBox.h branches/mainmenu_and_style/csp/data/ui/themes/default/messagebox.xml branches/mainmenu_and_style/csp/data/ui/themes/red/ branches/mainmenu_and_style/csp/data/ui/themes/red/desktop.xml branches/mainmenu_and_style/csp/data/ui/themes/red/main_menu.xml branches/mainmenu_and_style/csp/data/ui/themes/red/messagebox.xml branches/mainmenu_and_style/csp/data/ui/themes/red/options.xml branches/mainmenu_and_style/csp/data/ui/themes/red/quit_resume.xml branches/mainmenu_and_style/csp/data/ui/themes/red/styles.xml Removed: branches/mainmenu_and_style/csp/cspsim/wf/MessageBox.cpp branches/mainmenu_and_style/csp/cspsim/wf/MessageBox.h Modified: branches/mainmenu_and_style/csp/bin/sim.ini branches/mainmenu_and_style/csp/cspsim/CSPSim.cpp branches/mainmenu_and_style/csp/cspsim/CSPSim.h branches/mainmenu_and_style/csp/cspsim/Config.cpp branches/mainmenu_and_style/csp/cspsim/Config.h branches/mainmenu_and_style/csp/cspsim/SConscript branches/mainmenu_and_style/csp/cspsim/wf/Button.cpp branches/mainmenu_and_style/csp/cspsim/wf/Container.cpp branches/mainmenu_and_style/csp/cspsim/wf/Control.cpp branches/mainmenu_and_style/csp/cspsim/wf/Control.h branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.h branches/mainmenu_and_style/csp/cspsim/wf/ListBox.cpp branches/mainmenu_and_style/csp/cspsim/wf/SingleControlContainer.cpp branches/mainmenu_and_style/csp/cspsim/wf/Style.h branches/mainmenu_and_style/csp/cspsim/wf/StyleBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/WindowManager.cpp branches/mainmenu_and_style/csp/cspsim/wf/WindowManager.h branches/mainmenu_and_style/csp/cspsim/windows/MainMenu.cpp branches/mainmenu_and_style/csp/cspsim/windows/MenuScreen.cpp branches/mainmenu_and_style/csp/cspsim/windows/MenuScreen.h branches/mainmenu_and_style/csp/cspsim/windows/Options.cpp branches/mainmenu_and_style/csp/cspsim/windows/QuitResume.cpp branches/mainmenu_and_style/csp/data/ui/themes/default/desktop.xml branches/mainmenu_and_style/csp/data/ui/themes/default/options.xml branches/mainmenu_and_style/csp/data/ui/themes/default/styles.xml branches/mainmenu_and_style/csp/data/ui/window_document.xsd Log: A lot of changes and fixes. * You can select between different themes. * CheckBox is fixed. * A second red theme has been added. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2057 Diff omitted (60594 bytes). |
|
From: <sv...@ww...> - 2007-01-24 19:52:54
|
Author: nsmoooose Date: 2007-01-24 11:52:46 -0800 (Wed, 24 Jan 2007) New Revision: 2056 Modified: branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.h branches/mainmenu_and_style/csp/cspsim/wf/ListBoxItem.cpp branches/mainmenu_and_style/csp/cspsim/wf/ListBoxItem.h branches/mainmenu_and_style/csp/cspsim/wf/StyleBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/StyleBuilder.h branches/mainmenu_and_style/csp/data/ui/themes/default/styles.xml Log: * Fixed broken ListBox control. * StyleBuilder now supports building of styles when a control is in a state. Ex: selected, disabled etc. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2056 Diff omitted (10298 bytes). |
|
From: <sv...@ww...> - 2007-01-24 18:58:56
|
Author: nsmoooose Date: 2007-01-24 10:58:40 -0800 (Wed, 24 Jan 2007) New Revision: 2055 Added: branches/mainmenu_and_style/csp/data/fonts/prima_sans_bt.ttf Modified: branches/mainmenu_and_style/csp/cspsim/VirtualScene.cpp branches/mainmenu_and_style/csp/cspsim/VirtualScene.h branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.h branches/mainmenu_and_style/csp/cspsim/wf/ListBox.cpp branches/mainmenu_and_style/csp/cspsim/wf/Tab.cpp branches/mainmenu_and_style/csp/cspsim/windows/QuitResume.cpp branches/mainmenu_and_style/csp/data/ui/themes/default/desktop.xml branches/mainmenu_and_style/csp/data/ui/themes/default/main_menu.xml branches/mainmenu_and_style/csp/data/ui/themes/default/options.xml branches/mainmenu_and_style/csp/data/ui/themes/default/quit_resume.xml branches/mainmenu_and_style/csp/data/ui/themes/default/styles.xml Log: * Cleaned out old color struct in ControlGeometryBuilder class. * Fixed VirtualScene so it works with all the windows. * Fixed the default theme to be correct on all existing windows. * Added prima_sans_bt.ttf font to use as a window font. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2055 Diff omitted (24047 bytes). |
|
From: <sv...@ww...> - 2007-01-20 15:16:45
|
Author: nsmoooose Date: 2007-01-20 07:16:37 -0800 (Sat, 20 Jan 2007) New Revision: 2054 Added: branches/mainmenu_and_style/csp/data/ui/themes/default/desktop.xml Modified: branches/mainmenu_and_style/csp/ branches/mainmenu_and_style/csp/csplib/xml/ branches/mainmenu_and_style/csp/cspsim/ branches/mainmenu_and_style/csp/cspsim/GameScreen.cpp branches/mainmenu_and_style/csp/cspsim/VirtualScene.cpp branches/mainmenu_and_style/csp/cspsim/VirtualScene.h branches/mainmenu_and_style/csp/cspsim/ai/ branches/mainmenu_and_style/csp/cspsim/battlefield/ branches/mainmenu_and_style/csp/cspsim/f16/ branches/mainmenu_and_style/csp/cspsim/hud/ branches/mainmenu_and_style/csp/cspsim/sky/ branches/mainmenu_and_style/csp/cspsim/sound/ branches/mainmenu_and_style/csp/cspsim/stores/ branches/mainmenu_and_style/csp/cspsim/systems/ branches/mainmenu_and_style/csp/cspsim/theater/ branches/mainmenu_and_style/csp/cspsim/views/ branches/mainmenu_and_style/csp/cspsim/wf/ branches/mainmenu_and_style/csp/cspsim/wf/Container.cpp branches/mainmenu_and_style/csp/cspsim/wf/Container.h branches/mainmenu_and_style/csp/cspsim/wf/Control.cpp branches/mainmenu_and_style/csp/cspsim/wf/Control.h branches/mainmenu_and_style/csp/cspsim/wf/Window.cpp branches/mainmenu_and_style/csp/cspsim/wf/Window.h branches/mainmenu_and_style/csp/cspsim/wf/WindowManager.cpp branches/mainmenu_and_style/csp/cspsim/wf/WindowManager.h branches/mainmenu_and_style/csp/cspsim/windows/ branches/mainmenu_and_style/csp/cspsim/windows/MainMenu.cpp branches/mainmenu_and_style/csp/cspsim/windows/MenuScreen.cpp branches/mainmenu_and_style/csp/data/ui/themes/default/main_menu.xml branches/mainmenu_and_style/csp/data/ui/themes/default/options.xml branches/mainmenu_and_style/csp/data/ui/themes/default/quit_resume.xml branches/mainmenu_and_style/csp/data/ui/themes/default/styles.xml branches/mainmenu_and_style/csp/modules/chunklod/ branches/mainmenu_and_style/csp/modules/demeter/ branches/mainmenu_and_style/csp/tools/ Log: Added functionality. * Created a desktop background for the main menu. * It now possible to center or maximize windows. * Fix for TableControlContainer to be displayed correctly. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2054 Diff omitted (25286 bytes). |
|
From: <sv...@ww...> - 2007-01-14 19:04:25
|
Author: nsmoooose Date: 2007-01-14 11:04:15 -0800 (Sun, 14 Jan 2007) New Revision: 2053 Modified: branches/mainmenu_and_style/csp/cspsim/wf/Control.cpp branches/mainmenu_and_style/csp/cspsim/wf/Control.h branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/StyleBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/StyleBuilder.h Log: * A parent control must be a container. Changed the Control class for this. * Removed duplicated code for the StyleBuilder class. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2053 Diff omitted (12476 bytes). |
|
From: <sv...@ww...> - 2007-01-10 20:28:09
|
Author: nsmoooose Date: 2007-01-10 12:27:52 -0800 (Wed, 10 Jan 2007) New Revision: 2052 Modified: branches/mainmenu_and_style/csp/cspsim/wf/Control.cpp branches/mainmenu_and_style/csp/cspsim/wf/Control.h branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/WindowManager.cpp branches/mainmenu_and_style/csp/data/ui/themes/default/options.xml branches/mainmenu_and_style/csp/data/ui/themes/default/styles.xml branches/mainmenu_and_style/csp/data/ui/window_document.xsd Log: * Control class now serializes CssClass property. * Label and checkbox control is using the color style for fonts. * Added additional styles to the xsd schema. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2052 Diff omitted (15234 bytes). |
Author: nsmoooose Date: 2007-01-05 13:26:19 -0800 (Fri, 05 Jan 2007) New Revision: 2051 Modified: branches/mainmenu_and_style/csp/ branches/mainmenu_and_style/csp/base/ branches/mainmenu_and_style/csp/bin/ branches/mainmenu_and_style/csp/csplib/ branches/mainmenu_and_style/csp/csplib/data/ branches/mainmenu_and_style/csp/csplib/net/ branches/mainmenu_and_style/csp/csplib/numeric/ branches/mainmenu_and_style/csp/csplib/spatial/ branches/mainmenu_and_style/csp/csplib/thread/ branches/mainmenu_and_style/csp/csplib/util/ branches/mainmenu_and_style/csp/csplib/util/Optional.h branches/mainmenu_and_style/csp/cspsim/ branches/mainmenu_and_style/csp/cspsim/wf/Control.cpp branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.h branches/mainmenu_and_style/csp/cspsim/wf/Serialization.cpp branches/mainmenu_and_style/csp/cspsim/wf/Style.h branches/mainmenu_and_style/csp/cspsim/wf/StyleBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/Window.h branches/mainmenu_and_style/csp/cspsim/wf/WindowManager.cpp branches/mainmenu_and_style/csp/data/ branches/mainmenu_and_style/csp/data/ui/themes/default/main_menu.xml branches/mainmenu_and_style/csp/data/ui/themes/default/styles.xml branches/mainmenu_and_style/csp/data/ui/window_document.xsd branches/mainmenu_and_style/csp/tools/build/ branches/mainmenu_and_style/csp/tools/data/ branches/mainmenu_and_style/csp/tools/trc/ Log: * Fixed issues with the optional class. * Added serialization of colors. * Included styles is resolved during load of window. * Some modifications to ControlGeometryBuilder class. Preparing several of the controls for styles. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2051 Diff omitted (37880 bytes). |
|
From: <sv...@ww...> - 2007-01-02 00:06:34
|
Author: mkrose Date: 2007-01-01 16:06:26 -0800 (Mon, 01 Jan 2007) New Revision: 2050 Added: trunk/csp/tools/build/vcproj.py Modified: trunk/csp/tools/build/setup.py Log: Add support for generating vcproj files from the build definitions to allow the code to be browsed and edited more easily in Visual Studio. To generate csp.vcproj, run 'scons vcproj'. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2050 Modified: trunk/csp/tools/build/setup.py =================================================================== --- trunk/csp/tools/build/setup.py 2007-01-01 07:41:35 UTC (rev 2049) +++ trunk/csp/tools/build/setup.py 2007-01-02 00:06:26 UTC (rev 2050) @@ -29,6 +29,7 @@ from csp.tools.build import registry from csp.tools.build import scons from csp.tools.build import util +from csp.tools.build import vcproj import atexit import logging @@ -85,6 +86,7 @@ CustomizeForPlatform(env, settings) AddSetupTargets(env) + AddVCProjectTarget(env) return env Initialize = classmethod(Initialize) @@ -255,7 +257,6 @@ #else: # print 'Setup failed; see .setup.log for details.' - def AddSetupTargets(env): def SetupProxy(*args, **kw): SetupClientWorkspace(0) def ForceSetupProxy(*args, **kw): SetupClientWorkspace(1) @@ -263,3 +264,7 @@ env.Command('setup', sources, SetupProxy) env.Command('force_setup', sources, ForceSetupProxy) +def AddVCProjectTarget(env): + def generate(*args, **kw): vcproj.Generate() + env.Command('vcproj', [], generate) + Added: trunk/csp/tools/build/vcproj.py =================================================================== --- trunk/csp/tools/build/vcproj.py 2007-01-01 07:41:35 UTC (rev 2049) +++ trunk/csp/tools/build/vcproj.py 2007-01-02 00:06:26 UTC (rev 2050) @@ -0,0 +1,91 @@ +# Copyright 2006 Mark Rose <mk...@us...> +# +# 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 + +""" +Provides tools for generating Microsoft Visual C project files +from the registered source file definitions. The output is +currently intended only for browsing and editing the source +code in Visual Studio; support for building directly from +VS has not been implemented. +""" + +from csp.tools.build import registry +import random + +FILTER = { + 'Header Files': 'h;hpp;hxx;hm;inl;inc;xsd', + 'Source Files': 'cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx', +} + +def Generate(): + def addFiles(files, map): + for f in files: map[f.path] = f + + # todo: add other file types (e.g., swig interfaces)? + + files_by_type = {} + for name, group in registry.BuildRegistry._sources.iteritems(): + addFiles(group.getHeaders(), files_by_type.setdefault('Header Files', {})) + addFiles(group.getSources(), files_by_type.setdefault('Source Files', {})) + + vc = open('csp.vcproj', 'wt') + print >>vc, '<?xml version="1.0" encoding="Windows-1252"?>' + print >>vc, '<VisualStudioProject' + print >>vc, ' ProjectType="Visual C++"' + print >>vc, ' Version="8,00"' + print >>vc, ' Name="csp"' + print >>vc, ' ProjectGUID="{A8F54A28-33C4-4E48-A4F4-C15E062C3D50}"' + print >>vc, ' >' + print >>vc, ' <Platforms>' + print >>vc, ' <Platform Name="Win32"/>' + print >>vc, ' </Platforms>' + print >>vc, ' <Configurations>' + print >>vc, ' <Configuration' + print >>vc, ' Name="Debug|Win32"' + print >>vc, ' IntermediateDirectory="$(ConfigurationName)"' + print >>vc, ' ConfigurationType="1"' + print >>vc, ' >' + print >>vc, ' </Configuration>' + print >>vc, ' <Configuration' + print >>vc, ' Name="Release|Win32"' + print >>vc, ' IntermediateDirectory="$(ConfigurationName)"' + print >>vc, ' ConfigurationType="1"' + print >>vc, ' >' + print >>vc, ' </Configuration>' + print >>vc, ' </Configurations>' + print >>vc, ' <Files>' + for section, files in files_by_type.iteritems(): + print >>vc, ' <Filter' + print >>vc, ' Name="%s"' % section + print >>vc, ' Filter="%s"' % FILTER[section] + print >>vc, ' UniqueIdentifier="{4FC737F1-C7A5-4376-A066-%012X}"' % random.randint(0, 16**12) + print >>vc, ' >' + files = files.values() + files.sort() + for f in files: + print >>vc, ' <File RelativePath="%s"/>' % f.path + print >>vc, ' </Filter>' + print >>vc, ' </Files>' + print >>vc, '</VisualStudioProject>' + + print + print 'Wrote project definition to csp.vcproj.' + print + print 'Note that this project file is only useful for browsing and' + print 'editing the source code in Microsoft Visual Studio. To build,' + print 'run "scons all" from the command line. The vcproj file must' + print 'be manually regenerated by running "scons vcproj" whenever the' + print 'SConstruct/SConscript files change.' |
|
From: <sv...@ww...> - 2007-01-01 07:41:42
|
Author: mkrose Date: 2006-12-31 23:41:35 -0800 (Sun, 31 Dec 2006) New Revision: 2049 Modified: trunk/csp/csplib/util/Boolean.h Log: Change the type of the internal state variable for tribool to only occupy one byte. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2049 Modified: trunk/csp/csplib/util/Boolean.h =================================================================== --- trunk/csp/csplib/util/Boolean.h 2006-12-31 13:59:28 UTC (rev 2048) +++ trunk/csp/csplib/util/Boolean.h 2007-01-01 07:41:35 UTC (rev 2049) @@ -21,6 +21,7 @@ #define __CSPLIB_UTIL_BOOLEAN_H__ #include <csp/csplib/util/Namespace.h> +#include <csp/csplib/util/Uniform.h> CSP_NAMESPACE @@ -31,7 +32,7 @@ */ class tribool { typedef enum { UNSET=0, FALSE=1, TRUE=2 } State; - State _state; + uint8 _state; tribool(State state): _state(state) {} public: |
|
From: <sv...@ww...> - 2006-12-31 13:59:35
|
Author: nsmoooose Date: 2006-12-31 05:59:28 -0800 (Sun, 31 Dec 2006) New Revision: 2048 Added: branches/mainmenu_and_style/csp/csplib/util/Optional.h branches/mainmenu_and_style/csp/cspsim/wf/Style.h branches/mainmenu_and_style/csp/cspsim/wf/StyleBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/StyleBuilder.h branches/mainmenu_and_style/csp/cspsim/windows/MainMenu.cpp branches/mainmenu_and_style/csp/cspsim/windows/MainMenu.h branches/mainmenu_and_style/csp/cspsim/windows/MenuScreen.cpp branches/mainmenu_and_style/csp/cspsim/windows/MenuScreen.h branches/mainmenu_and_style/csp/data/ui/themes/default/main_menu.xml branches/mainmenu_and_style/csp/data/ui/themes/default/styles.xml Modified: branches/mainmenu_and_style/csp/SConstruct branches/mainmenu_and_style/csp/bin/sim.ini branches/mainmenu_and_style/csp/bin/sim.py branches/mainmenu_and_style/csp/cspsim/BaseScreen.h branches/mainmenu_and_style/csp/cspsim/CSPSim.cpp branches/mainmenu_and_style/csp/cspsim/CSPSim.h branches/mainmenu_and_style/csp/cspsim/SConscript branches/mainmenu_and_style/csp/cspsim/VirtualScene.cpp branches/mainmenu_and_style/csp/cspsim/swig/CSPSim.i branches/mainmenu_and_style/csp/cspsim/wf/Button.cpp branches/mainmenu_and_style/csp/cspsim/wf/Button.h branches/mainmenu_and_style/csp/cspsim/wf/CheckBox.cpp branches/mainmenu_and_style/csp/cspsim/wf/CheckBox.h branches/mainmenu_and_style/csp/cspsim/wf/Control.cpp branches/mainmenu_and_style/csp/cspsim/wf/Control.h branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.cpp branches/mainmenu_and_style/csp/cspsim/wf/ControlGeometryBuilder.h branches/mainmenu_and_style/csp/cspsim/wf/Label.cpp branches/mainmenu_and_style/csp/cspsim/wf/Label.h branches/mainmenu_and_style/csp/cspsim/wf/ListBox.cpp branches/mainmenu_and_style/csp/cspsim/wf/ListBox.h branches/mainmenu_and_style/csp/cspsim/wf/ListBoxItem.cpp branches/mainmenu_and_style/csp/cspsim/wf/ListBoxItem.h branches/mainmenu_and_style/csp/cspsim/wf/MessageBox.cpp branches/mainmenu_and_style/csp/cspsim/wf/MessageBox.h branches/mainmenu_and_style/csp/cspsim/wf/MultiControlContainer.cpp branches/mainmenu_and_style/csp/cspsim/wf/MultiControlContainer.h branches/mainmenu_and_style/csp/cspsim/wf/Serialization.cpp branches/mainmenu_and_style/csp/cspsim/wf/SingleControlContainer.cpp branches/mainmenu_and_style/csp/cspsim/wf/SingleControlContainer.h branches/mainmenu_and_style/csp/cspsim/wf/Tab.cpp branches/mainmenu_and_style/csp/cspsim/wf/Tab.h branches/mainmenu_and_style/csp/cspsim/wf/TabPage.cpp branches/mainmenu_and_style/csp/cspsim/wf/TabPage.h branches/mainmenu_and_style/csp/cspsim/wf/TableControlContainer.cpp branches/mainmenu_and_style/csp/cspsim/wf/TableControlContainer.h branches/mainmenu_and_style/csp/cspsim/wf/Window.cpp branches/mainmenu_and_style/csp/cspsim/wf/Window.h branches/mainmenu_and_style/csp/cspsim/wf/WindowManager.cpp branches/mainmenu_and_style/csp/cspsim/wf/WindowManager.h branches/mainmenu_and_style/csp/data/ui/window_document.xsd Log: A bunch of changes: * Added a optional<class T> class. It works like boost::optional. * Began to change UI code to use osg::setProjectionMatrixAsOrtho. * Added initial Css capabilities to the UI framework. * Added initial serialization of the Style object. * Created a simple main menu that is capable to start the simulation. * Modified sim.py to be able to start the main menu or the simulation directly. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2048 Diff omitted (83718 bytes). |
