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...> - 2006-06-06 01:48:39
|
Author: lologramme Date: 2006-06-04 08:22:02 -0700 (Sun, 04 Jun 2006) New Revision: 1953 Added: trunk/csp/data/models/airbase/Hemtt_tanker01/ trunk/csp/data/models/airbase/Hemtt_tanker01/Hemtt01.jpg trunk/csp/data/models/airbase/Hemtt_tanker01/Hemtt_tanker01.osg trunk/csp/data/models/airbase/Hemtt_tanker01/hemtt_tanker01.jpg trunk/csp/data/xml/theater/balkan/Hemtt_tanker01.xml trunk/csp/data/xml/theater/balkan/Hemtt_tanker01/ trunk/csp/data/xml/theater/balkan/Hemtt_tanker01/model.xml Modified: trunk/csp/data/xml/theater/balkan/airbase.xml Log: Add tanker truck Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1953 Diff omitted (405423 bytes). |
|
From: <sv...@ww...> - 2006-06-03 17:36:56
|
Author: lologramme Date: 2006-06-03 10:36:48 -0700 (Sat, 03 Jun 2006) New Revision: 1952 Added: trunk/csp/data/models/airbase/house01/ trunk/csp/data/models/airbase/house01/house01.jpg trunk/csp/data/models/airbase/house01/house01.osg trunk/csp/data/xml/theater/balkan/house01.xml trunk/csp/data/xml/theater/balkan/house01/ trunk/csp/data/xml/theater/balkan/house01/model.xml Modified: trunk/csp/data/xml/theater/balkan/airbase.xml Log: add house Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1952 Added: trunk/csp/data/models/airbase/house01/house01.jpg =================================================================== (Binary files differ) Property changes on: trunk/csp/data/models/airbase/house01/house01.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/csp/data/models/airbase/house01/house01.osg =================================================================== --- trunk/csp/data/models/airbase/house01/house01.osg 2006-06-03 16:03:22 UTC (rev 1951) +++ trunk/csp/data/models/airbase/house01/house01.osg 2006-06-03 17:36:48 UTC (rev 1952) @@ -0,0 +1,200 @@ +MatrixTransform { + DataVariance STATIC + name "Scene Root" + nodeMask 0xff + cullingActive TRUE + StateSet { + UniqueID StateSet_0 + DataVariance STATIC + rendering_hint DEFAULT_BIN + renderBinMode INHERIT + GL_LIGHTING ON + } + referenceFrame RELATIVE + Matrix { + 1 0 0 0 + 0 1 0 0 + 0 0 1 0 + 0 0 0 1 + } + num_children 1 + MatrixTransform { + DataVariance STATIC + name "Box01" + nodeMask 0xff + cullingActive TRUE + referenceFrame RELATIVE + Matrix { + 5.80205 0 0 0 + 0 5.80205 0 0 + 0 0 5.80205 0 + 0.0486221 -0.0157754 4.02259 1 + } + num_children 1 + MatrixTransform { + DataVariance STATIC + nodeMask 0xff + cullingActive TRUE + referenceFrame RELATIVE + Matrix { + 1 0 0 0 + 0 1 0 0 + 0 0 1 0 + -0.627872 -6.15539e-008 -0.693305 1 + } + num_children 1 + Geode { + UniqueID Geode_1 + DataVariance STATIC + nodeMask 0xff + cullingActive TRUE + num_drawables 1 + Geometry { + DataVariance DYNAMIC + StateSet { + UniqueID StateSet_2 + DataVariance STATIC + rendering_hint DEFAULT_BIN + renderBinMode INHERIT + GL_CULL_FACE ON + GL_LIGHTING ON + 0xba1 ON + Material { + DataVariance STATIC + ColorMode OFF + ambientColor 0.588 0.588 0.588 1 + diffuseColor 1 1 1 1 + specularColor 0 0 0 1 + emissionColor 0 0 0 1 + shininess 0 + } + textureUnit 0 { + GL_TEXTURE_2D ON + Texture2D { + DataVariance STATIC + file "images\house01.jpg" + wrap_s CLAMP_TO_EDGE + wrap_t CLAMP_TO_EDGE + wrap_r CLAMP_TO_EDGE + min_filter LINEAR_MIPMAP_LINEAR + mag_filter LINEAR + maxAnisotropy 1 + borderColor 0 0 0 0 + borderWidth 0 + useHardwareMipMapGeneration TRUE + unRefImageDataAfterApply FALSE + internalFormatMode USE_IMAGE_DATA_FORMAT + } + } + } + useDisplayList TRUE + useVertexBufferObjects FALSE + PrimitiveSets 1 + { + DrawArrays TRIANGLES 0 30 + } + VertexArray Vec3Array 30 + { + 2.8041 -1.12742 1.38661 + -1.54835 -1.12742 1.38661 + -1.54835 -1.12742 0 + -1.54835 -1.12742 0 + 2.8041 -1.12742 0 + 2.8041 -1.12742 1.38661 + 2.8041 1.12742 1.38661 + 2.8041 -1.12742 1.38661 + 2.8041 -1.12742 0 + 2.8041 -1.12742 0 + 2.8041 1.12742 0 + 2.8041 1.12742 1.38661 + -1.54835 1.12742 1.38661 + 2.8041 1.12742 1.38661 + 2.8041 1.12742 0 + 2.8041 1.12742 0 + -1.54835 1.12742 0 + -1.54835 1.12742 1.38661 + -1.54835 -1.12742 1.38661 + -1.54835 1.12742 1.38661 + -1.54835 1.12742 0 + -1.54835 1.12742 0 + -1.54835 -1.12742 0 + -1.54835 -1.12742 1.38661 + 2.8041 1.12742 1.38661 + -1.54835 1.12742 1.38661 + -1.54835 -1.12742 1.38661 + -1.54835 -1.12742 1.38661 + 2.8041 -1.12742 1.38661 + 2.8041 1.12742 1.38661 + } + NormalBinding PER_VERTEX + NormalArray Vec3Array 30 + { + -5.37765e-009 -1 1.688e-008 + -2.7389e-008 -1 8.59718e-008 + -2.20114e-008 -1 6.90918e-008 + -2.20114e-008 -1 6.90918e-008 + 0 -1 0 + -5.37765e-009 -1 1.688e-008 + 1 0 0 + 1 0 0 + 1 0 0 + 1 0 0 + 1 0 0 + 1 0 0 + 5.37765e-009 1 -6.90918e-008 + 2.7389e-008 1 0 + 2.20114e-008 1 -1.688e-008 + 2.20114e-008 1 -1.688e-008 + 0 1 -8.59718e-008 + 5.37765e-009 1 -6.90918e-008 + -1 0 0 + -1 0 0 + -1 0 0 + -1 0 0 + -1 0 0 + -1 0 0 + 0 0 1 + 0 0 1 + 0 0 1 + 0 0 1 + 0 0 1 + 0 0 1 + } + TexCoordArray 0 Vec2Array 30 + { + 0.032801 0.983752 + 0.828715 0.983752 + 0.828715 0.730188 + 0.828715 0.730188 + 0.032801 0.730188 + 0.032801 0.983752 + 0.0334493 0.270586 + 0.445783 0.270586 + 0.445783 0.0170226 + 0.445783 0.0170226 + 0.0334493 0.0170226 + 0.0334493 0.270586 + 0.032801 0.984263 + 0.828715 0.984263 + 0.828715 0.7307 + 0.828715 0.7307 + 0.032801 0.7307 + 0.032801 0.984263 + 0.032909 0.269829 + 0.445242 0.269829 + 0.445242 0.0162657 + 0.445242 0.0162657 + 0.032909 0.0162657 + 0.032909 0.269829 + 0.032801 0.289266 + 0.828715 0.289266 + 0.828715 0.7016 + 0.828715 0.7016 + 0.032801 0.7016 + 0.032801 0.289266 + } + } + } + } + } +} Modified: trunk/csp/data/xml/theater/balkan/airbase.xml =================================================================== --- trunk/csp/data/xml/theater/balkan/airbase.xml 2006-06-03 16:03:22 UTC (rev 1951) +++ trunk/csp/data/xml/theater/balkan/airbase.xml 2006-06-03 17:36:48 UTC (rev 1952) @@ -499,5 +499,11 @@ <Float name="y">-240</Float> <Float name="orientation">-0.50</Float> </Object> + <Object class="FeatureLayout"> + <Path name="model">house01</Path> + <Float name="x">297.25</Float> + <Float name="y">76.8</Float> + <Float name="orientation">1.57</Float> + </Object> </List> </Object> Added: trunk/csp/data/xml/theater/balkan/house01/model.xml =================================================================== --- trunk/csp/data/xml/theater/balkan/house01/model.xml 2006-06-03 16:03:22 UTC (rev 1951) +++ trunk/csp/data/xml/theater/balkan/house01/model.xml 2006-06-03 17:36:48 UTC (rev 1952) @@ -0,0 +1,9 @@ +<?xml version="1.0" standalone="no"?> + +<Object class="ObjectModel"> + <External name="model_path">airbase/house01/house01.osg</External> + <Vector name="axis_0">1 0 0</Vector> + <Vector name="axis_1">0 1 0</Vector> + <Bool name="smooth">false</Bool> + <Bool name="filter">true</Bool> +</Object> Added: trunk/csp/data/xml/theater/balkan/house01.xml =================================================================== --- trunk/csp/data/xml/theater/balkan/house01.xml 2006-06-03 16:03:22 UTC (rev 1951) +++ trunk/csp/data/xml/theater/balkan/house01.xml 2006-06-03 17:36:48 UTC (rev 1952) @@ -0,0 +1,6 @@ +<?xml version="1.0" standalone="no"?> + +<Object class="FeatureObjectModel"> + <Path name="model">house01.model</Path> + <Int name="hit_points">20</Int> +</Object> |
|
From: <sv...@ww...> - 2006-06-03 16:03:31
|
Author: lologramme Date: 2006-06-03 09:03:22 -0700 (Sat, 03 Jun 2006) New Revision: 1951 Added: trunk/csp/data/models/airbase/aircraft_tractor01/ trunk/csp/data/models/airbase/aircraft_tractor01/aircraft_tractor01.jpg trunk/csp/data/models/airbase/aircraft_tractor01/aircraft_tractor01.osg trunk/csp/data/xml/theater/balkan/aircraft_tractor01.xml trunk/csp/data/xml/theater/balkan/aircraft_tractor01/ trunk/csp/data/xml/theater/balkan/aircraft_tractor01/model.xml Modified: trunk/csp/data/xml/theater/balkan/airbase.xml Log: Add Aircraft Tractor Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1951 Diff omitted (268367 bytes). |
Author: lologramme Date: 2006-06-03 07:32:43 -0700 (Sat, 03 Jun 2006) New Revision: 1950 Added: trunk/csp/data/images/trees/poplar01.png trunk/csp/data/images/trees/poplar02.png trunk/csp/data/models/airbase/Airbase_Lights/Taxi_Light_Blue/images/ trunk/csp/data/models/airbase/Airbase_Lights/Taxi_Light_Blue/images/TaxiLight-T1.png trunk/csp/data/xml/theater/balkan/forest2.xml Modified: trunk/csp/data/models/airbase/Airbase_Lights/Taxi_Light_Blue/Taxi_Light_Blue.osg trunk/csp/data/models/airbase/runway/runway.osg trunk/csp/data/xml/theater/balkan/airbase.xml trunk/csp/data/xml/theater/balkan/forest1.xml Log: update runway; add trees; change Taxi light 3d model Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1950 Diff omitted (980573 bytes). |
|
From: <sv...@ww...> - 2006-06-01 06:47:54
|
Author: mkrose Date: 2006-05-31 23:47:42 -0700 (Wed, 31 May 2006) New Revision: 1949 Modified: trunk/csp/__init__.py trunk/csp/csplib/data/Link.cpp trunk/csp/csplib/util/StringTools.cpp trunk/csp/csplib/util/Trace.cpp trunk/csp/csplib/util/Uniform.h trunk/csp/cspsim/f16/MultiFunctionDisplay.cpp Log: Various fixes for amd64 compilation errors under gcc. Also patch __init__.py to try setting dlopenflags even if the dl module isn't found. The latter probably won't help but shouldn't hurt. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1949 Modified: trunk/csp/__init__.py =================================================================== --- trunk/csp/__init__.py 2006-05-31 04:23:27 UTC (rev 1948) +++ trunk/csp/__init__.py 2006-06-01 06:47:42 UTC (rev 1949) @@ -23,12 +23,19 @@ def _configureModules(): if os.name == 'posix': + # 0x101 is fairly standard, but try to load the correct values from + # the dl module if available. + GLOBAL_AND_LAZY = 0x101 try: import dl + GLOBAL_AND_LAZY = dl.RTLD_GLOBAL|dl.RTLD_LAZY + except ImportError: + sys.stderr.write('warning: import dl failed; assuming standard dl flags\n') + try: # enable lazy loading of shared library modules if available. - sys.setdlopenflags(dl.RTLD_GLOBAL|dl.RTLD_LAZY) - except ImportError: - sys.stderr.write('import dl failed; lazy module loading not enabled.\n') + sys.setdlopenflags(GLOBAL_AND_LAZY) + except: + sys.stderr.write('warning: setdlopenflags failed; lazy module loading not enabled.\n') else: # if CSPDEVPACK is defined in the environment, add the devpack bin # directory to the execution path. this ensures that devpack libraries Modified: trunk/csp/csplib/data/Link.cpp =================================================================== --- trunk/csp/csplib/data/Link.cpp 2006-05-31 04:23:27 UTC (rev 1948) +++ trunk/csp/csplib/data/Link.cpp 2006-06-01 06:47:42 UTC (rev 1949) @@ -141,7 +141,7 @@ */ assert(_ppb.valid()); Object *obj = _ppb._reference; - CSPLOG(DEBUG, ARCHIVE) << "loaded " << obj->getClassName() << " @ 0x" << std::hex << reinterpret_cast<int>(obj); + CSPLOG(DEBUG, ARCHIVE) << "loaded " << obj->getClassName() << " @ " << obj; return _ppb; } Modified: trunk/csp/csplib/util/StringTools.cpp =================================================================== --- trunk/csp/csplib/util/StringTools.cpp 2006-05-31 04:23:27 UTC (rev 1948) +++ trunk/csp/csplib/util/StringTools.cpp 2006-06-01 06:47:42 UTC (rev 1949) @@ -254,11 +254,8 @@ return formatIntegerType<int64>(out, spec, x_val.ui64, false, base, lower); } case TYPE_PTR: { - if (sizeof(void*) == sizeof(unsigned)) { - return formatIntegerType<unsigned>(out, spec, reinterpret_cast<unsigned>(x_val.p), false, base, lower); - } else { - return formatIntegerType<uint64>(out, spec, reinterpret_cast<uint64>(x_val.p), false, base, lower); - } + uintptr_t val = alias_cast<uintptr_t>(x_val.p); + return formatIntegerType<uintptr_t>(out, spec, val, false, base, lower); } default: return false; Modified: trunk/csp/csplib/util/Trace.cpp =================================================================== --- trunk/csp/csplib/util/Trace.cpp 2006-05-31 04:23:27 UTC (rev 1948) +++ trunk/csp/csplib/util/Trace.cpp 2006-06-01 06:47:42 UTC (rev 1949) @@ -91,9 +91,9 @@ for (int i = _skip; i < _stack_depth; ++i) { Dl_info info; if (dladdr(_trace[i], &info) != 0) { - const int addr = reinterpret_cast<int>(_trace[i]); - const int sofs = addr - reinterpret_cast<int>(info.dli_saddr); - const int bofs = addr - reinterpret_cast<int>(info.dli_fbase); + const uintptr_t addr = alias_cast<uintptr_t>(_trace[i]); + const uintptr_t sofs = addr - alias_cast<uintptr_t>(info.dli_saddr); + const uintptr_t bofs = addr - alias_cast<uintptr_t>(info.dli_fbase); if (!info.dli_fname) info.dli_fname = "??"; if (!info.dli_sname) info.dli_sname = ""; os << std::hex Modified: trunk/csp/csplib/util/Uniform.h =================================================================== --- trunk/csp/csplib/util/Uniform.h 2006-05-31 04:23:27 UTC (rev 1948) +++ trunk/csp/csplib/util/Uniform.h 2006-06-01 06:47:42 UTC (rev 1949) @@ -28,6 +28,8 @@ #include <csp/csplib/util/Config.h> #include <csp/csplib/util/Namespace.h> +#include <cstring> // for memcpy + CSP_NAMESPACE @@ -90,6 +92,25 @@ # define CSP_UNUSED #endif +/* Borrow a minimal version of Boost's STATIC_ASSERT mechanism. + */ +template <bool> struct static_assert_failure; +template <> struct static_assert_failure<true> {}; +template <int> struct static_assert_test {}; +#define CSP_STATIC_ASSERT(expr) \ + typedef static_assert_test<sizeof(static_assert_failure<(bool)(expr)>)> static_assertion_##__LINE__ + +/* Portable cast operator for type-punning. Optimizes extremely well + * under gcc; haven't checked msvc assembly though. + */ +template <typename T1, typename T2> +inline T1 alias_cast(T2 src) { + CSP_STATIC_ASSERT(sizeof(T1) == sizeof(T2)); + T1 dst; + std::memcpy(&dst, &src, sizeof(dst)); + return dst; +} + //@} CSP_NAMESPACE_END Modified: trunk/csp/cspsim/f16/MultiFunctionDisplay.cpp =================================================================== --- trunk/csp/cspsim/f16/MultiFunctionDisplay.cpp 2006-05-31 04:23:27 UTC (rev 1948) +++ trunk/csp/cspsim/f16/MultiFunctionDisplay.cpp 2006-06-01 06:47:42 UTC (rev 1949) @@ -223,7 +223,7 @@ void DisplayText::setText(std::string const &text, bool invert) { TokenQueue tokens(text, "\n"); m_Lines.reserve(tokens.size()); - unsigned widest = 0; + size_t widest = 0; for (unsigned i = 0; i < tokens.size(); ++i) { widest = std::max(tokens[i].size(), widest); display::ElementText *text = (i < m_Lines.size()) ? m_Lines[i].get() : 0; |
|
From: <sv...@ww...> - 2006-05-31 04:23:34
|
Author: mkrose Date: 2006-05-30 21:23:27 -0700 (Tue, 30 May 2006) New Revision: 1948 Modified: trunk/csp/csplib/data/DataArchive.cpp Log: Fix 64-bit build error. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1948 Modified: trunk/csp/csplib/data/DataArchive.cpp =================================================================== --- trunk/csp/csplib/data/DataArchive.cpp 2006-05-23 05:28:10 UTC (rev 1947) +++ trunk/csp/csplib/data/DataArchive.cpp 2006-05-31 04:23:27 UTC (rev 1948) @@ -340,7 +340,7 @@ if (_manager == 0) throw; return _manager->getObject(path, path_str, this); } - CSPLOG(DEBUG, ARCHIVE) << "getObject using interface registry @ 0x" << std::hex << int(&(InterfaceRegistry::getInterfaceRegistry())); + CSPLOG(DEBUG, ARCHIVE) << "getObject using interface registry @ " << (&(InterfaceRegistry::getInterfaceRegistry())); InterfaceProxy *proxy = InterfaceRegistry::getInterfaceRegistry().getInterface(t->classhash); std::string from = path_str; if (from == "") from = getPathString(path.getPath()); |
|
From: <sv...@ww...> - 2006-05-23 05:28:17
|
Author: mkrose Date: 2006-05-22 22:28:10 -0700 (Mon, 22 May 2006) New Revision: 1947 Modified: trunk/csp/cspsim/theater/ElevationCorrection.h trunk/csp/cspsim/theater/LayoutTransform.h Log: Add windows export declarations to theater classes used by the layout tool. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1947 Modified: trunk/csp/cspsim/theater/ElevationCorrection.h =================================================================== --- trunk/csp/cspsim/theater/ElevationCorrection.h 2006-05-21 19:15:00 UTC (rev 1946) +++ trunk/csp/cspsim/theater/ElevationCorrection.h 2006-05-23 05:28:10 UTC (rev 1947) @@ -25,6 +25,7 @@ #ifndef __CSPSIM_THEATER_ELEVATIONCORRECTION_H__ #define __CSPSIM_THEATER_ELEVATIONCORRECTION_H__ +#include <csp/cspsim/Export.h> #include <csp/cspsim/theater/LayoutTransform.h> #include <osg/Vec3> @@ -38,7 +39,7 @@ * A helper class for correcting the elevation of static objects to match * the local terrain. */ -class ElevationCorrection: public LayoutTransform { +class CSPSIM_EXPORT ElevationCorrection: public LayoutTransform { TerrainObject *m_Terrain; ElevationCorrection() {} public: Modified: trunk/csp/cspsim/theater/LayoutTransform.h =================================================================== --- trunk/csp/cspsim/theater/LayoutTransform.h 2006-05-21 19:15:00 UTC (rev 1946) +++ trunk/csp/cspsim/theater/LayoutTransform.h 2006-05-23 05:28:10 UTC (rev 1947) @@ -26,6 +26,7 @@ #ifndef __CSPSIM_THEATER_LAYOUTTRANSFORM_H__ #define __CSPSIM_THEATER_LAYOUTTRANSFORM_H__ +#include <csp/cspsim/Export.h> #include <csp/csplib/util/Namespace.h> #include <osg/Vec3> @@ -38,7 +39,7 @@ * * A helper class for accumulationg and applying 2D displacements and rotations. */ -class LayoutTransform { +class CSPSIM_EXPORT LayoutTransform { float m_X, m_Y, m_Angle; float c, s; public: |
|
From: <sv...@ww...> - 2006-05-21 19:15:10
|
Author: mkrose Date: 2006-05-21 12:15:00 -0700 (Sun, 21 May 2006) New Revision: 1946 Modified: trunk/csp/tools/layout/UI.py trunk/csp/tools/layout/View.cpp trunk/csp/tools/layout/View.h trunk/csp/tools/layout/ViewManipulator.h Log: Fix layout tool segfaults under Windows, and untangle some circular references during exit. The program still segfaults on exit under WinXP, but only after all of the main objects have been deleted. The cause of the error isn't clear yet. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1946 Diff omitted (10358 bytes). |
|
From: <sv...@ww...> - 2006-05-21 19:12:04
|
Author: mkrose Date: 2006-05-21 12:11:54 -0700 (Sun, 21 May 2006) New Revision: 1945 Modified: trunk/csp/SConstruct trunk/csp/tools/build.py trunk/csp/tools/layout/SConstruct Log: Fix layout tool build errors. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1945 Modified: trunk/csp/SConstruct =================================================================== --- trunk/csp/SConstruct 2006-05-16 16:09:11 UTC (rev 1944) +++ trunk/csp/SConstruct 2006-05-21 19:11:54 UTC (rev 1945) @@ -157,10 +157,8 @@ env.AppendUnique(CPPDEFINES=Split('WIN32 __WIN32__ _USRDLL _DLL NDEBUG _CRT_SECURE_NO_DEPRECATE')) env.AppendUnique(LINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo')) env.AppendUnique(SHLINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo')) - # FIXME why is LIBPATH being overwritten? quick hack for now is to add the path to linkflags. env.AppendUnique(LIBPATH=[build.PYTHON_LIBRARY]) - env.AppendUnique(LINKFLAGS=['/LIBPATH:%s' % build.PYTHON_LIBRARY]) - env.CopyEnvironment(Split('PATH INCLUDE LIB')) # FIXME + env.CopyEnvironment(Split('PATH INCLUDE LIB')) def customize_linux(self, env): env['CXXFLAGS'] = Split('-O2 -g -W -Wall -pedantic -Wno-long-long') Modified: trunk/csp/tools/build.py =================================================================== --- trunk/csp/tools/build.py 2006-05-16 16:09:11 UTC (rev 1944) +++ trunk/csp/tools/build.py 2006-05-21 19:11:54 UTC (rev 1945) @@ -1289,7 +1289,8 @@ bdeps = Flatten(bdeps) objects = Flatten(objects) settings.merge(self._options) - shlib = self._env.SharedLibrary(self._target, objects, **settings) + settings.apply(self._env); + shlib = self._env.SharedLibrary(self._target, objects) Alias = SCons.Defaults.DefaultEnvironment().Alias Alias(self._name, shlib) if self._aliases: Modified: trunk/csp/tools/layout/SConstruct =================================================================== --- trunk/csp/tools/layout/SConstruct 2006-05-16 16:09:11 UTC (rev 1944) +++ trunk/csp/tools/layout/SConstruct 2006-05-21 19:11:54 UTC (rev 1945) @@ -31,23 +31,40 @@ build.PkgConfig(package='openscenegraph', version='1.0.0'), build.PkgConfig(package='openthreads', version='1.0.0'), build.PkgConfig(package='producer', version='1.0.0'), - build.DevpackConfig(dlls=['osg', 'osgDB', 'osgFX', 'osgGA', 'osgParticle', 'osgProducer', 'osgText', 'osgUtil', 'OpenThreadsWin32'], headers=[('osg', 'Depth'), ('osgText', 'Font')]), + build.DevpackConfig(dlls=['osg', 'osgDB', 'osgFX', 'osgGA', 'osgParticle', 'osgProducer', 'osgText', 'osgUtil', 'OpenThreadsWin32', 'Producer'], headers=[('osg', 'Depth'), ('osgText', 'Font')]), ]) class PlatformSettings: def customize_linux(self, env): env['CXXFLAGS'] = '-g -Wall -O2' env['SWIGCXXFLAGS'] = '-O2 -g' + def customize_win(self, env): + env.CopyEnvironment(Split('PATH INCLUDE LIB')) + env['CXXFLAGS'] = Split('/GR /MD /O2 /EHsc /W3 /Zi /nologo') + env.AppendUnique(CPPDEFINES=Split('WIN32 __WIN32__ _USRDLL _DLL NDEBUG _CRT_SECURE_NO_DEPRECATE')) + env.AppendUnique(LINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo')) + env.AppendUnique(SHLINKFLAGS=Split('/INCREMENTAL:NO /RELEASE /nologo')) + env.AppendUnique(LIBPATH=[build.PYTHON_LIBRARY]) + # currently there isn't a clean way to depend on the csplib/cspsim libs since they are + # under a separate SConstruct file. probably should merge this SConstruct into the + # global one, but for now we just specify the libs by hand. + env.AppendUnique(LIBPATH=['#/../../cspsim/.bin', '#/../../csplib/.bin']) + env.AppendUnique(SHLINKFLAGS=[Split('%s %s' % ('cspsim.lib', 'csplib.lib'))]) + +INCLUDES = ['#', '#/../../..', build.PYTHON_INCLUDE] + settings = build.GlobalSettings() settings.SWIGFLAGS = '-python -c++' settings.CXXFILESUFFIX = '.cpp' -settings.CPPPATH = ['.', '#/../../..', build.PYTHON_INCLUDE] +settings.CPPPATH = INCLUDES +settings.SWIGINCLUDES = INCLUDES settings.AddPlatformSettings(PlatformSettings) env = settings.env() -build.SourceGroup(env, - name = 'layout', + +build.SharedLibrary(env, + name = 'cLayout', sources = [ 'cLayout.i', 'DynamicGrid.cpp', @@ -58,29 +75,21 @@ 'View.cpp', 'ViewEventHandler.cpp', ], - deps = ['osg']) + deps = ['osg'], + aliases = 'all', + SHLIBPREFIX = '_') -build.SourceGroup(env, - name = 'loader', +build.SharedLibrary(env, + name = 'cLoader', sources = [ 'cLoader.i', 'Handle.cpp', 'Loader.cpp', ], - deps = ['osg']) - -build.SharedLibrary(env, - name = 'cLayout', - sources = ['@layout'], + deps = ['osg'], aliases = 'all', SHLIBPREFIX = '_') -build.SharedLibrary(env, - name = 'cLoader', - sources = ['@loader'], - aliases = 'all', - SHLIBPREFIX = '_') - build.BuildRegistry.Configure(env) build.BuildRegistry.Build() |
Author: lologramme Date: 2006-05-16 09:09:11 -0700 (Tue, 16 May 2006) New Revision: 1944 Added: trunk/csp/data/models/airbase/runway/images/ trunk/csp/data/models/airbase/runway/images/T02.png trunk/csp/data/models/airbase/runway/images/T03.png trunk/csp/data/models/airbase/runway/images/T04.png trunk/csp/data/models/airbase/runway/images/T05.png trunk/csp/data/models/airbase/runway/images/Yellow.png trunk/csp/data/models/airbase/runway/images/taxi01.png trunk/csp/data/models/airbase/runway/runway.osg trunk/csp/data/models/airbase/tower1/images/ trunk/csp/data/models/airbase/tower1/images/T1.png trunk/csp/data/models/airbase/tower1/images/T2.png trunk/csp/data/models/airbase/tower1/tower1.osg Removed: trunk/csp/data/models/airbase/runway/T01.jpg trunk/csp/data/models/airbase/runway/T02.jpg trunk/csp/data/models/airbase/runway/T03.jpg trunk/csp/data/models/airbase/runway/T04.jpg trunk/csp/data/models/airbase/runway/T05.jpg trunk/csp/data/models/airbase/runway/T06.jpg trunk/csp/data/models/airbase/runway/Yellow.jpg trunk/csp/data/models/airbase/runway/route01.jpg trunk/csp/data/models/airbase/runway/runway.3ds trunk/csp/data/models/airbase/runway/taxi01.jpg trunk/csp/data/models/airbase/tower1/texture1.jpg trunk/csp/data/models/airbase/tower1/tower1.3ds Modified: trunk/csp/data/xml/theater/balkan/airbase.xml trunk/csp/data/xml/theater/balkan/runway/model.xml trunk/csp/data/xml/theater/balkan/tower1/model.xml Log: Airbase modifications Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1944 Diff omitted (1219793 bytes). |
|
From: <sv...@ww...> - 2006-05-10 19:55:56
|
Author: stormbringer Date: 2006-05-10 12:55:50 -0700 (Wed, 10 May 2006) New Revision: 1943 Added: trunk/csp/data/sounds/afterburner.ogg Log: The afterburner.ogg file Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1943 Added: trunk/csp/data/sounds/afterburner.ogg =================================================================== (Binary files differ) Property changes on: trunk/csp/data/sounds/afterburner.ogg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <sv...@ww...> - 2006-05-10 19:55:07
|
Author: stormbringer Date: 2006-05-10 12:55:00 -0700 (Wed, 10 May 2006) New Revision: 1942 Modified: trunk/csp/data/xml/vehicles/aircraft/f16/resources.xml Log: XML for the new afterburner sound Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1942 Modified: trunk/csp/data/xml/vehicles/aircraft/f16/resources.xml =================================================================== --- trunk/csp/data/xml/vehicles/aircraft/f16/resources.xml 2006-05-10 19:54:28 UTC (rev 1941) +++ trunk/csp/data/xml/vehicles/aircraft/f16/resources.xml 2006-05-10 19:55:00 UTC (rev 1942) @@ -23,6 +23,14 @@ <Int name="priority">10</Int> </Object> <Object class="SoundSample"> + <String name="name">afterburner</String> + <External name="filename">../data/sounds/afterburner.ogg</External> + <Bool name="looping">true</Bool> + <Float name="reference_distance">70.0</Float> + <Float name="max_distance">50000.0</Float> + <Int name="priority">10</Int> + </Object> + <Object class="SoundSample"> <String name="name">wheel_touchdown</String> <External name="filename">../data/sounds/f16_touchdown.ogg</External> <Bool name="looping">false</Bool> |
|
From: <sv...@ww...> - 2006-05-10 19:54:36
|
Author: stormbringer Date: 2006-05-10 12:54:28 -0700 (Wed, 10 May 2006) New Revision: 1941 Modified: trunk/csp/cspsim/Engine.cpp trunk/csp/cspsim/Engine.h Log: - Engine sound now reacts to throttle - Added an afterburner sound Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1941 Modified: trunk/csp/cspsim/Engine.cpp =================================================================== --- trunk/csp/cspsim/Engine.cpp 2006-05-09 14:36:34 UTC (rev 1940) +++ trunk/csp/cspsim/Engine.cpp 2006-05-10 19:54:28 UTC (rev 1941) @@ -88,18 +88,31 @@ assert(model); CSPLOG(DEBUG, AUDIO) << "Engine::bindSounds"; if (bundle) { + // set main engine sound CSPLOG(DEBUG, AUDIO) << "Engine::bindSounds have bundle"; - Ref<const SoundSample> sample(bundle->getSoundSample("engine")); - m_EngineSound = SoundEffect::ExternalSound(sample, model); + Ref<const SoundSample> engine_sample(bundle->getSoundSample("engine")); + m_EngineSound = SoundEffect::ExternalSound(engine_sample, model); if (m_EngineSound.valid()) { - CSPLOG(DEBUG, AUDIO) << "Engine::bindSounds have sound"; + CSPLOG(DEBUG, AUDIO) << "Engine::bindSounds engine sound available"; m_EngineSound->state()->setPosition(toOSG(m_EngineOffset)); m_EngineSound->state()->setDirection(toOSG(m_ThrustDirection)); CSPLOG(DEBUG, AUDIO) << "engine sound position " << m_EngineOffset; CSPLOG(DEBUG, AUDIO) << "engine sound direction " << m_ThrustDirection; m_EngineSound->state()->apply(); - m_EngineSound->play(); // TODO rpm dependence + m_EngineSound->play(); // ToDo: check if engine's really running } + + // set afterburner sound + Ref<const SoundSample> afterburner_sample(bundle->getSoundSample("afterburner")); + m_AfterburnerSound = SoundEffect::ExternalSound(afterburner_sample, model); + if (m_AfterburnerSound.valid()) { + CSPLOG(DEBUG, AUDIO) << "Engine::bindSounds afterburner sound available"; + m_AfterburnerSound->state()->setPosition(toOSG(m_EngineOffset)); + m_AfterburnerSound->state()->setDirection(toOSG(m_ThrustDirection)); + CSPLOG(DEBUG, AUDIO) << "afterburner sound position " << m_EngineOffset; + CSPLOG(DEBUG, AUDIO) << "afterburner sound direction " << m_ThrustDirection; + m_AfterburnerSound->state()->apply(); + } } CSPLOG(DEBUG, AUDIO) << "Engine::bindSounds exit"; } @@ -196,6 +209,8 @@ void EngineDynamics::preSimulationStep(double dt) { BaseDynamics::preSimulationStep(dt); m_Force = m_Moment = Vector3::ZERO; + float fPitch, fBlend; + bool isPlaying; if (!m_Engine.empty()) { const double alpha = b_Alpha->value(); const double altitude = m_PositionLocal->z(); @@ -212,6 +227,32 @@ Vector3 force = (*i)->getThrustVector(); m_Force += force; m_Moment += (*i)->m_EngineOffset ^ force; + fBlend = (*i)->getBlend(); + fPitch = fBlend; + // Using fBlend as a modulator for pitch and gain is a simple ad-hoc + // solution, but yields to nice results. fPitch must be clamped to 1.999, + // because OpenAL crashes when using a value >= 2.0 + if((*i)->m_EngineSound.valid()) { + if (fBlend >= 2.0) { + fPitch = 1.999; + } + (*i)->m_EngineSound->state()->setPitch(fPitch); + (*i)->m_EngineSound->state()->setGain(fBlend); + (*i)->m_EngineSound->state()->apply(); + } + + // the afterburner sound is played when fBlend is between 2 and 3 + // ToDo: check whether this is the right parameter to determine if burner is running + if((*i)->m_AfterburnerSound.valid()) { + (*i)->m_AfterburnerSound->state()->setGain(fBlend); + isPlaying = (*i)->m_AfterburnerSound->state()->getPlay(); + if (fBlend > 2.0 && !isPlaying) { + (*i)->m_AfterburnerSound->play(); + } + if (fBlend <= 2.0 && isPlaying) { + (*i)->m_AfterburnerSound->play(false); + } + } } } } Modified: trunk/csp/cspsim/Engine.h =================================================================== --- trunk/csp/cspsim/Engine.h 2006-05-09 14:36:34 UTC (rev 1940) +++ trunk/csp/cspsim/Engine.h 2006-05-10 19:54:28 UTC (rev 1941) @@ -95,6 +95,9 @@ virtual double getThrust() const { return m_LastThrust; }; virtual Vector3 getThrustVector() const { return m_LastThrust * m_ThrustDirection; } + Ref<SoundEffect> getEngineSound() const { return m_EngineSound; } + Ref<SoundEffect> getAfterburnerSound () const { return m_AfterburnerSound; } + Vector3 const &getSmokeEmitterLocation() const; virtual void update(double) { updateThrust(); } @@ -115,8 +118,9 @@ */ virtual void bindSounds(SoundModel *model, ResourceBundle *bundle=0); - // A single external sound for now. + // Engine sounds Ref<SoundEffect> m_EngineSound; + Ref<SoundEffect> m_AfterburnerSound; }; |
|
From: <sv...@ww...> - 2006-05-09 14:36:44
|
Author: mkrose Date: 2006-05-09 07:36:34 -0700 (Tue, 09 May 2006) New Revision: 1940 Added: trunk/csp/tools/layout/RegionSelect.cpp trunk/csp/tools/layout/RegionSelect.h Log: Add missing files for the layout tool. RegionSelect will be used to select multiple objects in a rectangular region, although this feature is not fully implemented yet. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1940 Added: trunk/csp/tools/layout/RegionSelect.cpp =================================================================== --- trunk/csp/tools/layout/RegionSelect.cpp 2006-05-02 18:02:28 UTC (rev 1939) +++ trunk/csp/tools/layout/RegionSelect.cpp 2006-05-09 14:36:34 UTC (rev 1940) @@ -0,0 +1,90 @@ +// CSPLayout +// Copyright 2005 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, US + + +#include "RegionSelect.h" + +#include <osg/Geode> +#include <osg/Geometry> +#include <osg/LineStipple> +#include <osg/MatrixTransform> +#include <osg/PrimitiveSet> +#include <osg/Projection> + +#include <cmath> +#include <cassert> +#include <iostream> + +RegionSelect::RegionSelect() { + osg::Projection *projection = new osg::Projection; + projection->setMatrix(osg::Matrix::ortho2D(-1, 1, -1, 1)); + osg::MatrixTransform *model_view_abs = new osg::MatrixTransform; + model_view_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF); + model_view_abs->setMatrix(osg::Matrix::identity()); + + model_view_abs->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF); + model_view_abs->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF); + model_view_abs->getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN); + model_view_abs->getOrCreateStateSet()->setRenderBinDetails(11, "RenderBin"); + + _vertex_array = new osg::Vec3Array(4); + (*_vertex_array)[0].set(0.0, 0.0, 0.0); + (*_vertex_array)[1].set(0.0, 0.0, 0.0); + (*_vertex_array)[2].set(0.0, 0.0, 0.0); + (*_vertex_array)[3].set(0.0, 0.0, 0.0); + osg::Geode *geode = new osg::Geode(); + _box = new osg::Geometry(); + _box->setVertexArray(_vertex_array.get()); + + osg::Vec4Array *color_array = new osg::Vec4Array; + color_array->push_back(osg::Vec4(1.0, 1.0, 1.0, 0.5)); + _box->setColorArray(color_array); + _box->setColorBinding(osg::Geometry::BIND_OVERALL); + + osg::Vec3Array *normal_array = new osg::Vec3Array; + normal_array->push_back(osg::Vec3(0.0, -1.0, 0.0)); + _box->setNormalArray(normal_array); + _box->setNormalBinding(osg::Geometry::BIND_OVERALL); + + _box->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINE_LOOP, 0, 4)); + addChild(projection); + projection->addChild(model_view_abs); + model_view_abs->addChild(geode); + geode->addDrawable(_box.get()); + osg::LineStipple *stipple = new osg::LineStipple; + stipple->setPattern(0x5555); + geode->getOrCreateStateSet()->setAttributeAndModes(stipple); +} + +void RegionSelect::hide() { + setNodeMask(0); +} + +void RegionSelect::show() { + setNodeMask(~0); +} + +void RegionSelect::update(float x0, float y0, float x1, float y1) { + assert(_vertex_array.valid()); + (*_vertex_array)[0].set(x0, y0, -1.0); + (*_vertex_array)[1].set(x1, y0, -1.0); + (*_vertex_array)[2].set(x1, y1, -1.0); + (*_vertex_array)[3].set(x0, y1, -1.0); + _box->setVertexArray(_vertex_array.get()); +} + + Added: trunk/csp/tools/layout/RegionSelect.h =================================================================== --- trunk/csp/tools/layout/RegionSelect.h 2006-05-02 18:02:28 UTC (rev 1939) +++ trunk/csp/tools/layout/RegionSelect.h 2006-05-09 14:36:34 UTC (rev 1940) @@ -0,0 +1,45 @@ +// CSPLayout +// Copyright 2005 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, US + + +#ifndef __CSP_LAYOUT_REGIONSELECT_H__ +#define __CSP_LAYOUT_REGIONSELECT_H__ + +#include <osg/ref_ptr> +#include <osg/Array> +#include <osg/Group> +#include <osg/Vec3> + +namespace osg { class Geometry; } + +/** + * A scene element that provides a 2D selection box. + */ +class RegionSelect: public osg::Group { +public: + RegionSelect(); + + void hide(); + void show(); + void update(float, float, float, float); + +private: + osg::ref_ptr<osg::Vec3Array> _vertex_array; + osg::ref_ptr<osg::Geometry> _box; +}; + +#endif // __CSP_LAYOUT_REGIONSELECT_H__ |
|
From: <sv...@ww...> - 2006-05-02 18:02:39
|
Author: stormbringer Date: 2006-05-02 11:02:28 -0700 (Tue, 02 May 2006) New Revision: 1939 Modified: trunk/csp/cspsim/LandingGear.cpp Log: The touchdown flag is now set back correctly Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1939 Modified: trunk/csp/cspsim/LandingGear.cpp =================================================================== --- trunk/csp/cspsim/LandingGear.cpp 2006-04-30 21:31:33 UTC (rev 1938) +++ trunk/csp/cspsim/LandingGear.cpp 2006-05-02 18:02:28 UTC (rev 1939) @@ -33,6 +33,7 @@ * - move spindown to common method * - base spindown on friction coefficient (Real) * - real wheel inertia? + * Touchdown check via push channel * */ @@ -780,12 +781,10 @@ m_Gear[i]->postSimulationStep(dt, model_origin_local, vBody, *m_Attitude, m_Height, m_GroundNormalBody); // generic WOW signal (any gear in contact with the ground triggers it) if (m_Gear[i]->getWOW()) b_WOW->value() = true; - //if (m_Gear[i]->getTouchdown()) { - // if (m_Gear[i]->getTouchdownSkid()) { - // if (m_Gear[i]->getTouchdownSound().valid()) m_Gear[i]->getTouchdownSound()->play(); - // } - // m_Gear[i]->resetTouchdown(); - //} + // TODO: The touchdown flag should be implemented as a push channel + if (m_Gear[i]->getTouchdown()) { + m_Gear[i]->resetTouchdown(); + } } } |
|
From: <sv...@ww...> - 2006-04-30 21:31:41
|
Author: stormbringer Date: 2006-04-30 14:31:33 -0700 (Sun, 30 Apr 2006) New Revision: 1938 Modified: trunk/csp/cspsim/LandingGear.cpp Log: moved touchdown sound to LandingGear::updateWOW Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1938 Modified: trunk/csp/cspsim/LandingGear.cpp =================================================================== --- trunk/csp/cspsim/LandingGear.cpp 2006-04-30 18:05:10 UTC (rev 1937) +++ trunk/csp/cspsim/LandingGear.cpp 2006-04-30 21:31:33 UTC (rev 1938) @@ -227,6 +227,10 @@ m_TouchdownSkid = fabs(vGroundBody.length() - getWheelSpeed()) > 10.0 * (1.0 - m_TouchdownVerticalVelocity); m_TouchdownPoint = origin + q.rotate(m_Position); b_WOW->value() = true; + // play touchdown sound + if (m_TouchdownSkid) { + if (getTouchdownSound().valid()) getTouchdownSound()->play(); + } } } else { b_WOW->value() = false; @@ -776,12 +780,12 @@ m_Gear[i]->postSimulationStep(dt, model_origin_local, vBody, *m_Attitude, m_Height, m_GroundNormalBody); // generic WOW signal (any gear in contact with the ground triggers it) if (m_Gear[i]->getWOW()) b_WOW->value() = true; - if (m_Gear[i]->getTouchdown()) { - if (m_Gear[i]->getTouchdownSkid()) { - if (m_Gear[i]->getTouchdownSound().valid()) m_Gear[i]->getTouchdownSound()->play(); - } - m_Gear[i]->resetTouchdown(); - } + //if (m_Gear[i]->getTouchdown()) { + // if (m_Gear[i]->getTouchdownSkid()) { + // if (m_Gear[i]->getTouchdownSound().valid()) m_Gear[i]->getTouchdownSound()->play(); + // } + // m_Gear[i]->resetTouchdown(); + //} } } |
|
From: <sv...@ww...> - 2006-04-30 18:05:21
|
Author: mkrose Date: 2006-04-30 11:05:10 -0700 (Sun, 30 Apr 2006) New Revision: 1937 Modified: trunk/csp/tools/build.py trunk/csp/tools/layout/DataTree.py trunk/csp/tools/layout/DynamicGrid.cpp trunk/csp/tools/layout/Loader.cpp trunk/csp/tools/layout/Loader.h trunk/csp/tools/layout/Object.py trunk/csp/tools/layout/ObjectInterface.py trunk/csp/tools/layout/PickHandler.cpp trunk/csp/tools/layout/SConstruct trunk/csp/tools/layout/UI.py trunk/csp/tools/layout/View.cpp trunk/csp/tools/layout/View.h trunk/csp/tools/layout/ViewManipulator.h trunk/csp/tools/layout/layout Log: Update layout tool to build and run under Linux. Haven't tried it under Windows yet. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1937 Diff omitted (26415 bytes). |
|
From: <sv...@ww...> - 2006-04-29 22:12:04
|
Author: mkrose Date: 2006-04-29 15:11:57 -0700 (Sat, 29 Apr 2006) New Revision: 1936 Added: trunk/csp/data/models/airbase/bombs_trailer/bombs_trailer_shadow.osg Modified: trunk/csp/data/xml/theater/balkan/bombs_trailer/model.xml Log: Add a ground shadow for the bomb trailer. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1936 Added: trunk/csp/data/models/airbase/bombs_trailer/bombs_trailer_shadow.osg =================================================================== --- trunk/csp/data/models/airbase/bombs_trailer/bombs_trailer_shadow.osg 2006-04-29 22:11:13 UTC (rev 1935) +++ trunk/csp/data/models/airbase/bombs_trailer/bombs_trailer_shadow.osg 2006-04-29 22:11:57 UTC (rev 1936) @@ -0,0 +1,133 @@ +Geode { + DataVariance STATIC + name "SHADOW_PLANE_GEODE" + cullingActive TRUE + num_drawables 1 + Geometry { + StateSet { + DataVariance STATIC + GL_BLEND ON + Material { + DataVariance STATIC + ColorMode OFF + diffuseColor 0.0 0.0 0.0 0.6 + specularColor 0.0 0.0 0.0 0.6 + emissionColor 0.0 0.0 0.0 0.6 + shininess 0.0 + } + } + VertexArray 80 { + 0.305799990892 1.52870595455 0.0 + 0.0615703314543 1.52870643139 0.0 + 0.061570212245 -1.67996644974 0.0 + 0.324831664562 -1.67996656895 0.0 + 0.305799990892 1.52870595455 0.0 + 0.324831664562 -1.67996656895 0.0 + 0.407155334949 -1.67996656895 0.0 + 0.424918740988 1.52870595455 0.0 + 0.424918740988 1.52870595455 0.0 + 0.407155334949 -1.67996656895 0.0 + 0.765622138977 -1.67996656895 0.0 + 0.765622138977 1.52870595455 0.0 + 0.424918740988 1.52870595455 0.0 + 0.414388209581 1.55655503273 0.0 + 0.396206915379 1.55655503273 0.0 + 0.316330522299 1.55655503273 0.0 + 0.305799990892 1.52870595455 0.0 + 0.337097108364 1.55655503273 0.0 + 0.305799990892 1.52870595455 0.0 + 0.424918740988 1.52870595455 0.0 + 0.396206915379 1.55655503273 0.0 + 0.337097108364 1.55655503273 0.0 + 0.337097108364 1.55655503273 0.0 + 0.396206915379 1.55655503273 0.0 + 0.396206915379 1.60383546352 0.0 + 0.337097108364 1.60383546352 0.0 + 0.407155334949 -1.67996656895 0.0 + 0.324831664562 -1.67996656895 0.0 + 0.328718662262 -1.70445883274 0.0 + 0.40326833725 -1.70445883274 0.0 + 0.061570212245 -1.67996644974 0.0 + 0.0615703314543 1.52870643139 0.0 + -0.0560467168689 1.52870643139 0.0 + -0.0560467168689 -1.67996644974 0.0 + -0.0560467168689 1.52870643139 0.0 + 0.0615703314543 1.52870643139 0.0 + 0.042353823781 2.12874674797 0.0 + -0.0368477627635 2.12874674797 0.0 + -0.0368477627635 2.12874674797 0.0 + 0.042353823781 2.12874674797 0.0 + 0.0797017663717 2.19576358795 0.0 + -0.0741956979036 2.19576358795 0.0 + -0.0741956979036 2.19576358795 0.0 + 0.0797017663717 2.19576358795 0.0 + 0.0797017663717 2.20489144325 0.0 + -0.0741956979036 2.20489144325 0.0 + -0.0741956979036 2.20489144325 0.0 + 0.0797017663717 2.20489144325 0.0 + 0.0416194573045 2.26542282104 0.0 + -0.0361133888364 2.26542282104 0.0 + -0.411937385798 -1.67996656895 0.0 + -0.329613596201 -1.67996656895 0.0 + -0.333500653505 -1.70445883274 0.0 + -0.408050328493 -1.70445883274 0.0 + -0.341879040003 1.55655503273 0.0 + -0.400988966227 1.55655503273 0.0 + -0.400988966227 1.60383546352 0.0 + -0.341879040003 1.60383546352 0.0 + -0.310581952333 1.52870595455 0.0 + -0.429700762033 1.52870595455 0.0 + -0.400988966227 1.55655503273 0.0 + -0.341879040003 1.55655503273 0.0 + -0.321112543344 1.55655503273 0.0 + -0.310581952333 1.52870595455 0.0 + -0.341879040003 1.55655503273 0.0 + -0.429700762033 1.52870595455 0.0 + -0.419170171022 1.55655503273 0.0 + -0.400988966227 1.55655503273 0.0 + -0.429700762033 1.52870595455 0.0 + -0.411937385798 -1.67996656895 0.0 + -0.770404160023 -1.67996656895 0.0 + -0.770404160023 1.52870595455 0.0 + -0.310581952333 1.52870595455 0.0 + -0.329613596201 -1.67996656895 0.0 + -0.411937385798 -1.67996656895 0.0 + -0.429700762033 1.52870595455 0.0 + -0.310581952333 1.52870595455 0.0 + -0.0560467168689 1.52870643139 0.0 + -0.0560467168689 -1.67996644974 0.0 + -0.329613596201 -1.67996656895 0.0 + } + NormalBinding OVERALL + NormalArray 80 { + 0.0 0.0 1.0 + } + PrimitiveSets 2 { + DrawElementsUInt TRIANGLES 4 { + 12 13 14 + 15 16 17 + 62 63 64 + 65 66 67 + } + DrawElementsUInt QUADS 17 { + 0 1 2 3 + 4 5 6 7 + 8 9 10 11 + 18 19 20 21 + 22 23 24 25 + 26 27 28 29 + 30 31 32 33 + 34 35 36 37 + 38 39 40 41 + 42 43 44 45 + 46 47 48 49 + 50 51 52 53 + 54 55 56 57 + 58 59 60 61 + 68 69 70 71 + 72 73 74 75 + 76 77 78 79 + } + } + } +} Modified: trunk/csp/data/xml/theater/balkan/bombs_trailer/model.xml =================================================================== --- trunk/csp/data/xml/theater/balkan/bombs_trailer/model.xml 2006-04-29 22:11:13 UTC (rev 1935) +++ trunk/csp/data/xml/theater/balkan/bombs_trailer/model.xml 2006-04-29 22:11:57 UTC (rev 1936) @@ -2,6 +2,7 @@ <Object class="ObjectModel"> <External name="model_path">airbase/bombs_trailer/bombs_trailer.osg</External> + <External name="ground_shadowpath">airbase/bombs_trailer/bombs_trailer_shadow.osg</External> <Vector name="axis_0">1 0 0</Vector> <Vector name="axis_1">0 1 0</Vector> <Bool name="smooth">true</Bool> |
|
From: <sv...@ww...> - 2006-04-29 22:11:20
|
Author: mkrose Date: 2006-04-29 15:11:13 -0700 (Sat, 29 Apr 2006) New Revision: 1935 Modified: trunk/csp/cspsim/theater/FeatureObjectModel.cpp Log: Enable ground shadows for static objects. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1935 Modified: trunk/csp/cspsim/theater/FeatureObjectModel.cpp =================================================================== --- trunk/csp/cspsim/theater/FeatureObjectModel.cpp 2006-04-29 19:14:47 UTC (rev 1934) +++ trunk/csp/cspsim/theater/FeatureObjectModel.cpp 2006-04-29 22:11:13 UTC (rev 1935) @@ -52,6 +52,9 @@ model = new FeatureSceneModel(transform); } model->addChild(m_ObjectModel->getModel().get()); + if (m_ObjectModel->getGroundShadow().valid()) { + model->addChild(m_ObjectModel->getGroundShadow().get()); + } group->addChild(model); } |
|
From: <sv...@ww...> - 2006-04-29 19:14:54
|
Author: mkrose Date: 2006-04-29 12:14:47 -0700 (Sat, 29 Apr 2006) New Revision: 1934 Added: trunk/csp/tools/layout/layout Log: Copy the main layout script as well. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1934 Copied: trunk/csp/tools/layout/layout (from rev 1933, branches/unrefactored/CSP/CSPSim/Tools/Layout/csplayout) |
|
From: <sv...@ww...> - 2006-04-29 18:41:40
|
Author: mkrose Date: 2006-04-29 11:41:33 -0700 (Sat, 29 Apr 2006) New Revision: 1933 Added: trunk/csp/tools/layout/Config.py trunk/csp/tools/layout/DataTree.py trunk/csp/tools/layout/DynamicGrid.cpp trunk/csp/tools/layout/DynamicGrid.h trunk/csp/tools/layout/FeatureGraph.cpp trunk/csp/tools/layout/FeatureGraph.h trunk/csp/tools/layout/Handle.cpp trunk/csp/tools/layout/Handle.h trunk/csp/tools/layout/InsertDeleteCommand.h trunk/csp/tools/layout/LayoutNodes.cpp trunk/csp/tools/layout/LayoutNodes.h trunk/csp/tools/layout/Loader.cpp trunk/csp/tools/layout/Loader.h trunk/csp/tools/layout/Object.py trunk/csp/tools/layout/ObjectInterface.py trunk/csp/tools/layout/PickHandler.cpp trunk/csp/tools/layout/PickHandler.h trunk/csp/tools/layout/SConstruct trunk/csp/tools/layout/UI.py trunk/csp/tools/layout/Undo.h trunk/csp/tools/layout/View.cpp trunk/csp/tools/layout/View.h trunk/csp/tools/layout/ViewEventHandler.cpp trunk/csp/tools/layout/ViewEventHandler.h trunk/csp/tools/layout/ViewManipulator.h trunk/csp/tools/layout/cLayout.i trunk/csp/tools/layout/cLoader.i trunk/csp/tools/layout/domtree.py trunk/csp/tools/layout/ids.py trunk/csp/tools/layout/images/move-on.png trunk/csp/tools/layout/images/move.png trunk/csp/tools/layout/images/move.xcf trunk/csp/tools/layout/images/rotate-on.png trunk/csp/tools/layout/images/rotate.png trunk/csp/tools/layout/images/rotate.xcf trunk/csp/tools/layout/images/views.xcf trunk/csp/tools/layout/images/viewz.png Log: Copy theater layout tool from branches/unrefactored to trunk. No fixups have been applied yet so it will not work as is. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1933 Copied: trunk/csp/tools/layout/Config.py (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Config.py) Copied: trunk/csp/tools/layout/DataTree.py (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/DataTree.py) Copied: trunk/csp/tools/layout/DynamicGrid.cpp (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/DynamicGrid.cpp) Copied: trunk/csp/tools/layout/DynamicGrid.h (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/DynamicGrid.h) Copied: trunk/csp/tools/layout/FeatureGraph.cpp (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/FeatureGraph.cpp) Copied: trunk/csp/tools/layout/FeatureGraph.h (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/FeatureGraph.h) Copied: trunk/csp/tools/layout/Handle.cpp (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Handle.cpp) Copied: trunk/csp/tools/layout/Handle.h (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Handle.h) Copied: trunk/csp/tools/layout/InsertDeleteCommand.h (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/InsertDeleteCommand.h) Copied: trunk/csp/tools/layout/LayoutNodes.cpp (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/LayoutNodes.cpp) Copied: trunk/csp/tools/layout/LayoutNodes.h (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/LayoutNodes.h) Copied: trunk/csp/tools/layout/Loader.cpp (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Loader.cpp) Copied: trunk/csp/tools/layout/Loader.h (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Loader.h) Copied: trunk/csp/tools/layout/Object.py (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Object.py) Copied: trunk/csp/tools/layout/ObjectInterface.py (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/ObjectInterface.py) Copied: trunk/csp/tools/layout/PickHandler.cpp (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/PickHandler.cpp) Copied: trunk/csp/tools/layout/PickHandler.h (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/PickHandler.h) Copied: trunk/csp/tools/layout/SConstruct (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/SConstruct) Copied: trunk/csp/tools/layout/UI.py (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/UI.py) Copied: trunk/csp/tools/layout/Undo.h (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Undo.h) Copied: trunk/csp/tools/layout/View.cpp (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/View.cpp) Copied: trunk/csp/tools/layout/View.h (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/View.h) Copied: trunk/csp/tools/layout/ViewEventHandler.cpp (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/ViewEventHandler.cpp) Copied: trunk/csp/tools/layout/ViewEventHandler.h (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/ViewEventHandler.h) Copied: trunk/csp/tools/layout/ViewManipulator.h (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/ViewManipulator.h) Copied: trunk/csp/tools/layout/cLayout.i (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/cLayout.i) Copied: trunk/csp/tools/layout/cLoader.i (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/cLoader.i) Copied: trunk/csp/tools/layout/domtree.py (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/domtree.py) Copied: trunk/csp/tools/layout/ids.py (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/ids.py) Copied: trunk/csp/tools/layout/images/move-on.png (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Images/move-on.png) Copied: trunk/csp/tools/layout/images/move.png (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Images/move.png) Copied: trunk/csp/tools/layout/images/move.xcf (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Images/move.xcf) Copied: trunk/csp/tools/layout/images/rotate-on.png (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Images/rotate-on.png) Copied: trunk/csp/tools/layout/images/rotate.png (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Images/rotate.png) Copied: trunk/csp/tools/layout/images/rotate.xcf (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Images/rotate.xcf) Copied: trunk/csp/tools/layout/images/views.xcf (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Images/views.xcf) Copied: trunk/csp/tools/layout/images/viewz.png (from rev 1932, branches/unrefactored/CSP/CSPSim/Tools/Layout/Images/viewz.png) |
|
From: <sv...@ww...> - 2006-04-29 18:22:11
|
Author: mkrose Date: 2006-04-29 11:22:00 -0700 (Sat, 29 Apr 2006) New Revision: 1932 Added: trunk/csp/tools/layout/ trunk/csp/tools/layout/images/ Log: Begin porting the theater layout tool from branches/unrefactored to the new csp directory. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1932 |
Author: lologramme Date: 2006-04-29 11:07:08 -0700 (Sat, 29 Apr 2006) New Revision: 1931 Added: trunk/csp/data/models/airbase/Airbase_Lights/ trunk/csp/data/models/airbase/Airbase_Lights/Taxi_Light_Blue/ trunk/csp/data/models/airbase/Airbase_Lights/Taxi_Light_Blue/Taxi_Light_Blue.osg trunk/csp/data/xml/theater/balkan/Taxi_Light_Blue.xml trunk/csp/data/xml/theater/balkan/Taxi_Light_Blue/ trunk/csp/data/xml/theater/balkan/Taxi_Light_Blue/model.xml Modified: trunk/csp/data/xml/theater/balkan/airbase.xml Log: beginning to add Taxi Light Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1931 Diff omitted (55480 bytes). |
Author: lologramme Date: 2006-04-29 03:44:57 -0700 (Sat, 29 Apr 2006) New Revision: 1930 Added: trunk/csp/data/models/airbase/O2_unit/ trunk/csp/data/models/airbase/O2_unit/O2_unit.jpg trunk/csp/data/models/airbase/O2_unit/O2_unit.osg trunk/csp/data/models/airbase/bombs_trailer/ trunk/csp/data/models/airbase/bombs_trailer/bombs_trailer.jpg trunk/csp/data/models/airbase/bombs_trailer/bombs_trailer.osg trunk/csp/data/models/airbase/bombs_trailer/mk84.jpg trunk/csp/data/xml/theater/balkan/O2_unit.xml trunk/csp/data/xml/theater/balkan/O2_unit/ trunk/csp/data/xml/theater/balkan/O2_unit/model.xml trunk/csp/data/xml/theater/balkan/bombs_trailer.xml trunk/csp/data/xml/theater/balkan/bombs_trailer/ trunk/csp/data/xml/theater/balkan/bombs_trailer/model.xml Modified: trunk/csp/data/models/airbase/hangar01/hangar01.3ds trunk/csp/data/models/airbase/hangar01/hangar01.jpg trunk/csp/data/xml/theater/balkan/airbase.xml Log: Add O2 Unit and Bomb trailer in the airbase Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1930 Diff omitted (703035 bytes). |
|
From: <sv...@ww...> - 2006-04-28 21:23:13
|
Author: stormbringer Date: 2006-04-28 14:20:55 -0700 (Fri, 28 Apr 2006) New Revision: 1929 Modified: trunk/csp/cspsim/LandingGear.cpp trunk/csp/cspsim/LandingGear.h Log: Made m_TouchdownSound protected again Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1929 Modified: trunk/csp/cspsim/LandingGear.cpp =================================================================== --- trunk/csp/cspsim/LandingGear.cpp 2006-04-28 05:59:59 UTC (rev 1928) +++ trunk/csp/cspsim/LandingGear.cpp 2006-04-28 21:20:55 UTC (rev 1929) @@ -778,7 +778,7 @@ if (m_Gear[i]->getWOW()) b_WOW->value() = true; if (m_Gear[i]->getTouchdown()) { if (m_Gear[i]->getTouchdownSkid()) { - if (m_Gear[i]->m_TouchdownSound.valid()) m_Gear[i]->m_TouchdownSound->play(); + if (m_Gear[i]->getTouchdownSound().valid()) m_Gear[i]->getTouchdownSound()->play(); } m_Gear[i]->resetTouchdown(); } Modified: trunk/csp/cspsim/LandingGear.h =================================================================== --- trunk/csp/cspsim/LandingGear.h 2006-04-28 05:59:59 UTC (rev 1928) +++ trunk/csp/cspsim/LandingGear.h 2006-04-28 21:20:55 UTC (rev 1929) @@ -163,10 +163,10 @@ // Returns the gear extension from 0.0 when fully retracted to 1.0 when fully extended. double getExtension() const; + // bind a SoundModel and a ResourceBundle to the gear void bindSounds(SoundModel *model, ResourceBundle *bundle=0); - // Sounds - Ref<SoundEffect> m_TouchdownSound; + Ref<SoundEffect> getTouchdownSound() const { return m_TouchdownSound; } protected: void resetForces(); @@ -188,6 +188,7 @@ void updateTireRotation(double dt); void updateSteeringAngle(double dt); + protected: Vector3 m_MaxPosition; Vector3 m_Motion; @@ -253,6 +254,9 @@ std::string m_Name; Link<GearAnimation> m_GearAnimation; + + // Sounds + Ref<SoundEffect> m_TouchdownSound; }; |
