]>
git.mxchange.org Git - simgear.git/log
fredb [Sat, 10 Apr 2010 10:52:11 +0000 (10:52 +0000)]
Add a "scale" parameter that combine xsize and ysize in a vec3 property. There is no vec2 property, so the third component is zero
fredb [Sat, 10 Apr 2010 10:06:25 +0000 (10:06 +0000)]
Declare some material parameters as implicit effect parameters
fredb [Sat, 10 Apr 2010 09:23:12 +0000 (09:23 +0000)]
materials.xml format update
Allow to declare sets of textures that can be used as parameters for effects. Syntax is:
<texture-set>
<texture>Terrain/city1.png</texture>
<texture n="2">Terrain/city1-relief-light.png</texture>
</texture-set>
<texture-set>
<texture>Terrain/city2.png</texture>
<texture n="2">Terrain/city2-relief-light.png</texture>
</texture-set>
Tim Moore [Sat, 3 Apr 2010 20:48:58 +0000 (22:48 +0200)]
Zan's cubemap patch
fredb [Mon, 29 Mar 2010 06:01:05 +0000 (06:01 +0000)]
Geometry shader support
Tim Moore [Tue, 30 Mar 2010 10:04:09 +0000 (12:04 +0200)]
Merge branch 'zan/generate'
Tim Moore [Tue, 30 Mar 2010 09:53:13 +0000 (11:53 +0200)]
Merge branch 'jmt/waypt'
Tim Moore [Tue, 30 Mar 2010 09:46:01 +0000 (11:46 +0200)]
Merge branch 'timoore/clipgroup'
Tim Moore [Tue, 30 Mar 2010 09:41:37 +0000 (11:41 +0200)]
Merge branch 'timoore/effects-anim-rebase'
Tim Moore [Tue, 30 Mar 2010 09:40:45 +0000 (11:40 +0200)]
Merge branch 'zan/cloudsort'
Tim Moore [Tue, 16 Mar 2010 14:42:54 +0000 (15:42 +0100)]
Remove reference to osgUtil::RegisterRenderBinProxy
This has gone away in recent OSG sources.
fredb [Sun, 14 Mar 2010 20:04:41 +0000 (20:04 +0000)]
Lauri Peltonen : add the ability to generate tangent vectors for model, terrain or ocean geometry inside the effect file
Tim Moore [Thu, 11 Mar 2010 07:45:58 +0000 (08:45 +0100)]
bug fix to animated effect parameters
Some confusion in getting the right property node.
Tim Moore [Tue, 9 Mar 2010 06:29:26 +0000 (07:29 +0100)]
animate uniform parameters in effects
Tim Moore [Tue, 9 Mar 2010 06:28:46 +0000 (07:28 +0100)]
Cleanup of effects parameter animation
Tim Moore [Sat, 26 Dec 2009 22:56:21 +0000 (23:56 +0100)]
Prepare effects animation code to use general functor setters
Tim Moore [Fri, 25 Dec 2009 10:56:09 +0000 (11:56 +0100)]
generalize support for initializing effect parameters from several properties
Tim Moore [Mon, 21 Dec 2009 06:34:05 +0000 (07:34 +0100)]
pass SGReaderWriterXMLOptions object to getGlobalProperty
This supports pathnames relative to a model in effect definitions.
Tim Moore [Fri, 18 Dec 2009 06:14:16 +0000 (07:14 +0100)]
change return value of SGPropertyNode::getPath to std::string
Also get rid of the cached value.
Tim Moore [Wed, 16 Dec 2009 19:11:04 +0000 (20:11 +0100)]
pass SGReaderWriterXMLOptions to effects
This will allow parameters to refer to properties in models, though
that doesn't work yet.
Tim Moore [Tue, 9 Mar 2010 09:59:09 +0000 (10:59 +0100)]
Merge branch 'zan/stencil'
ehofman [Wed, 3 Mar 2010 10:26:25 +0000 (10:26 +0000)]
Lauri Peltonen: turn on clouds depth sorting
jmt [Sun, 21 Feb 2010 22:05:41 +0000 (22:05 +0000)]
Allow a waypoint's target altitude to be modified in-place.
Tim Moore [Wed, 17 Feb 2010 17:01:29 +0000 (18:01 +0100)]
Merge branch 'curt/makefile'
curt [Tue, 16 Feb 2010 20:04:42 +0000 (20:04 +0000)]
Add a missing source file so it will be included with "make dist".
curt [Tue, 16 Feb 2010 20:02:43 +0000 (20:02 +0000)]
Add a missing .hxx file for "make dist"
durk [Sat, 6 Feb 2010 15:13:18 +0000 (15:13 +0000)]
- Remove reference to dead files.
durk [Fri, 5 Feb 2010 05:37:31 +0000 (05:37 +0000)]
Update version number.
Tim Moore [Thu, 4 Feb 2010 23:23:51 +0000 (00:23 +0100)]
Merge branch 'fredb/winfix'
fredb [Thu, 4 Feb 2010 22:07:28 +0000 (22:07 +0000)]
Update version numbers
Tim Moore [Fri, 29 Jan 2010 18:07:53 +0000 (19:07 +0100)]
Stencil operations for effects
From Lauri Peltonen
Tim Moore [Thu, 28 Jan 2010 09:31:52 +0000 (10:31 +0100)]
Merge branch 'timoore/mat-effect'
Tim Moore [Thu, 28 Jan 2010 09:31:40 +0000 (10:31 +0100)]
Merge branch 'freb/mingw'
Tim Moore [Thu, 28 Jan 2010 09:31:11 +0000 (10:31 +0100)]
Merge branch 'fredb/winfix'
Tim Moore [Wed, 27 Jan 2010 17:34:27 +0000 (18:34 +0100)]
Create a different default effect for objects that have material animations
fredb [Sat, 23 Jan 2010 11:40:02 +0000 (11:40 +0000)]
MINGW patch from Benoît Laniel
fredb [Fri, 22 Jan 2010 21:31:18 +0000 (21:31 +0000)]
Update MSVC 9 projects
fredb [Fri, 22 Jan 2010 20:57:58 +0000 (20:57 +0000)]
Update SimGear version
Tim Moore [Mon, 25 Jan 2010 13:02:02 +0000 (14:02 +0100)]
Merge branch 'ehofman/sound'
Tim Moore [Mon, 25 Jan 2010 13:01:52 +0000 (14:01 +0100)]
Merge branch 'torsten/geoequal'
Tim Moore [Mon, 25 Jan 2010 13:00:42 +0000 (14:00 +0100)]
Merge branch 'durk/version'
ehofman [Thu, 21 Jan 2010 07:56:14 +0000 (07:56 +0000)]
Silently ignore previous errors to prevent halting the program on silly errors
ehofman [Wed, 20 Jan 2010 13:51:37 +0000 (13:51 +0000)]
define _device so testForALCError can use it initialized..
durk [Tue, 19 Jan 2010 20:48:49 +0000 (20:48 +0000)]
Let the version number reflect the current state of the release process.
fredb [Sun, 17 Jan 2010 12:14:47 +0000 (12:14 +0000)]
Change version in comment
fredb [Sun, 17 Jan 2010 12:05:29 +0000 (12:05 +0000)]
Update simgear config.h version
fredb [Sun, 17 Jan 2010 12:00:20 +0000 (12:00 +0000)]
Update MSVC 9 project
fredb [Sun, 17 Jan 2010 11:59:49 +0000 (11:59 +0000)]
Win32 fixes
Tim Moore [Sat, 16 Jan 2010 22:49:36 +0000 (23:49 +0100)]
Merge branch 'ehofman/sound'
ehofman [Wed, 13 Jan 2010 14:29:59 +0000 (14:29 +0000)]
test for an AL or ALC error before calling an ALUT function.
Tim Moore [Wed, 13 Jan 2010 06:57:35 +0000 (07:57 +0100)]
Merge branch 'ehofman/sound'
Tim Moore [Wed, 13 Jan 2010 06:57:30 +0000 (07:57 +0100)]
Merge branch 'tat/framework'
Tim Moore [Mon, 11 Jan 2010 06:15:11 +0000 (07:15 +0100)]
Merge branch 'ehofman/subsys'
Tim Moore [Mon, 11 Jan 2010 06:14:51 +0000 (07:14 +0100)]
Merge branch 'jester/aptsign'
Tim Moore [Mon, 11 Jan 2010 06:14:23 +0000 (07:14 +0100)]
Merge branch 'timoore/effects'
Tim Moore [Mon, 11 Jan 2010 06:10:46 +0000 (07:10 +0100)]
Merge branch 'jmt/geodistance'
ehofman [Tue, 5 Jan 2010 11:23:42 +0000 (11:23 +0000)]
Tatsuhiro Nishioka:
These patches fixes minor bug in addition to providing --with-openal-framework and --with-cocoa-framework.
Now you can use your own version of OpenAL.framework for selecting various audio output device.
Plus, you can build FG/SG on Snow Leopard with cocoa configuration.
torsten [Mon, 4 Jan 2010 19:51:54 +0000 (19:51 +0000)]
Csaba Halasz:
Fix airport signs by reverting to rev 1.22 of apt_sign.cxx. Tweaked a little to handle missing materials better.
ehofman [Mon, 4 Jan 2010 14:53:26 +0000 (14:53 +0000)]
MacOS returns an unsopported AL error when a file is not found, work around this.
torsten [Sat, 2 Jan 2010 16:40:06 +0000 (16:40 +0000)]
add "operator == ()" to SGGeod and SGGeoc
jmt [Thu, 31 Dec 2009 16:48:03 +0000 (16:48 +0000)]
Allow geocentric distance computations to return radians.
Tim Moore [Fri, 1 Jan 2010 12:32:03 +0000 (13:32 +0100)]
fix up some merge weirdness
ehofman [Thu, 31 Dec 2009 10:14:56 +0000 (10:14 +0000)]
Also unbind subsystem groups in reverse order and destruct them in reverse order to be consistent.
ehofman [Tue, 29 Dec 2009 14:28:21 +0000 (14:28 +0000)]
unbind in reverse order to try to prevent order dependency problems.
ehofman [Tue, 29 Dec 2009 09:47:04 +0000 (09:47 +0000)]
Rearrange alut error checking a bit
jmt [Mon, 28 Dec 2009 20:57:57 +0000 (20:57 +0000)]
XML encodings: support 'ASCII' as an alias for 'US-ASCII'
ehofman [Sat, 26 Dec 2009 10:07:37 +0000 (10:07 +0000)]
keep a pointer to the OpenAL vendor and renderer for reference
Tim Moore [Sun, 20 Dec 2009 15:07:00 +0000 (16:07 +0100)]
Merge branch 'timoore/effects'
Conflicts:
simgear/scene/model/model.cxx
simgear/scene/sky/newcloud.cxx
Tim Moore [Sun, 20 Dec 2009 09:40:26 +0000 (10:40 +0100)]
Merge branch 'ehofman/sound'
Changed include of SGQuat.hxx to SGMath.hxx in
sound/sample_openal.cxx; somehow this happened in a merge commit when
the sound branch was merged to next.
ehofman [Mon, 14 Dec 2009 19:43:19 +0000 (19:43 +0000)]
proper typecasting
Tim Moore [Mon, 14 Dec 2009 05:52:00 +0000 (06:52 +0100)]
don't render an EffectGeode if there is no valid technique
Normal geometry has a default effect; geometry with no default effect
is unlikely to look correct with no state set applied. This fixes the
problem of clouds being displayed as multi-colored rectangles when
shader effects are turned off.
ehofman [Wed, 9 Dec 2009 13:56:12 +0000 (13:56 +0000)]
fix a typo.
ehofman [Wed, 9 Dec 2009 10:09:41 +0000 (10:09 +0000)]
Don't assign the buffer data to the sample in case it is a file. Test for result when calling load()
ehofman [Wed, 9 Dec 2009 09:38:07 +0000 (09:38 +0000)]
Fix crash in SGSoundMgr::stop(): do not try to erase buffer items one at a time
ehofman [Sun, 6 Dec 2009 09:56:01 +0000 (09:56 +0000)]
add alcSuspendContext and alcProcessContext again to prevent sound artifacts on hardware accelerated soundcards.
ehofman [Wed, 2 Dec 2009 09:32:20 +0000 (09:32 +0000)]
check if suspend, resume and volume changed much from the previous value before setting them.
ehofman [Wed, 2 Dec 2009 08:32:59 +0000 (08:32 +0000)]
Fix runtime switching of sound devices.
ehofman [Mon, 30 Nov 2009 14:22:40 +0000 (14:22 +0000)]
Updates to allow runtime chaning of the sound device
Tim Moore [Sun, 29 Nov 2009 21:54:02 +0000 (22:54 +0100)]
take locks out of ModelRegistry
They should be unnecessary and were causing deadlock with Effects that
load images.
ehofman [Sat, 28 Nov 2009 13:31:04 +0000 (13:31 +0000)]
Add a function to retreive all available playback devices.
ehofman [Sat, 28 Nov 2009 12:59:40 +0000 (12:59 +0000)]
initialize volume to a proper value
ehofman [Sat, 28 Nov 2009 10:48:17 +0000 (10:48 +0000)]
Small bugfix
ehofman [Sat, 28 Nov 2009 10:37:02 +0000 (10:37 +0000)]
Make it possible to specify a different device name
Tim Moore [Sun, 29 Nov 2009 11:42:10 +0000 (12:42 +0100)]
Revert boost requirement to 1.37
I don't want to get into testing for tr1::unordered_map, and the
boost compatibility doesn't exist in 1.34.
Tim Moore [Thu, 26 Nov 2009 22:28:34 +0000 (23:28 +0100)]
Merge branch 'ehofman/sky'
Tim Moore [Thu, 26 Nov 2009 15:30:46 +0000 (16:30 +0100)]
fix a memory leak in newcloud.cxx
ehofman [Thu, 26 Nov 2009 13:05:44 +0000 (13:05 +0000)]
a slightly more readable version of the test
ehofman [Thu, 26 Nov 2009 12:19:57 +0000 (12:19 +0000)]
Also test for older versions of OpenAL-Sample
Tim Moore [Thu, 26 Nov 2009 10:40:41 +0000 (11:40 +0100)]
Use an effect for 3d clouds
Tim Moore [Thu, 26 Nov 2009 10:39:34 +0000 (11:39 +0100)]
Support for shader program attributes in effects
Also, use a hash table for the effect shader program cache.
Tim Moore [Thu, 26 Nov 2009 10:32:00 +0000 (11:32 +0100)]
Better error reporting for effects
Throw an exception when an undefine attribute value is found in an effect.
Also, fix a typo in TexEnvCombine operand attributes.
Tim Moore [Thu, 26 Nov 2009 09:38:31 +0000 (10:38 +0100)]
add a property debugging function
ehofman [Mon, 23 Nov 2009 11:54:33 +0000 (11:54 +0000)]
Don't forget to apply the doppler adjustment factor to the listener velocity also
ehofman [Mon, 23 Nov 2009 10:32:26 +0000 (10:32 +0000)]
test for implementations with 'bad' doppler effects and adjust for it.
ehofman [Mon, 23 Nov 2009 10:31:53 +0000 (10:31 +0000)]
fix test programs
ehofman [Mon, 23 Nov 2009 09:35:12 +0000 (09:35 +0000)]
proper listener velocity calculation, this has no effect yet but is required when other models start emitting sounds.
Tim Moore [Mon, 23 Nov 2009 08:15:47 +0000 (09:15 +0100)]
add depth attribute to Effect
Tim Moore [Sun, 22 Nov 2009 21:55:56 +0000 (22:55 +0100)]
Drop required Boost version from 1.37 to 1.34
Use boost/tr1 to bring in std::tr1::unordered_map instead of the Boost
version.
Tim Moore [Sat, 21 Nov 2009 23:32:51 +0000 (00:32 +0100)]
Move tree shaders to an effect
Also, improve effect hash keys.
Tim Moore [Sat, 21 Nov 2009 23:27:53 +0000 (00:27 +0100)]
Effect file support for GL_VERTEX_PROGRAM_TWO_SIDE and POINT_SIZE