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-09-03 07:14:05
|
Author: mkrose Date: 2006-09-03 00:13:57 -0700 (Sun, 03 Sep 2006) New Revision: 1978 Modified: trunk/csp/data/models/airbase/runway/runway.osg Log: Add runway lights. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1978 Diff omitted (18485 bytes). |
|
From: <sv...@ww...> - 2006-09-03 07:13:49
|
Author: mkrose Date: 2006-09-03 00:13:38 -0700 (Sun, 03 Sep 2006) New Revision: 1977 Modified: trunk/csp/data/images/f16/cockpit-reflection.png trunk/csp/data/images/staticenv-negx.png trunk/csp/data/images/staticenv-negy.png trunk/csp/data/images/staticenv-negz.png trunk/csp/data/images/staticenv-posx.png trunk/csp/data/images/staticenv-posy.png trunk/csp/data/images/staticenv-posz.png trunk/csp/data/models/aircraft/f16/f16dj-cockpit.osg trunk/csp/data/models/aircraft/f16/f16dj.osg Log: Adjust reflection maps (canopy interior and exterior, metallic parts) for use with shaders. May cause problems with the canopy reflection without shaders; if so these will need to be fixed in a subsequent change. staticenv changes to work with shader cubemap (old file => new file): negx => negx rot -90 (clockwise) negy => negz rot 180 negz => posy rot 180 posx => posx rot 90 posy => posz posz => negy Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1977 Diff omitted (12652 bytes). |
|
From: <sv...@ww...> - 2006-09-03 07:13:17
|
Author: mkrose Date: 2006-09-03 00:13:11 -0700 (Sun, 03 Sep 2006) New Revision: 1976 Modified: trunk/csp/data/models/airbase/hangar03/hangar03.osg Log: Enable backface culling on hangar to avoid z-fighting of the roof quads. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1976 Modified: trunk/csp/data/models/airbase/hangar03/hangar03.osg =================================================================== --- trunk/csp/data/models/airbase/hangar03/hangar03.osg 2006-09-03 07:13:02 UTC (rev 1975) +++ trunk/csp/data/models/airbase/hangar03/hangar03.osg 2006-09-03 07:13:11 UTC (rev 1976) @@ -9,6 +9,10 @@ rendering_hint DEFAULT_BIN renderBinMode INHERIT GL_LIGHTING ON + GL_CULL_FACE ON + CullFace { + mode BACK + } } referenceFrame RELATIVE Matrix { @@ -44,7 +48,7 @@ DataVariance STATIC rendering_hint DEFAULT_BIN renderBinMode INHERIT - GL_CULL_FACE OVERRIDE|OFF + GL_CULL_FACE OVERRIDE|ON GL_LIGHTING ON 0xba1 ON Material { @@ -1197,7 +1201,7 @@ DataVariance STATIC rendering_hint DEFAULT_BIN renderBinMode INHERIT - GL_CULL_FACE OVERRIDE|OFF + GL_CULL_FACE PROTECTED|OFF GL_LIGHTING ON 0xba1 ON Material { @@ -1656,8 +1660,9 @@ DataVariance STATIC rendering_hint DEFAULT_BIN renderBinMode INHERIT - GL_CULL_FACE OVERRIDE|OFF + GL_CULL_FACE PROTECTED|OFF GL_LIGHTING ON + GL_BLEND ON 0xba1 ON Material { DataVariance STATIC |
|
From: <sv...@ww...> - 2006-09-03 07:13:13
|
Author: mkrose Date: 2006-09-03 00:13:02 -0700 (Sun, 03 Sep 2006) New Revision: 1975 Modified: trunk/csp/data/images/moon.png Log: Clean up the moon image, lightening overly dark pixel at the edges. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1975 Diff omitted (102770 bytes). |
|
From: <sv...@ww...> - 2006-09-01 05:58:26
|
Author: mkrose Date: 2006-08-31 22:58:19 -0700 (Thu, 31 Aug 2006) New Revision: 1974 Added: trunk/csp/data/shaders/ trunk/csp/data/shaders/canopy.fragment trunk/csp/data/shaders/canopy.vertex trunk/csp/data/shaders/object.fragment trunk/csp/data/shaders/object.vertex trunk/csp/data/shaders/plain.fragment trunk/csp/data/shaders/plain.vertex trunk/csp/data/shaders/red.fragment trunk/csp/data/shaders/red.vertex trunk/csp/data/shaders/reflect.fragment trunk/csp/data/shaders/reflect.vertex trunk/csp/data/shaders/sphere.fragment trunk/csp/data/shaders/sphere.vertex trunk/csp/data/shaders/terrain-demeter.fragment trunk/csp/data/shaders/terrain-demeter.vertex Log: Various shaders for rendering objects in the simulation with per-pixel specular highlighting and fog. The initial implementation only supports two light sources: the sun and the moon. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1974 Diff omitted (27859 bytes). |
|
From: <sv...@ww...> - 2006-09-01 05:55:32
|
Author: mkrose Date: 2006-08-31 22:55:24 -0700 (Thu, 31 Aug 2006) New Revision: 1973 Added: trunk/csp/cspsim/Shader.cpp trunk/csp/cspsim/Shader.h trunk/csp/cspsim/StateStack.h Log: Support code for glsl shaders. This code will be integrated with the simulation in future checkins. Currently it is not part of the build. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1973 Diff omitted (19527 bytes). |
|
From: <sv...@ww...> - 2006-08-31 05:55:32
|
Author: mkrose Date: 2006-08-30 22:55:20 -0700 (Wed, 30 Aug 2006) New Revision: 1972 Modified: trunk/csp/cspsim/sky/Colorspace.cpp trunk/csp/cspsim/sky/Colorspace.h trunk/csp/cspsim/sky/OrbitalBodyModel.cpp trunk/csp/cspsim/sky/SkyDome.cpp trunk/csp/cspsim/sky/SkyDome.h trunk/csp/cspsim/sky/SkyObserver.cpp Log: Minor tweaks to sky dome and horizon shading to try to improve fog blending to the sky. Commented various print statements used for initial debugging. Some of these can be converted to log messages later. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1972 Diff omitted (10636 bytes). |
|
From: <sv...@ww...> - 2006-07-22 17:52:04
|
Author: mkrose Date: 2006-07-22 10:51:57 -0700 (Sat, 22 Jul 2006) New Revision: 1971 Modified: trunk/csp/csplib/data/TypeAdapter.h Log: Add missing include. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1971 Modified: trunk/csp/csplib/data/TypeAdapter.h =================================================================== --- trunk/csp/csplib/data/TypeAdapter.h 2006-07-22 17:51:26 UTC (rev 1970) +++ trunk/csp/csplib/data/TypeAdapter.h 2006-07-22 17:51:57 UTC (rev 1971) @@ -36,8 +36,9 @@ #include <csp/csplib/util/Exception.h> #include <csp/csplib/util/Namespace.h> +#include <cassert> +#include <iosfwd> #include <string> -#include <iosfwd> CSP_NAMESPACE |
|
From: <sv...@ww...> - 2006-07-22 17:51:34
|
Author: mkrose Date: 2006-07-22 10:51:26 -0700 (Sat, 22 Jul 2006) New Revision: 1970 Modified: trunk/csp/tools/build/registry.py Log: Add missing import in build script. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1970 Modified: trunk/csp/tools/build/registry.py =================================================================== --- trunk/csp/tools/build/registry.py 2006-07-15 15:15:41 UTC (rev 1969) +++ trunk/csp/tools/build/registry.py 2006-07-22 17:51:26 UTC (rev 1970) @@ -15,6 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import os +import sys from csp.tools.build import autoconf from csp.tools.build import scons |
|
From: <sv...@ww...> - 2006-07-15 15:15:52
|
Author: mkrose Date: 2006-07-15 08:15:41 -0700 (Sat, 15 Jul 2006) New Revision: 1969 Added: trunk/csp/cspsim/sky/Colorspace.cpp trunk/csp/cspsim/sky/Colorspace.h Modified: trunk/csp/cspsim/sky/OrbitalBody.h trunk/csp/cspsim/sky/OrbitalBodyModel.cpp trunk/csp/cspsim/sky/OrbitalBodyModel.h trunk/csp/cspsim/sky/SkyDome.cpp trunk/csp/cspsim/sky/SkyDome.h trunk/csp/cspsim/sky/SkyObserver.cpp trunk/csp/cspsim/sky/SkyObserver.h trunk/csp/cspsim/sky/SkyShader.cpp trunk/csp/cspsim/sky/SkyShader.h Log: More adjustments to the new sky code, which is not yet integretated into the build. * Generate horizon color texture for fogging. * Improved ambient, diffuse, and specular light from the sun, updated more frequently. * Better sky shading at twilight. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1969 Diff omitted (66392 bytes). |
|
From: <sv...@ww...> - 2006-07-13 06:52:47
|
Author: mkrose Date: 2006-07-12 23:52:38 -0700 (Wed, 12 Jul 2006) New Revision: 1968 Modified: trunk/csp/tools/build/autoconf.py trunk/csp/tools/build/scons.py Log: Fix a typo that broke the build unless the -Q flag was passed to scons. Also add a simple check to force the config to be rerun whenever the SConstruct is changed. Not a robust implementation but it should help in the short term. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1968 Modified: trunk/csp/tools/build/autoconf.py =================================================================== --- trunk/csp/tools/build/autoconf.py 2006-07-12 06:15:48 UTC (rev 1967) +++ trunk/csp/tools/build/autoconf.py 2006-07-13 06:52:38 UTC (rev 1968) @@ -173,6 +173,12 @@ config = open(config_file, 'rt') except IOError: return None + # hack to rerun the config if the SConstruct file is modified; this can + # probably be done more cleanly using regular scons dependencies. also + # shouldn't hardcode the name 'SConstruct' here. + t0 = scons.FS.getmtime(scons.File('#/SConstruct').abspath) + t1 = scons.FS.getmtime(scons.File('#/.config').abspath) + if t0 > t1: return None return pickle.load(config) Modified: trunk/csp/tools/build/scons.py =================================================================== --- trunk/csp/tools/build/scons.py 2006-07-12 06:15:48 UTC (rev 1967) +++ trunk/csp/tools/build/scons.py 2006-07-13 06:52:38 UTC (rev 1968) @@ -27,6 +27,7 @@ import SCons.Warnings SCons.Warnings.suppressWarningClass(SCons.Warnings.DuplicateEnvironmentWarning) +FS = SCons.Node.FS.default_fs File = SCons.Node.FS.default_fs.File Dir = SCons.Node.FS.default_fs.Dir Alias = SCons.Defaults.DefaultEnvironment().Alias @@ -52,7 +53,7 @@ def DisableQuiet(): # override -Q if hasattr(SCons.SConf, 'SetProgressDisplay'): - Scons.SConf.SetProgressDisplay(SCons.Util.display) + SCons.SConf.SetProgressDisplay(SCons.Util.display) def GetOptions(): |
|
From: <sv...@ww...> - 2006-07-12 06:15:55
|
Author: mkrose Date: 2006-07-11 23:15:48 -0700 (Tue, 11 Jul 2006) New Revision: 1967 Modified: trunk/csp/tools/build/__init__.py Log: Fix import errors when running 'scons setup' for the first time. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1967 Modified: trunk/csp/tools/build/__init__.py =================================================================== --- trunk/csp/tools/build/__init__.py 2006-07-03 21:45:52 UTC (rev 1966) +++ trunk/csp/tools/build/__init__.py 2006-07-12 06:15:48 UTC (rev 1967) @@ -60,6 +60,7 @@ SConstruct and SConscript to learn the interface by example. """ +import os import sys if __name__ == '__main__': @@ -67,6 +68,14 @@ print 'intended to be run as a standalone program.' sys.exit(1) +# csp bootstrap module may not be installed yet, so manually adjust the module +# search path if necessary. +try: + import csp +except ImportError: + csp_parent = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..')) + sys.path.insert(0, csp_parent) + from csp.tools.build.setup import Environment from csp.tools.build.rules import \ |
|
From: <sv...@ww...> - 2006-07-03 21:46:13
|
Author: mkrose Date: 2006-07-03 14:45:52 -0700 (Mon, 03 Jul 2006) New Revision: 1966 Added: trunk/csp/tools/build/ trunk/csp/tools/build/__init__.py trunk/csp/tools/build/autoconf.py trunk/csp/tools/build/builders.py trunk/csp/tools/build/libconf.py trunk/csp/tools/build/registry.py trunk/csp/tools/build/rules.py trunk/csp/tools/build/scons.py trunk/csp/tools/build/setup.py trunk/csp/tools/build/shortlog.py trunk/csp/tools/build/util.py Removed: trunk/csp/tools/build.py Modified: trunk/csp/SConstruct trunk/csp/__init__.py trunk/csp/csplib/SConscript trunk/csp/cspsim/SConscript trunk/csp/modules/SConscript trunk/csp/tools/runtests.py Log: Split the monolithic build.py script into several modules. Minor cleanup and refactoring. Simplify build initialization, improve runtests target, and fix swig interface fingerprinting. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1966 Diff omitted (113854 bytes). |
|
From: <sv...@ww...> - 2006-07-02 06:50:53
|
Author: mkrose Date: 2006-07-01 23:50:46 -0700 (Sat, 01 Jul 2006) New Revision: 1965 Added: trunk/csp/cspsim/sky/ trunk/csp/cspsim/sky/Common.h trunk/csp/cspsim/sky/Magnitude.cpp trunk/csp/cspsim/sky/Magnitude.h trunk/csp/cspsim/sky/OrbitalBody.cpp trunk/csp/cspsim/sky/OrbitalBody.h trunk/csp/cspsim/sky/OrbitalBodyImposter.cpp trunk/csp/cspsim/sky/OrbitalBodyImposter.h trunk/csp/cspsim/sky/OrbitalBodyModel.cpp trunk/csp/cspsim/sky/OrbitalBodyModel.h trunk/csp/cspsim/sky/PhaseShader.cpp trunk/csp/cspsim/sky/PhaseShader.h trunk/csp/cspsim/sky/SkyDome.cpp trunk/csp/cspsim/sky/SkyDome.h trunk/csp/cspsim/sky/SkyObserver.cpp trunk/csp/cspsim/sky/SkyObserver.h trunk/csp/cspsim/sky/SkyShader.cpp trunk/csp/cspsim/sky/SkyShader.h trunk/csp/cspsim/sky/SolarSystem.cpp trunk/csp/cspsim/sky/SolarSystem.h trunk/csp/cspsim/sky/StarDome.cpp trunk/csp/cspsim/sky/StarDome.h trunk/csp/cspsim/sky/Stars.h trunk/csp/data/images/sky/ trunk/csp/data/images/sky/moon.png trunk/csp/data/images/sky/star-flare.png Log: Refactor Sky.cpp into cspsim/sky. Most of the code has been rewritten to be cleaner, faster, and smoother. Several new features have been added as well. The new implementation has not yet been integrated with CSP. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1965 Diff omitted (302981 bytes). |
|
From: <sv...@ww...> - 2006-06-11 10:05:14
|
Author: mkrose Date: 2006-06-11 03:05:04 -0700 (Sun, 11 Jun 2006) New Revision: 1964 Modified: trunk/csp/data/models/stores/missiles/aim9/aim9.osg Log: Fix renderbin for aim9 so that the seeker isn't occluded by the canopy reflection. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1964 Modified: trunk/csp/data/models/stores/missiles/aim9/aim9.osg =================================================================== --- trunk/csp/data/models/stores/missiles/aim9/aim9.osg 2006-06-11 10:03:30 UTC (rev 1963) +++ trunk/csp/data/models/stores/missiles/aim9/aim9.osg 2006-06-11 10:05:04 UTC (rev 1964) @@ -42,10 +42,8 @@ StateSet { UniqueID StateSet_2 DataVariance STATIC - rendering_hint TRANSPARENT_BIN - renderBinMode USE - binNumber 10 - binName DepthSortedBin + rendering_hint DEFAULT_BIN + renderBinMode INHERIT GL_CULL_FACE ON GL_LIGHTING ON 0xba1 ON |
|
From: <sv...@ww...> - 2006-06-11 10:03:42
|
Author: mkrose Date: 2006-06-11 03:03:30 -0700 (Sun, 11 Jun 2006) New Revision: 1963 Added: trunk/csp/data/images/f16/cockpit-reflection.png Modified: trunk/csp/data/images/f16/COPYING trunk/csp/data/models/aircraft/f16/f16dj.osg Log: Add canopy reflections to the f16. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1963 Diff omitted (146724 bytes). |
|
From: <sv...@ww...> - 2006-06-11 09:32:04
|
Author: mkrose Date: 2006-06-11 02:31:54 -0700 (Sun, 11 Jun 2006) New Revision: 1962 Added: trunk/csp/tools/canopy/ trunk/csp/tools/canopy/README trunk/csp/tools/canopy/SConscript trunk/csp/tools/canopy/map_reflection.cpp trunk/csp/tools/canopy/render_reflection.cpp Modified: trunk/csp/SConstruct Log: Add tools for generating accurate canopy reflection textures. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1962 Diff omitted (32492 bytes). |
|
From: <sv...@ww...> - 2006-06-09 15:29:52
|
Author: mkrose Date: 2006-06-09 08:29:40 -0700 (Fri, 09 Jun 2006) New Revision: 1961 Modified: trunk/csp/__init__.py Log: Fix path initialization under windows. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1961 Modified: trunk/csp/__init__.py =================================================================== --- trunk/csp/__init__.py 2006-06-08 15:20:04 UTC (rev 1960) +++ trunk/csp/__init__.py 2006-06-09 15:29:40 UTC (rev 1961) @@ -22,19 +22,22 @@ dir = os.path.abspath(__path__[0]) def _configureModules(): - if os.name.startswith('win'): + if sys.platform.startswith('win') or os.name == 'nt': # if CSPDEVPACK is defined in the environment, add the devpack bin # directory to the execution path. this ensures that devpack libraries # will be found before other (potentially incompatible) versions of the # same libraries. note that windows is currently the only system with # a devpack. + path = [ + os.path.join(dir, 'csplib', '.bin'), + os.path.join(dir, 'cspsim', '.bin'), + ] devpack = os.environ.get('CSPDEVPACK') if devpack: - bin = os.path.join(devpack, 'usr', 'bin') - path = [bin] - if 'PATH' in os.environ: - path.append(os.environ.get('PATH')) - os.environ['PATH'] = os.pathsep.join(path) + path.append(os.path.join(devpack, 'usr', 'bin')) + if 'PATH' in os.environ: + path.append(os.environ.get('PATH')) + os.environ['PATH'] = os.pathsep.join(path) _configureModules() |
|
From: <sv...@ww...> - 2006-06-08 15:20:16
|
Author: hedo Date: 2006-06-08 08:20:04 -0700 (Thu, 08 Jun 2006) New Revision: 1960 Added: trunk/csp/data/models/town/house02/ trunk/csp/data/models/town/house02/house02.jpg trunk/csp/data/models/town/house02/house02.osg trunk/csp/data/models/town/house03/ trunk/csp/data/models/town/house03/house03.jpg trunk/csp/data/models/town/house03/house03.osg trunk/csp/data/models/town/house04/ trunk/csp/data/models/town/house04/house04.jpg trunk/csp/data/models/town/house04/house04.osg trunk/csp/data/models/town/house05/ trunk/csp/data/models/town/house05/house05.jpg trunk/csp/data/models/town/house05/house05.osg trunk/csp/data/models/town/house06/ trunk/csp/data/models/town/house06/house06.jpg trunk/csp/data/models/town/house06/house06.osg trunk/csp/data/xml/theater/balkan/house02.xml trunk/csp/data/xml/theater/balkan/house02/ trunk/csp/data/xml/theater/balkan/house02/model.xml trunk/csp/data/xml/theater/balkan/house03.xml trunk/csp/data/xml/theater/balkan/house03/ trunk/csp/data/xml/theater/balkan/house03/model.xml trunk/csp/data/xml/theater/balkan/house04.xml trunk/csp/data/xml/theater/balkan/house04/ trunk/csp/data/xml/theater/balkan/house04/model.xml trunk/csp/data/xml/theater/balkan/house05.xml trunk/csp/data/xml/theater/balkan/house05/ trunk/csp/data/xml/theater/balkan/house05/model.xml trunk/csp/data/xml/theater/balkan/house06.xml trunk/csp/data/xml/theater/balkan/house06/ trunk/csp/data/xml/theater/balkan/house06/model.xml Log: - Add 5 houses (3D models) Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1960 Diff omitted (49873 bytes). |
Author: hedo Date: 2006-06-08 07:53:34 -0700 (Thu, 08 Jun 2006) New Revision: 1959 Added: trunk/csp/data/models/airbase/barracks01/ trunk/csp/data/models/airbase/barracks01/barracks.jpg trunk/csp/data/models/airbase/barracks01/barracks01.osg trunk/csp/data/models/airbase/barracks02/ trunk/csp/data/models/airbase/barracks02/barracks.jpg trunk/csp/data/models/airbase/barracks02/barracks02.osg trunk/csp/data/models/town/ trunk/csp/data/models/town/building01/ trunk/csp/data/models/town/building01/building01.jpg trunk/csp/data/models/town/building01/building01.osg trunk/csp/data/models/town/building02/ trunk/csp/data/models/town/building02/building02.jpg trunk/csp/data/models/town/building02/building02.osg trunk/csp/data/models/town/building03/ trunk/csp/data/models/town/building03/building03.jpg trunk/csp/data/models/town/building03/building03.osg trunk/csp/data/xml/theater/balkan/barracks01.xml trunk/csp/data/xml/theater/balkan/barracks01/ trunk/csp/data/xml/theater/balkan/barracks01/model.xml trunk/csp/data/xml/theater/balkan/barracks02.xml trunk/csp/data/xml/theater/balkan/barracks02/ trunk/csp/data/xml/theater/balkan/barracks02/model.xml trunk/csp/data/xml/theater/balkan/building01.xml trunk/csp/data/xml/theater/balkan/building01/ trunk/csp/data/xml/theater/balkan/building01/model.xml trunk/csp/data/xml/theater/balkan/building02.xml trunk/csp/data/xml/theater/balkan/building02/ trunk/csp/data/xml/theater/balkan/building02/model.xml trunk/csp/data/xml/theater/balkan/building03.xml trunk/csp/data/xml/theater/balkan/building03/ trunk/csp/data/xml/theater/balkan/building03/model.xml Modified: trunk/csp/data/models/airbase/bombs_trailer/bombs_trailer.osg Log: - New folder town with some buildings and houses - Add two barracks in airbase - Update bombs_trailer.osg Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1959 Diff omitted (47509 bytes). |
|
From: <sv...@ww...> - 2006-06-07 19:25:18
|
Author: stormbringer Date: 2006-06-07 12:25:06 -0700 (Wed, 07 Jun 2006) New Revision: 1958 Added: trunk/csp/data/images/SunYello.png Log: sun billboard image Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1958 Added: trunk/csp/data/images/SunYello.png =================================================================== (Binary files differ) Property changes on: trunk/csp/data/images/SunYello.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <sv...@ww...> - 2006-06-07 19:24:22
|
Author: stormbringer Date: 2006-06-07 12:24:09 -0700 (Wed, 07 Jun 2006) New Revision: 1957 Modified: trunk/csp/cspsim/Sky.cpp Log: added a billboard for the sun Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1957 Modified: trunk/csp/cspsim/Sky.cpp =================================================================== --- trunk/csp/cspsim/Sky.cpp 2006-06-06 05:04:20 UTC (rev 1956) +++ trunk/csp/cspsim/Sky.cpp 2006-06-07 19:24:09 UTC (rev 1957) @@ -435,6 +435,7 @@ public: Sun(); virtual void updatePosition(double); + osg::Node* getNode(); void updateScene(double h, double A, Color const &color, float intensity, float background); void _updateLighting(float x, float y, float z, float h, Color const &color, float intensity, float background); Color const &getColor() const { return m_Color; } @@ -442,11 +443,91 @@ protected: Color m_Color; float m_Intensity; +private: + osg::ref_ptr<osg::MatrixTransform> m_Transform; + osg::ref_ptr<AstroBillboard> m_Billboard; + osg::ref_ptr<osg::Image> m_Image; + osg::ref_ptr<osg::Image> m_Phased; + osg::ref_ptr<osg::Texture2D> m_Texture; + osg::ref_ptr<osg::Geometry> m_Sun; + osg::ref_ptr<osg::ColorMatrix> m_CM; + float m_RenderDistance; }; Sun::Sun(): AstronomicalBody() { _radius = 695508000.0; + + m_RenderDistance = 990000.0; + float x, y; + x = y = 1.0; + m_Image = osgDB::readImageFile("SunYello.png"); + if (!m_Image.valid()) throw csp::DataError("unable to open \"moon.png\""); + + // set up the texture. + m_Texture = new osg::Texture2D; + m_Texture->setImage(m_Image.get()); + + // set up the drawstate. + osg::StateSet* dstate = new osg::StateSet; + dstate->setMode(GL_CULL_FACE,osg::StateAttribute::OFF); + dstate->setMode(GL_LIGHTING,osg::StateAttribute::OFF); + dstate->setTextureAttributeAndModes(0, m_Texture.get(),osg::StateAttribute::ON); + dstate->setMode(GL_CLIP_PLANE0, osg::StateAttribute::OFF); + dstate->setMode(GL_CLIP_PLANE1, osg::StateAttribute::OFF); + dstate->setMode(GL_CLIP_PLANE2, osg::StateAttribute::OFF); + dstate->setMode(GL_CLIP_PLANE3, osg::StateAttribute::OFF); + dstate->setMode(GL_CLIP_PLANE4, osg::StateAttribute::OFF); + dstate->setMode(GL_CLIP_PLANE5, osg::StateAttribute::OFF); + dstate->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF); + osg::BlendFunc *bf = new osg::BlendFunc; + bf->setFunction(osg::BlendFunc::SRC_ALPHA, osg::BlendFunc::ONE_MINUS_SRC_ALPHA); + dstate->setAttributeAndModes(bf, osg::StateAttribute::ON); + osg::Depth *depth = new osg::Depth; + depth->setFunction(osg::Depth::ALWAYS); + depth->setRange(1.0, 1.0); + dstate->setAttributeAndModes(depth, osg::StateAttribute::OFF); + + // set up the geoset. + Geometry* geom = new Geometry; + geom->setStateSet(dstate); + + Vec3Array* coords = new Vec3Array(4); + (*coords)[0].set(-x,0.0f,y); + (*coords)[1].set(-x,0.0f,-y); + (*coords)[2].set(x,0.0f,-y); + (*coords)[3].set(x,0.0f,y); + geom->setVertexArray(coords); + + Vec2Array* tcoords = new Vec2Array(4); + (*tcoords)[0].set(0.0f,1.0f); + (*tcoords)[1].set(0.0f,0.0f); + (*tcoords)[2].set(1.0f,0.0f); + (*tcoords)[3].set(1.0f,1.0f); + geom->setTexCoordArray(0,tcoords); + + osg::Vec4Array* colours = new osg::Vec4Array(1); + (*colours)[0].set(1.0f,1.0f,1.0,1.0f); + geom->setColorArray(colours); + geom->setColorBinding(Geometry::BIND_OVERALL); + + geom->addPrimitiveSet(new DrawArrays(PrimitiveSet::QUADS,0,4)); + + m_Sun = geom; + + //dstate->setMode(GL_FOG, osg::StateAttribute::OFF); + //dstate->setRenderBinDetails(-2,"RenderBin"); + m_Transform = new osg::MatrixTransform; + + m_Billboard = new AstroBillboard; + m_Billboard->setCullingActive(false); + m_Billboard->setStateSet(dstate); + m_Billboard->addDrawable(m_Sun.get()); + m_Billboard->setAxes(osg::Vec3(0.0,1.0,0.0), osg::Vec3(0.0,0.0,1.0), osg::Vec3(0.0,1.0,0.0)); + m_Transform->addChild(m_Billboard.get()); + m_Transform->setStateSet(dstate); + m_Transform->setCullingActive(false); + // moon->setStateSet(dstate); } void Sun::updateScene(double h, double A, Color const &color, float intensity, float background) { @@ -547,7 +628,9 @@ _stale = true; } - +osg::Node* Sun::getNode() { + return m_Transform.get(); +} class Moon: public AstronomicalBody { public: Moon(); |
|
From: <sv...@ww...> - 2006-06-06 05:04:30
|
Author: mkrose Date: 2006-06-05 22:04:20 -0700 (Mon, 05 Jun 2006) New Revision: 1956 Modified: trunk/csp/cspsim/battlefield/SimObject.h Log: One more CSPSIM_EXPORT tag. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1956 Modified: trunk/csp/cspsim/battlefield/SimObject.h =================================================================== --- trunk/csp/cspsim/battlefield/SimObject.h 2006-06-06 04:57:07 UTC (rev 1955) +++ trunk/csp/cspsim/battlefield/SimObject.h 2006-06-06 05:04:20 UTC (rev 1956) @@ -45,7 +45,7 @@ * class SimObject - Base class for all objects in the simulation. * */ -class SimObject: public Object, public UpdateTarget, public DispatchTarget +class CSPSIM_EXPORT SimObject: public Object, public UpdateTarget, public DispatchTarget { friend class Battlefield; friend class GlobalBattlefield; |
|
From: <sv...@ww...> - 2006-06-06 04:57:15
|
Author: mkrose Date: 2006-06-05 21:57:07 -0700 (Mon, 05 Jun 2006) New Revision: 1955 Added: trunk/csp/cspsim/theater/FeatureGroupModel.cpp trunk/csp/cspsim/theater/FeatureModel.cpp trunk/csp/tools/layout/SConscript trunk/csp/tools/layout/__init__.py Modified: trunk/csp/SConstruct trunk/csp/__init__.py trunk/csp/csplib/SConscript trunk/csp/csplib/__init__.py trunk/csp/csplib/csplib.i trunk/csp/csplib/data/GeoPos.h trunk/csp/csplib/data/InterfaceRegistry.cpp trunk/csp/csplib/data/InterfaceRegistry.h trunk/csp/csplib/data/Quat.h trunk/csp/csplib/data/TypeAdapter.h trunk/csp/csplib/data/Vector3.h trunk/csp/csplib/util/Random.cpp trunk/csp/csplib/util/Version.h trunk/csp/cspsim/DynamicObject.h trunk/csp/cspsim/InputInterface.h trunk/csp/cspsim/SConscript trunk/csp/cspsim/Theater.h trunk/csp/cspsim/VirtualScene.h trunk/csp/cspsim/__init__.py trunk/csp/cspsim/battlefield/Battlefield.h trunk/csp/cspsim/battlefield/LocalBattlefield.h trunk/csp/cspsim/battlefield/SimObject.h trunk/csp/cspsim/cspsim.i trunk/csp/cspsim/f16/MultiFunctionDisplay.cpp trunk/csp/cspsim/f16/StoresManagementPages.h trunk/csp/cspsim/theater/FeatureGroupModel.h trunk/csp/cspsim/theater/FeatureModel.h trunk/csp/tools/build.py trunk/csp/tools/layout/DataTree.py trunk/csp/tools/layout/DynamicGrid.cpp trunk/csp/tools/layout/FeatureGraph.cpp trunk/csp/tools/layout/FeatureGraph.h trunk/csp/tools/layout/Handle.cpp 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/PickHandler.cpp trunk/csp/tools/layout/PickHandler.h trunk/csp/tools/layout/RegionSelect.cpp trunk/csp/tools/layout/UI.py trunk/csp/tools/layout/View.cpp trunk/csp/tools/layout/View.h trunk/csp/tools/layout/ViewEventHandler.cpp trunk/csp/tools/layout/ViewManipulator.h trunk/csp/tools/layout/cLayout.i trunk/csp/tools/layout/cLoader.i trunk/csp/tools/layout/layout Log: Refactor shared libraries. The csplib and cspsim libraries are now built separately from their python wrapper modules. Runtime library resolution is now done via rpath under Linux, rather than RTLD_GLOBAL and ordered python imports. This will hopefully fix import errors on Linux platforms that don't support RTLD_GLOBAL from python. Library resolution under Windows still uses PATH overrides. Incorporated the layout tool into the main build system. Run 'scons -u layout' to build the layout tool (it is not part of the 'all' target yet). Added various *_EXPORT attributes to fix symbol exports under Windows. Changed InterfaceRegistry to not derive from Singleton<>. Singleton<> requires that the instance variable be declared in a header, which can cause problems with duplicate initialization across multiple modules that use csplib. Similarly, constructors for two theater classes had to be moved to .cpp files to avoid dynamic_cast failures when used in the layout tool, and several template classes in Random.h had to be explicitly instantiated to export correctly under Windows. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1955 Diff omitted (50563 bytes). |
|
From: <sv...@ww...> - 2006-06-06 03:02:04
|
Author: lologramme Date: 2006-06-05 05:45:50 -0700 (Mon, 05 Jun 2006) New Revision: 1954 Added: trunk/csp/data/models/airbase/hangar03/ trunk/csp/data/models/airbase/hangar03/hangar03.osg trunk/csp/data/models/airbase/hangar03/images/ trunk/csp/data/models/airbase/hangar03/images/T1.png trunk/csp/data/models/airbase/hangar03/images/glass1.png trunk/csp/data/models/airbase/hangar03/images/poutre.png trunk/csp/data/xml/theater/balkan/hangar3.xml trunk/csp/data/xml/theater/balkan/hangar3/ trunk/csp/data/xml/theater/balkan/hangar3/model.xml Modified: trunk/csp/data/xml/theater/balkan/airbase.xml Log: Add hangars Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1954 Diff omitted (404425 bytes). |
