]>
git.mxchange.org Git - simgear.git/log
Torsten Dreyer [Sun, 23 May 2010 08:54:23 +0000 (10:54 +0200)]
ignore generated files
Torsten Dreyer [Sun, 23 May 2010 08:45:01 +0000 (10:45 +0200)]
ignore generated files
Torsten Dreyer [Sun, 23 May 2010 08:44:29 +0000 (10:44 +0200)]
ignore generated test apps
Torsten Dreyer [Sat, 22 May 2010 21:40:07 +0000 (23:40 +0200)]
Fix a gcc warning
Torsten Dreyer [Sat, 22 May 2010 21:36:39 +0000 (23:36 +0200)]
Merge branch 'next' of gitorious.org:fg/simgear into next
Torsten Dreyer [Sat, 22 May 2010 21:35:01 +0000 (23:35 +0200)]
New pick animation capability from Alex Perry
Alex Perry: Adds a new pick animation capability which parallels the existing
"action" for a named object. Specifying "vncaction" and a transform
from model space will enable all mouse clicks on that object to be
delivered directly to the OSG image. Currently, the readers for VNC
and PDF files yield interactive images; more are likely to be added
over time.
James Turner [Thu, 20 May 2010 22:57:54 +0000 (23:57 +0100)]
Merge branch 'topics/condexp' into next
James Turner [Thu, 20 May 2010 22:56:04 +0000 (23:56 +0100)]
Support <expression> children in comparison conditions. Also makes ordering of child nodes match XML consistently.
Mathias Froehlich [Mon, 17 May 2010 21:13:59 +0000 (23:13 +0200)]
Add a tight and cheap method to represent a rotation.
Adapt tests for that new method.
Erik Hofman [Tue, 11 May 2010 09:32:58 +0000 (11:32 +0200)]
revert previous commit, this was a mistake
Erik Hofman [Sat, 8 May 2010 09:19:01 +0000 (11:19 +0200)]
Before
Frederic Bouvier [Fri, 7 May 2010 22:19:43 +0000 (00:19 +0200)]
Test git commit with a simple change
James Turner [Thu, 6 May 2010 23:12:21 +0000 (00:12 +0100)]
Make ALUT 1.0 builds again, hopefully in the short term - MinGW needs this.
James Turner [Thu, 6 May 2010 10:25:53 +0000 (11:25 +0100)]
Add .gitignore files, ignore automake/configure artefacts.
James Turner [Thu, 6 May 2010 09:27:38 +0000 (10:27 +0100)]
Configure.as updates for ALUT changes, make --with-alut-framework= work.
Tim Moore [Wed, 5 May 2010 08:42:41 +0000 (10:42 +0200)]
Merge branch 'jmt/ref_ptr-conv' into next
jmt [Mon, 3 May 2010 08:51:27 +0000 (08:51 +0000)]
Compile even if OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION is not set.
Tim Moore [Wed, 5 May 2010 08:39:32 +0000 (10:39 +0200)]
Merge branch 'ehofman/framebuffer' into next
ehofman [Mon, 3 May 2010 06:48:44 +0000 (06:48 +0000)]
Add support for EXT_framebuffer_object for Atlas
Tim Moore [Wed, 5 May 2010 08:38:26 +0000 (10:38 +0200)]
Merge branch 'master' into next
Tim Moore [Wed, 5 May 2010 08:38:18 +0000 (10:38 +0200)]
Merge branch 'maint'
frohlich [Sun, 2 May 2010 20:32:54 +0000 (20:32 +0000)]
Add -ldl for newer ld defaults from fedora 13
Modified Files:
simgear/screen/Makefile.am
Tim Moore [Wed, 5 May 2010 07:43:40 +0000 (09:43 +0200)]
Merge branch 'mathias/intersect' into next
frohlich [Sun, 2 May 2010 20:14:39 +0000 (20:14 +0000)]
Provide a more exact sphere/box test.
Modified Files:
simgear/math/SGIntersect.hxx simgear/math/SGBox.hxx
Tim Moore [Wed, 5 May 2010 07:40:31 +0000 (09:40 +0200)]
Merge branch 'master' into next
Tim Moore [Wed, 5 May 2010 07:40:23 +0000 (09:40 +0200)]
Merge branch 'maint'
frohlich [Sun, 2 May 2010 20:02:50 +0000 (20:02 +0000)]
Make the bounding volume debug visitor compile again.
Modified Files:
simgear/scene/bvh/BVHDebugCollectVisitor.hxx
Tim Moore [Wed, 5 May 2010 07:05:35 +0000 (09:05 +0200)]
Merge branch 'ehofman/sound' into next
jmt [Sun, 2 May 2010 11:09:31 +0000 (11:09 +0000)]
Following discussion with Tat and Erik, update how we handle ALUT on Mac; specifically, switch to using an ALUT.framework built from FreeALUT. The ALUT framework is available (initially) from:
http://files.goneabitbursar.com/fg/alut-osx-universal.zip
for testing purposes; autoconf integration and an official home for the
framework will follow once this approach has been tested and confirmed as
sane by other Mac developers!
Tim Moore [Wed, 5 May 2010 07:03:20 +0000 (09:03 +0200)]
Merge branch 'fredb/msvc-cleanup' into next
fredb [Sat, 1 May 2010 12:10:55 +0000 (12:10 +0000)]
Remove obsolete file
fredb [Sat, 1 May 2010 12:07:26 +0000 (12:07 +0000)]
Cleanup MSVC projects
Tim Moore [Wed, 5 May 2010 06:44:32 +0000 (08:44 +0200)]
Merge branch 'ehofman/model' into next
fredb [Sun, 25 Apr 2010 10:47:37 +0000 (10:47 +0000)]
Stuart Buchanan: Fix a bug in the random object placement where the model selected in the case of multiple object definitions in material.xml was random, rather than seeded.
Tim Moore [Sun, 25 Apr 2010 20:52:35 +0000 (22:52 +0200)]
Merge branch 'fredb/effect-stuff'
Tim Moore [Sun, 25 Apr 2010 20:52:10 +0000 (22:52 +0200)]
Merge branch 'zan/cubemap'
Tim Moore [Sun, 25 Apr 2010 20:52:02 +0000 (22:52 +0200)]
Merge branch 'fredb/geom-shader'
Tim Moore [Sun, 25 Apr 2010 20:36:06 +0000 (22:36 +0200)]
Merge branch 'ehofman/particles'
Tim Moore [Sun, 25 Apr 2010 20:33:34 +0000 (22:33 +0200)]
Merge branch 'timoore/aptsign'
Tim Moore [Sun, 25 Apr 2010 20:33:18 +0000 (22:33 +0200)]
Merge branch 'jmt/magvar'
Tim Moore [Sun, 25 Apr 2010 20:33:02 +0000 (22:33 +0200)]
Merge branch 'fred/precip'
Tim Moore [Sun, 25 Apr 2010 20:32:44 +0000 (22:32 +0200)]
Merge branches 'ehofman/propfix' and 'ehofman/sound'
Tim Moore [Sun, 25 Apr 2010 20:32:14 +0000 (22:32 +0200)]
Merge branches 'ehofman/config' and 'ehofman/dlerror'
Tim Moore [Mon, 12 Apr 2010 05:25:24 +0000 (07:25 +0200)]
Merge branch 'fredb/effect-stuff' into next
fredb [Sat, 10 Apr 2010 11:15:32 +0000 (11:15 +0000)]
Add a new node "float-property" to be used in float comparision in effect predicates
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:49:07 +0000 (22:49 +0200)]
Merge branch 'zan/cubemap' into next
Tim Moore [Sat, 3 Apr 2010 20:48:58 +0000 (22:48 +0200)]
Zan's cubemap patch
Tim Moore [Tue, 30 Mar 2010 10:07:50 +0000 (12:07 +0200)]
Merge branch 'fredb/geom-shader' into next
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 [Sat, 27 Mar 2010 12:39:55 +0000 (13:39 +0100)]
Merge branch 'ehofman/particles' into next
Tim Moore [Sat, 27 Mar 2010 12:39:48 +0000 (13:39 +0100)]
Merge branch 'ehofman/dlerror' into next
ehofman [Tue, 23 Mar 2010 08:19:43 +0000 (08:19 +0000)]
Csaba Halasz: fix a compilation error for non-bsd systems that happen to return
const char* from dlerror().
ehofman [Sat, 27 Mar 2010 10:58:33 +0000 (10:58 +0000)]
Allow particles to be frozen on pause.
Tim Moore [Tue, 16 Mar 2010 16:15:34 +0000 (17:15 +0100)]
Merge branch 'ehofman/sound' into next
Tim Moore [Tue, 16 Mar 2010 16:15:29 +0000 (17:15 +0100)]
Merge branch 'ehofman/propfix' into next
ehofman [Tue, 16 Mar 2010 08:53:38 +0000 (08:53 +0000)]
iprovide a slightly more helpfull exception message
ehofman [Tue, 16 Mar 2010 09:00:19 +0000 (09:00 +0000)]
updated vendor test
Tim Moore [Tue, 16 Mar 2010 14:44:56 +0000 (15:44 +0100)]
Merge branch 'timoore/clipgroup' into next
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.
Tim Moore [Tue, 16 Mar 2010 13:27:56 +0000 (14:27 +0100)]
Merge branch 'zan/generate' into next
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 [Tue, 16 Mar 2010 13:22:53 +0000 (14:22 +0100)]
Merge branch 'jmt/magvar' into next
jmt [Sun, 14 Mar 2010 12:00:54 +0000 (12:00 +0000)]
Overload the SGMagVar::update method to take an SGGeod.
Tim Moore [Tue, 16 Mar 2010 13:21:57 +0000 (14:21 +0100)]
Merge branch 'fred/precip' into next
fredb [Sun, 14 Mar 2010 09:24:12 +0000 (09:24 +0000)]
Precipitation inside cockpit temporary fix.
Needs a clip distance settable to take account of views and different cockpit size.
Tim Moore [Fri, 12 Mar 2010 13:32:11 +0000 (14:32 +0100)]
Merge branch 'timoore/aptsign' into next
Tim Moore [Fri, 12 Mar 2010 13:31:39 +0000 (14:31 +0100)]
Assign texcoords and a color (black) to the backs of airport signs
Tim Moore [Thu, 11 Mar 2010 07:46:22 +0000 (08:46 +0100)]
Merge branch 'timoore/effects-anim-rebase' into next
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 10:03:25 +0000 (11:03 +0100)]
Merge branch 'timoore/effects-anim-rebase' into next
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'
Tim Moore [Wed, 3 Mar 2010 22:12:49 +0000 (23:12 +0100)]
Merge branch 'zan/cloudsort' into next
ehofman [Wed, 3 Mar 2010 10:26:25 +0000 (10:26 +0000)]
Lauri Peltonen: turn on clouds depth sorting
Tim Moore [Mon, 22 Feb 2010 08:42:36 +0000 (09:42 +0100)]
Merge branch 'jmt/waypt' into next
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'
Tim Moore [Wed, 17 Feb 2010 06:20:38 +0000 (07:20 +0100)]
Merge branch 'curt/makefile' into next
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"
Tim Moore [Wed, 17 Feb 2010 06:19:20 +0000 (07:19 +0100)]
Merge branch 'ehofman/sound' into next
ehofman [Tue, 16 Feb 2010 10:04:53 +0000 (10:04 +0000)]
small fix for when sound is disabled
Tim Moore [Wed, 17 Feb 2010 06:18:30 +0000 (07:18 +0100)]
Merge branch 'ehofman/config' into next
ehofman [Tue, 16 Feb 2010 08:18:40 +0000 (08:18 +0000)]
John Denker: Fix sneaky bug: 'mylibdir' variable getting trampled.
Tim Moore [Sun, 14 Feb 2010 18:42:59 +0000 (19:42 +0100)]
Merge branch 'ehofman/config' into next
ehofman [Sun, 14 Feb 2010 14:21:59 +0000 (14:21 +0000)]
Joe User updates by John Denker