FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,526 Commits 1 Branch 121 Tags
9f9c4cf32c2cf774c7febd7fe2b4e65a7d205294
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Moore 0ede690580 Merge branch 'maint' 2010-05-05 10:38:18 +02:00
Tim Moore 3346bfc9a8 Merge branch 'maint' 2010-05-05 09:40:23 +02:00
Tim Moore e6d01ed1a3 Merge branch 'fredb/effect-stuff' 2010-04-25 22:52:35 +02:00
Tim Moore d8d1064e05 Merge branch 'zan/cubemap' 2010-04-25 22:52:10 +02:00
Tim Moore 5d04cb81ba Merge branch 'fredb/geom-shader' 2010-04-25 22:52:02 +02:00
Tim Moore 5d5906e980 Merge branch 'ehofman/particles' 2010-04-25 22:36:06 +02:00
Tim Moore 2e7b862ad3 Merge branch 'timoore/aptsign' 2010-04-25 22:33:34 +02:00
Tim Moore ad86e22824 Merge branch 'jmt/magvar' 2010-04-25 22:33:18 +02:00
Tim Moore 536b8a213b Merge branch 'fred/precip' 2010-04-25 22:33:02 +02:00
Tim Moore 2e13877926 Merge branches 'ehofman/propfix' and 'ehofman/sound' 2010-04-25 22:32:44 +02:00
Tim Moore 967d63dec4 Merge branches 'ehofman/config' and 'ehofman/dlerror' 2010-04-25 22:32:14 +02:00
Tim Moore 461e6d1b5b Zan's cubemap patch 2010-04-03 22:48:58 +02:00
Tim Moore 3d91a11b95 Merge branch 'zan/generate' 2010-03-30 12:04:09 +02:00
Tim Moore 1349b46a8c Merge branch 'jmt/waypt' 2010-03-30 11:53:13 +02:00
Tim Moore 74330ba1dd Merge branch 'timoore/clipgroup' 2010-03-30 11:46:01 +02:00
Tim Moore 64ab227f62 Merge branch 'timoore/effects-anim-rebase' 2010-03-30 11:41:37 +02:00
Tim Moore 1c51fbd1b4 Merge branch 'zan/cloudsort' 2010-03-30 11:40:45 +02:00
Tim Moore 1ca1f6ad22 Remove reference to osgUtil::RegisterRenderBinProxy 
This has gone away in recent OSG sources.
 2010-03-16 15:42:54 +01:00
Tim Moore 127226c421 Assign texcoords and a color (black) to the backs of airport signs 2010-03-12 14:31:39 +01:00
Tim Moore 60ab1ab83e bug fix to animated effect parameters 
Some confusion in getting the right property node.
 2010-03-11 08:45:58 +01:00
Tim Moore 93c2f70b64 animate uniform parameters in effects 2010-03-09 11:02:57 +01:00
Tim Moore b0562df6bb Cleanup of effects parameter animation 2010-03-09 11:02:56 +01:00
Tim Moore 65d6a5c774 Prepare effects animation code to use general functor setters 2010-03-09 11:02:56 +01:00
Tim Moore 650af0f7b0 generalize support for initializing effect parameters from several properties 2010-03-09 11:02:56 +01:00
Tim Moore cf9de25c25 pass SGReaderWriterXMLOptions object to getGlobalProperty 
This supports pathnames relative to a model in effect definitions.
 2010-03-09 11:02:56 +01:00
Tim Moore fc4009aa50 change return value of SGPropertyNode::getPath to std::string 
Also get rid of the cached value.
 2010-03-09 11:02:56 +01:00
Tim Moore d04cf4d897 pass SGReaderWriterXMLOptions to effects 
This will allow parameters to refer to properties in models, though
that doesn't work yet.
 2010-03-09 11:02:56 +01:00
Tim Moore 2e45c67ef2 Merge branch 'zan/stencil' 2010-03-09 10:59:09 +01:00
Tim Moore c57c3cd1d3 Merge branch 'curt/makefile' 2010-02-17 18:01:29 +01:00
Tim Moore ad667be0d7 Merge branch 'fredb/winfix' 2010-02-05 00:23:51 +01:00
Tim Moore acf19cebf8 Stencil operations for effects 
From Lauri Peltonen
 2010-01-29 19:07:53 +01:00
Tim Moore 5dfa4c0840 Merge branch 'timoore/mat-effect' 2010-01-28 10:31:52 +01:00
Tim Moore f918602f58 Merge branch 'freb/mingw' 2010-01-28 10:31:40 +01:00
Tim Moore 2cf2dd24a4 Merge branch 'fredb/winfix' 2010-01-28 10:31:11 +01:00
Tim Moore eefb069d08 Create a different default effect for objects that have material animations 2010-01-27 18:42:48 +01:00
Tim Moore e7f151ad02 Merge branch 'ehofman/sound' 2010-01-25 14:02:02 +01:00
Tim Moore 0710b781d3 Merge branch 'torsten/geoequal' 2010-01-25 14:01:52 +01:00
Tim Moore 7c01ad6917 Merge branch 'durk/version' 2010-01-25 14:00:42 +01:00
Tim Moore 11479cd8c3 Merge branch 'ehofman/sound' 2010-01-16 23:49:36 +01:00
Tim Moore 430c60ed1a Merge branch 'ehofman/sound' 2010-01-13 07:57:35 +01:00
Tim Moore dfea3623f6 Merge branch 'tat/framework' 2010-01-13 07:57:30 +01:00
Tim Moore b38783e4cb Merge branch 'ehofman/subsys' 2010-01-11 07:15:11 +01:00
Tim Moore 9382a4c21b Merge branch 'jester/aptsign' 2010-01-11 07:14:51 +01:00
Tim Moore 3cd4c5566f Merge branch 'timoore/effects' 2010-01-11 07:14:23 +01:00
Tim Moore 601c0977df Merge branch 'jmt/geodistance' 2010-01-11 07:10:46 +01:00
Tim Moore d6c0bf69b6 fix up some merge weirdness 2010-01-01 13:32:03 +01:00
Tim Moore dca07c5634 Merge branch 'timoore/effects' 
Conflicts:
	simgear/scene/model/model.cxx
	simgear/scene/sky/newcloud.cxx
 2009-12-20 16:07:00 +01:00
Tim Moore fd42294faf 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.
 2009-12-20 11:46:28 +01:00
Tim Moore 59fc902cfb 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.
 2009-12-14 06:52:00 +01:00
Tim Moore e37c218c2a take locks out of ModelRegistry 
They should be unnecessary and were causing deadlock with Effects that
load images.
 2009-11-29 22:54:02 +01:00
Tim Moore c2317edf8a 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.
 2009-11-29 12:42:10 +01:00
Tim Moore cb7ac404d9 Merge branch 'ehofman/sky' 2009-11-26 23:28:34 +01:00
Tim Moore 5abc6c995f fix a memory leak in newcloud.cxx 2009-11-26 16:30:46 +01:00
Tim Moore ddd72b2b37 Use an effect for 3d clouds 2009-11-26 11:40:41 +01:00
Tim Moore 7f5df1fb66 Support for shader program attributes in effects 
Also, use a hash table for the effect shader program cache.
 2009-11-26 11:39:34 +01:00
Tim Moore 2e71b64de1 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.
 2009-11-26 11:32:00 +01:00
Tim Moore 45f1f9263f add a property debugging function 2009-11-26 10:38:31 +01:00
Tim Moore b8a6d1ac4d add depth attribute to Effect 2009-11-23 09:15:47 +01:00
Tim Moore 40533f50df 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.
 2009-11-22 23:05:11 +01:00
Tim Moore 539ced191b Move tree shaders to an effect 
Also, improve effect hash keys.
 2009-11-22 00:32:51 +01:00
Tim Moore 1a400b890b Effect file support for GL_VERTEX_PROGRAM_TWO_SIDE and POINT_SIZE 2009-11-22 00:27:53 +01:00
Tim Moore ebe5a5579c shader language predicate 2009-11-20 22:59:15 +01:00
Tim Moore 3cd5322496 descend into Effects to find default material animation values 2009-11-16 22:43:41 +01:00
Tim Moore cadecdcab7 add a transparent texture for effects 
This is used as a default texture for the chrome animation.

Also, fix a typo in creating combiners.
 2009-11-16 22:42:46 +01:00
Tim Moore cd4030b7db Make MultiChangeListener derive publicly from SGPropertyChangeListener 
Otherwise it doesn't work as a listener!
 2009-11-16 22:39:56 +01:00
Tim Moore 0a2264cad4 When instantiating effects, copy user data of any created nodes. 
This bug was the cause of the huge memory consumption / death reported at some places:
the BVH data on "raw" .ac models (random objects) was dropped on the floor.
 2009-11-15 23:51:08 +01:00
Tim Moore bb2a02daa8 Bump boost version to 1.37 2009-11-15 01:17:34 +01:00
Tim Moore 5991195062 optimize creation and sharing of effects 
Implement equality test and hash for for property trees.  In an
Effect, make a hash table of Effects that inherit from it keyed on
their unmerged property tree. Using that, makeEffect() should return a
single Effect for given property tree description. Animations may
change that in the future...
 2009-11-13 22:41:11 +01:00
Tim Moore 54c4055af3 Effects in models working for transparent materials and chrome animation 
Implementation of animated effect values via the property system.

Add names for TexEnvCombine attributes
 2009-11-13 22:41:11 +01:00
Tim Moore cb07210bc7 Move Texture unit builder into TexBuilder.cxx 
Do the refactoring necessary to make that work.
 2009-11-13 22:41:11 +01:00
Tim Moore 3e40d624a8 Effects for models 
Basically working, at last. Among other things, create effects in
 models loaded directly from .ac files; this can happen, for example,
with the random models from the materials library.
 2009-11-13 22:41:11 +01:00
Tim Moore 63ce675914 Splicing visitor for rewriting scene graphs with a minimum of copying 2009-11-13 22:41:11 +01:00
Tim Moore 14e5e87a4d Dump texture attributes of StateSet into effect property tree 
Also, decode blend function.
 2009-11-13 22:41:11 +01:00
Tim Moore e7e81c6639 getStateAttribute utility function 
This provides a concise, typesafe way to get attributes from osg::StateSet.

Also, blew away BackRefInserter.
 2009-11-13 22:41:11 +01:00
Tim Moore 23d0601d82 Add support for blend functions and alpha test functions in effects 2009-11-13 22:41:11 +01:00
Tim Moore 6db9138eeb wip for effects in models 
multi-index for effect attributes
 2009-11-13 22:41:10 +01:00
Tim Moore 6a7c200002 remove CopyPolicy from ModelRegistry 
Put the responsibility for copying a loaded model directly in
SGReaderWriterXML.
 2009-11-13 22:41:10 +01:00
Tim Moore a25e859fa7 fix typo 2009-11-10 22:10:57 +01:00
Tim Moore 4e2eb2f24c Move propertyExpression code from flightgear to simgear 
Also add a function (possibly redundant) to access the global property
root.
 2009-11-09 15:53:10 +01:00
Tim Moore e2ce4c0fa9 More include SGMath.hxx to keep MSVC happy 2009-10-26 18:37:27 +01:00
Tim Moore b1c49045a8 forward declare Point3D in sg_types.hxx 
This avoids sucking in SGMath.hxx -- and therefore a bunch of OSG headers --
into many compilation units.
 2009-10-18 12:11:13 +02:00
Tim Moore 40e13b91fe Merge branches 'toresten/geofix', 'jmt/lcase', 'stuart/clouds' and 'jmt/dump' 2009-10-12 10:03:00 +02:00
Tim Moore 64756d14d0 Back out convertToLowerCase function 
It brought in an OSG dependency; we'll just use boost::to_lower_copy instead.
 2009-10-01 00:31:36 +02:00
Tim Moore bac2ef601d Merge branch 'jmt/lcase' into next 2009-09-28 23:51:07 +02:00
Tim Moore cf3bab89f9 Merge branch 'master' into next 2009-09-28 23:50:56 +02:00
Tim Moore ecd0a53412 Add writeLocalData functions for internal scenegraph classes 
This makes the scenegraph dump more complete and therefore more useful.
 2009-09-22 12:56:28 +02:00
Tim Moore 3456434e37 check for null effect in EffectCullVisitor 
An EffectGeode might not have any effect.
 2009-09-18 15:43:46 +02:00
Tim Moore 454c5b1ed2 Merge branch 'tat/configure' into next 2009-09-17 12:25:19 +02:00
Tim Moore 819d3f5ded Merge branch 'topic/projection' into next 2009-09-17 12:22:06 +02:00
Tim Moore 9cbbe55598 Merge branch 'frohlich/weak' into next 2009-09-17 12:18:33 +02:00
timoore d4289c5d54 Change trees code to use a faster OpenGL path 
The (random) dimensions of a large number of trees is stored in an
array shared by all the tree geodes. The coordinates of the origin of
each tree are replicated in an another array. This allows an entire
block of trees to be rendered with a few OpenGL calls, instead of one
function call per tree.
 2009-08-25 16:14:13 +02:00
timoore 01a896ef5b New effects from Till Busch: crops, water, landmass 
As shown at LinuxTag, with modifications from Tim Moore: the base
landmass texture is mixed with the steepness and snow effects. Till's
new syntax for textures in effect files was also added. syntax for
textures. Also, syntax for accessing internal textures, such as Till's
3D noise texture, was added.

Several bugs in the effect inheritance algorithm were fixed.
 2009-08-09 23:56:10 +02:00
Tim Moore 59ef7d8fd1 Create a singleton for the parser table 2009-07-19 23:05:04 +02:00
Tim Moore 1f308c9ec3 Move definition of SGRawBase<...>::printOn out of simgear namespace 
They are declared in the global namespace, and MSVC insists that they be
defined there.
 2009-07-19 22:39:16 +02:00
Tim Moore 4943d3aa53 Add missing return statements 2009-07-18 10:12:59 +02:00
Tim Moore 828d561113 Store material data with Effect 
Somehow this got left out, which broke ground intersection queries.
 2009-07-17 16:18:12 +02:00
Tim Moore fc7ec4299e include file change to make simgear work with OSG 2.9.X again 2009-07-16 23:09:10 +02:00
timoore 8e718fe288 Add new Effects files to vcproj 2009-07-16 12:09:45 +02:00
timoore efec9070e1 Fixes for technique predicates 
Get tests based on properties and OpenGL extensions working.
 2009-07-16 12:09:44 +02:00
timoore e3646d4d4a more effects features 
Materials can specify an effect.

Add support for PolygonMode and initial support for Uniform.
 2009-07-16 12:09:44 +02:00