]>
git.mxchange.org Git - simgear.git/log
Tim Moore [Fri, 20 Nov 2009 21:58:59 +0000 (22:58 +0100)]
shader language predicate
Tim Moore [Mon, 16 Nov 2009 21:43:41 +0000 (22:43 +0100)]
descend into Effects to find default material animation values
Tim Moore [Mon, 16 Nov 2009 21:42:46 +0000 (22:42 +0100)]
add a transparent texture for effects
This is used as a default texture for the chrome animation.
Also, fix a typo in creating combiners.
Tim Moore [Mon, 16 Nov 2009 21:39:56 +0000 (22:39 +0100)]
Make MultiChangeListener derive publicly from SGPropertyChangeListener
Otherwise it doesn't work as a listener!
Tim Moore [Sun, 15 Nov 2009 22:51:08 +0000 (23:51 +0100)]
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.
Tim Moore [Sun, 15 Nov 2009 00:17:34 +0000 (01:17 +0100)]
Bump boost version to 1.37
Tim Moore [Fri, 13 Nov 2009 13:59:29 +0000 (14:59 +0100)]
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...
Tim Moore [Fri, 16 Oct 2009 10:54:46 +0000 (12:54 +0200)]
Effects in models working for transparent materials and chrome animation
Implementation of animated effect values via the property system.
Add names for TexEnvCombine attributes
Tim Moore [Fri, 16 Oct 2009 10:55:44 +0000 (12:55 +0200)]
Move Texture unit builder into TexBuilder.cxx
Do the refactoring necessary to make that work.
Tim Moore [Tue, 8 Sep 2009 11:09:05 +0000 (13:09 +0200)]
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.
Tim Moore [Mon, 9 Nov 2009 15:57:19 +0000 (16:57 +0100)]
Splicing visitor for rewriting scene graphs with a minimum of copying
Tim Moore [Tue, 8 Sep 2009 10:59:58 +0000 (12:59 +0200)]
Dump texture attributes of StateSet into effect property tree
Also, decode blend function.
Tim Moore [Tue, 8 Sep 2009 10:53:33 +0000 (12:53 +0200)]
getStateAttribute utility function
This provides a concise, typesafe way to get attributes from osg::StateSet.
Also, blew away BackRefInserter.
Tim Moore [Tue, 25 Aug 2009 14:01:11 +0000 (16:01 +0200)]
Add support for blend functions and alpha test functions in effects
Tim Moore [Sat, 15 Aug 2009 12:00:51 +0000 (14:00 +0200)]
wip for effects in models
multi-index for effect attributes
Tim Moore [Sun, 20 Sep 2009 07:29:05 +0000 (09:29 +0200)]
remove CopyPolicy from ModelRegistry
Put the responsibility for copying a loaded model directly in
SGReaderWriterXML.
Tim Moore [Tue, 10 Nov 2009 21:10:57 +0000 (22:10 +0100)]
fix typo
Tim Moore [Mon, 9 Nov 2009 12:28:11 +0000 (13:28 +0100)]
Move propertyExpression code from flightgear to simgear
Also add a function (possibly redundant) to access the global property
root.
Tim Moore [Thu, 5 Nov 2009 08:06:18 +0000 (09:06 +0100)]
Property system optimizations
Profiling startup with the new effects code exposed some performance
gotchas. The objective is to reduce allocation of std::string
temporaries, especially when looking up node path names. Also, I
changed some paths to initialize strings with strings instead of char *;
this causes less allocation, at least with glibc. Also, eliminate
the old version of find_node and its helper functions by writing the
template version of find_node_aux to handle an explicit index
parameter.
Also, add const char[] as an internal property type
This doesn't actually add a new type to the property system, but allows using
character arrays as arguments to certain templates.
Tim Moore [Tue, 28 Jul 2009 04:39:55 +0000 (06:39 +0200)]
Add writeLocalData functions for internal scenegraph classes
This makes the scenegraph dump more complete and therefore more useful.
Tim Moore [Fri, 18 Sep 2009 13:43:46 +0000 (15:43 +0200)]
check for null effect in EffectCullVisitor
An EffectGeode might not have any effect.
Tim Moore [Thu, 17 Sep 2009 10:25:19 +0000 (12:25 +0200)]
Merge branch 'tat/configure' into next
torsten [Wed, 16 Sep 2009 17:01:47 +0000 (17:01 +0000)]
Tatsuhiro Nishioka:
Patches for configure.ac and Makefile.am files in FG/SG so Mac developers can build these in a unix way.
These also enables Mac developers to choose either PLIB framework or PLIB static libs.
Tim Moore [Thu, 17 Sep 2009 10:22:06 +0000 (12:22 +0200)]
Merge branch 'topic/projection' into next
frohlich [Wed, 16 Sep 2009 05:06:56 +0000 (05:06 +0000)]
Correct finite precision issues.
Use consistent function names.
Implement changes consistently over the different vector sizes.
Modified Files:
SGVec2.hxx SGVec3.hxx SGVec4.hxx
Tim Moore [Thu, 17 Sep 2009 10:18:33 +0000 (12:18 +0200)]
Merge branch 'frohlich/weak' into next
frohlich [Wed, 16 Sep 2009 05:04:05 +0000 (05:04 +0000)]
Make the weak pointer work. Some bits were left when importing.
Modified Files:
SGSharedPtr.hxx SGWeakPtr.hxx
jmt [Mon, 14 Sep 2009 12:36:35 +0000 (12:36 +0000)]
Logging:less verbose sound loading.
jmt [Mon, 14 Sep 2009 12:30:35 +0000 (12:30 +0000)]
Logging: quiet down STG parsing.
jmt [Mon, 14 Sep 2009 12:20:03 +0000 (12:20 +0000)]
Logging: quiet down model/image loading policy.
jmt [Mon, 14 Sep 2009 12:18:20 +0000 (12:18 +0000)]
Logging: quiet the BVH building policy.
jmt [Mon, 14 Sep 2009 12:09:49 +0000 (12:09 +0000)]
Logging: quiet material loading.
jmt [Mon, 14 Sep 2009 12:08:02 +0000 (12:08 +0000)]
Logging - downgrade play/stop messages to debug.
John Denker [Sun, 11 Jan 2009 01:16:58 +0000 (18:16 -0700)]
Implement vector _projection_ functions.
John Denker [Wed, 7 Jan 2009 11:22:13 +0000 (04:22 -0700)]
Make "repeat" start slower on pick-animation mouse events;
otherwise it is unusable.
ehofman [Tue, 8 Sep 2009 13:50:55 +0000 (13:50 +0000)]
Dont execute code in case the soundmanager isn't properly initialized
frohlich [Mon, 7 Sep 2009 21:42:50 +0000 (21:42 +0000)]
Switch to new vector conversion functions.
Modified Files:
simgear/math/SGGeod.cxx simgear/math/SGQuat.hxx
simgear/math/SGVec2.hxx simgear/math/SGVec3.hxx
simgear/math/SGVec4.hxx simgear/scene/material/Effect.cxx
simgear/scene/model/SGInteractionAnimation.cxx
simgear/scene/model/SGMaterialAnimation.cxx
simgear/scene/model/SGRotateTransform.cxx
simgear/scene/model/SGScaleTransform.cxx
simgear/scene/model/SGTranslateTransform.cxx
simgear/scene/model/animation.cxx
simgear/scene/model/particles.cxx
simgear/scene/model/placement.cxx
simgear/scene/model/shadanim.cxx
simgear/scene/sky/CloudShaderGeometry.cxx
simgear/scene/sky/cloud.cxx simgear/scene/sky/cloudfield.cxx
simgear/scene/sky/dome.cxx simgear/scene/sky/sky.cxx
simgear/scene/tgdb/GroundLightManager.cxx
simgear/scene/tgdb/SGOceanTile.cxx
simgear/scene/tgdb/SGTexturedTriangleBin.hxx
simgear/scene/tgdb/SGVasiDrawable.cxx
simgear/scene/tgdb/TreeBin.cxx simgear/scene/tgdb/obj.cxx
simgear/scene/tgdb/pt_lights.cxx
simgear/scene/util/SGUpdateVisitor.hxx
frohlich [Mon, 7 Sep 2009 20:37:19 +0000 (20:37 +0000)]
Fix problem with ocean files not recognized as water.
Move dynamic casts to EffectGeode into the findMaterial method.
Modified Files:
simgear/scene/material/matlib.cxx
simgear/scene/material/matlib.hxx
simgear/scene/model/BoundingVolumeBuildVisitor.hxx
frohlich [Sat, 5 Sep 2009 12:25:51 +0000 (12:25 +0000)]
Add some comments.
Make sure floating point constants do not introduce useless upcasts.
Remove now unused and not really usefull method.
Modified Files:
simgear/math/SGQuat.hxx
ehofman [Sat, 5 Sep 2009 11:56:53 +0000 (11:56 +0000)]
Also install coremag.hxx since it is being used by JSBSim now
frohlich [Sat, 5 Sep 2009 06:54:16 +0000 (06:54 +0000)]
Remove unused member.
Modified Files:
simgear/scene/util/SGSceneFeatures.hxx
frohlich [Sat, 5 Sep 2009 06:53:52 +0000 (06:53 +0000)]
Should be now more easy to make use of SGMath without having osg.
Modified Files:
simgear/scene/sky/dome.cxx simgear/math/SGGeod.cxx
simgear/math/SGGeod.hxx simgear/math/SGQuat.hxx
simgear/math/SGVec2.hxx simgear/math/SGVec3.hxx
simgear/math/SGVec4.hxx
frohlich [Thu, 3 Sep 2009 20:14:32 +0000 (20:14 +0000)]
Return a osg::Vec value instead of a non const reference.
Modified Files:
scene/model/SGMaterialAnimation.cxx
frohlich [Thu, 3 Sep 2009 20:13:24 +0000 (20:13 +0000)]
Avoid the non const SGVec*::osg() method.
Modified Files:
SGTranslateTransform.cxx SGScaleTransform.cxx
SGRotateTransform.cxx
frohlich [Thu, 3 Sep 2009 20:10:42 +0000 (20:10 +0000)]
Use const refs for const data.
Modified Files:
simgear/scene/model/CheckSceneryVisitor.hxx
simgear/scene/model/CheckSceneryVisitor.cxx
torsten [Sat, 29 Aug 2009 13:38:32 +0000 (13:38 +0000)]
Spare one node in the scenegraph if there is no <offsets>
timoore [Tue, 25 Aug 2009 07:19:39 +0000 (07:19 +0000)]
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.
torsten [Mon, 24 Aug 2009 17:30:42 +0000 (17:30 +0000)]
support osgText in models
torsten [Mon, 24 Aug 2009 17:29:38 +0000 (17:29 +0000)]
support osgText in models. See docs/README.osgtext for details
torsten [Fri, 21 Aug 2009 15:55:23 +0000 (15:55 +0000)]
Don't load materials without a name
torsten [Fri, 21 Aug 2009 12:10:50 +0000 (12:10 +0000)]
Avoid NAN due to floating point rounding errors
ehofman [Fri, 21 Aug 2009 07:43:01 +0000 (07:43 +0000)]
prevent division by zero
torsten [Thu, 20 Aug 2009 15:24:32 +0000 (15:24 +0000)]
Alan Teeder: fix incomplete dbg_printf for non-gcc.
torsten [Thu, 20 Aug 2009 13:10:56 +0000 (13:10 +0000)]
don't build tabbed_value_test, swap_test, openal_test1 and openal_test2 by default.
torsten [Thu, 20 Aug 2009 13:09:29 +0000 (13:09 +0000)]
warning fix: unused variables
torsten [Thu, 20 Aug 2009 13:09:00 +0000 (13:09 +0000)]
extinguish many warnings (at least for gcc)
torsten [Thu, 20 Aug 2009 13:08:03 +0000 (13:08 +0000)]
warning fix: initializing members in the order they are declared keeps gcc happy
torsten [Thu, 20 Aug 2009 11:53:58 +0000 (11:53 +0000)]
warning fixes
torsten [Thu, 20 Aug 2009 11:44:37 +0000 (11:44 +0000)]
extinguish many warnings (at least for gcc)
torsten [Thu, 20 Aug 2009 11:09:37 +0000 (11:09 +0000)]
warning fix: abort program and spit out a message if getNumPrims() is called with unknown mode. (Shouldn't happen anyway)
torsten [Thu, 20 Aug 2009 11:02:42 +0000 (11:02 +0000)]
warning fix: unused variable
torsten [Thu, 20 Aug 2009 11:02:00 +0000 (11:02 +0000)]
warning fix, unused code
torsten [Thu, 20 Aug 2009 10:55:24 +0000 (10:55 +0000)]
don't use uninitialized variables
torsten [Thu, 20 Aug 2009 10:55:01 +0000 (10:55 +0000)]
warning fixes
torsten [Thu, 20 Aug 2009 09:17:01 +0000 (09:17 +0000)]
warning fixes
torsten [Thu, 20 Aug 2009 09:00:12 +0000 (09:00 +0000)]
warning fixes
torsten [Thu, 20 Aug 2009 08:51:53 +0000 (08:51 +0000)]
warning fix (multiline comment)
torsten [Thu, 20 Aug 2009 08:43:15 +0000 (08:43 +0000)]
warning fix
torsten [Thu, 20 Aug 2009 08:41:21 +0000 (08:41 +0000)]
warning fixes
torsten [Thu, 20 Aug 2009 08:32:31 +0000 (08:32 +0000)]
Warning fix: array subscript is above array bounds
ehofman [Sun, 16 Aug 2009 19:33:58 +0000 (19:33 +0000)]
Expose the color of the sun (which is not the scene specular color anymore)
ehofman [Sun, 16 Aug 2009 08:42:23 +0000 (08:42 +0000)]
Differentiate between sun color (based in visibility) and scene color (based on humidity)
torsten [Sun, 9 Aug 2009 10:49:20 +0000 (10:49 +0000)]
Stuart Buchanan: I've been working on a small patch to allow trees to be grouped together into woods. This allows what seems to me to be a more realistic grouping of trees for farmland in particular.
fredb [Sat, 8 Aug 2009 12:26:36 +0000 (12:26 +0000)]
Compile under MSVC9
timoore [Sat, 8 Aug 2009 10:19:56 +0000 (10:19 +0000)]
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.
torsten [Tue, 28 Jul 2009 14:33:44 +0000 (14:33 +0000)]
Allow multiple <button> elements for <action> elements in pick animations. Nice to have to have a single action for mouse-button and mouse-wheel.
fredb [Mon, 27 Jul 2009 09:50:55 +0000 (09:50 +0000)]
Fix case typo
fredb [Sun, 26 Jul 2009 20:24:57 +0000 (20:24 +0000)]
Suppress warnings
fredb [Sun, 26 Jul 2009 18:53:29 +0000 (18:53 +0000)]
Compile latest SimGear under MSVC9
Tim Moore [Sun, 19 Jul 2009 21:05:04 +0000 (23:05 +0200)]
Create a singleton for the parser table
Tim Moore [Sun, 19 Jul 2009 20:39:16 +0000 (22:39 +0200)]
Move definition of SGRawBase<...>::printOn out of simgear namespace
They are declared in the global namespace, and MSVC insists that they be
defined there.
Tim Moore [Sat, 18 Jul 2009 08:12:59 +0000 (10:12 +0200)]
Add missing return statements
Tim Moore [Fri, 17 Jul 2009 14:16:25 +0000 (16:16 +0200)]
Store material data with Effect
Somehow this got left out, which broke ground intersection queries.
Tim Moore [Fri, 17 Jul 2009 12:52:58 +0000 (14:52 +0200)]
Change references to property types
BOOL, FLOAT etc. conflict with typedefs in windows.h, so these types
are referred to using the props:: namespace.
Tim Moore [Fri, 17 Jul 2009 09:40:36 +0000 (11:40 +0200)]
Changed SGRawValue::DefaultValue to an inline function.
This avoids MSVC bugs in declaring templated specializations of static members.
Tim Moore [Thu, 16 Jul 2009 22:29:48 +0000 (00:29 +0200)]
Use SGAtomic's compareAndExchange instead of a new SGSwappable class
Also, eliminate the __declspec(32) of that class which is causing problems
in osg::buffered_object.
Tim Moore [Thu, 16 Jul 2009 21:09:10 +0000 (23:09 +0200)]
include file change to make simgear work with OSG 2.9.X again
Tim Moore [Thu, 16 Jul 2009 16:25:36 +0000 (18:25 +0200)]
Fix effects code to work with OSG 2.8.2-rc4
Tim Moore [Thu, 16 Jul 2009 10:53:11 +0000 (12:53 +0200)]
Use std::back_inserter instead of my local hack
BackRefInsertIterator is probably broken and may not be needed at all.
timoore [Wed, 15 Jul 2009 23:12:25 +0000 (23:12 +0000)]
Add new Effects files to vcproj
timoore [Wed, 15 Jul 2009 23:11:55 +0000 (23:11 +0000)]
Fixes for technique predicates
Get tests based on properties and OpenGL extensions working.
timoore [Wed, 15 Jul 2009 23:11:44 +0000 (23:11 +0000)]
more effects features
Materials can specify an effect.
Add support for PolygonMode and initial support for Uniform.
timoore [Wed, 15 Jul 2009 23:10:44 +0000 (23:10 +0000)]
Construct effects from property lists
The material code constructs a property list from its input parameters.
Enable dumping of Pass and Technique objects to a file.
Default effect now uses texture node instead of texture0
timoore [Wed, 15 Jul 2009 23:10:32 +0000 (23:10 +0000)]
materials use only simgear::Effect
Eliminate SGMaterial::get_state function.
Use Effect in BVH visitor, ocean tile generation, and airport signs.
timoore [Wed, 15 Jul 2009 23:10:21 +0000 (23:10 +0000)]
Use Effect to implement point lights
This allows different OpenGL features (point sprites, point attenuation) to
be used depending on hardware support.
timoore [Wed, 15 Jul 2009 23:10:13 +0000 (23:10 +0000)]
Use SGExpressions for evaluating a Technique's validity
timoore [Wed, 15 Jul 2009 23:10:06 +0000 (23:10 +0000)]
Overhaul of SGExpression
Polymorphic additions to expressions: Add an expression base class
with a method for dynamically determining the type of an expression.
Add variables, predicates and boolian expressions.
Support for parsing trees of expressions
timoore [Wed, 15 Jul 2009 23:09:58 +0000 (23:09 +0000)]
Work in progress for Technique validation
timoore [Wed, 15 Jul 2009 23:09:31 +0000 (23:09 +0000)]
Use Effects in materials library, and therefore in scenery
timoore [Wed, 15 Jul 2009 23:09:19 +0000 (23:09 +0000)]
Effects framework