FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,785 Commits 1 Branch 121 Tags
c96d7ae226c3ec48c2260dbe40feae023c4a00a5
Commit Graph
109 Commits
Author SHA1 Message Date
Thomas Geymayer c96d7ae226 Use simulation time for spin and timed animations 2013-05-10 01:11:46 +02:00
Thomas Geymayer 2af78a3874 Allow adding a contition to locked-track animation 2013-05-02 00:47:51 +02:00
Thomas Geymayer 0fa23b83e6 Extend locked-track animation to support a slave element. 
This allows tracking elements while at the same time changing the
rotation of both animated elements to fill the available distance
to the target element. This allows for example animating gear
scissors or other connected objects like gear doors and their
actuators/arms (possibly connected to the gear strut).
 2013-04-28 23:46:25 +02:00
Thomas Geymayer 559a5d146a Add trackTo (locked-track) animation 2013-04-25 23:23:16 +02:00
James Turner eeeb30dc3f Work on knob/slider animations. 
Rename some values, and support mouse-dragging.
 2013-03-07 18:40:37 +00:00
James Turner 4d4e474464 Initial prototype of knob animation. 2013-01-31 00:15:09 +00:00
James Turner a58b41e7d2 Pick animation moved to its own file. 
Preparatory work for adding more pick animations which will share some
internals with this code.
 2013-01-30 21:51:41 +00:00
Mathias Froehlich 9c9bfc1a98 scenery: Make sure makeEffects has reader writer options. 2012-10-03 21:59:09 +02:00
Tim Moore 78a78a17cc DeletionManager 
Class for safely deleting objects that may be active in different threads.
This is now used in the implementation of spin animations.
 2012-08-03 20:10:53 +02:00
Tim Moore e202d4e4a5 bug: 823 change rotation animation to use a subclass of SGRotateTransform 
The animation is implemented in the computeWorldToLocalMatrix() and
computeLocalToWorldMatrix() virtual functions. Doing the animation in a cull
callback breaks picking.

Fix for http://code.google.com/p/flightgear-bugs/issues/detail?id=823
 2012-08-03 20:10:00 +02:00
Tim Moore 302deeb122 set name string for update callbacks 
This makes it easier to find nodes with update callbacks in the scene graph dump.
 2012-07-20 00:34:47 +02:00
Tim Moore 75087095b1 Replace rotation animation update callbacks with cull callbacks 
Update callbacks are expensive because they force large parts of the scenegraph to be traversed
by OSG.
 2012-07-19 00:42:38 +02:00
Frederic Bouvier 5af8bb7c8e Working 'noshadow' animation 2012-06-30 16:25:21 +02:00
ThorstenB 6fa4c7e138 Add file name to error message. 2012-03-28 22:54:27 +02:00
Frederic Bouvier b582cd230e Implement a cache of light effects 2012-03-04 20:21:24 +01:00
Frederic Bouvier 5a96b283f6 Add preliminary spot light animation 2012-03-04 20:21:18 +01:00
Mathias Froehlich 11fd888ed8 Replace osgDB::ReaderWriter::Options to osgDB::Options. 
This has changed in osg, so reflect that here.
 2012-03-04 07:07:42 +01:00
Mathias Froehlich 2cc5e776b3 math: Remove SGMath osg dependency. 
Move osg dependent stuff from SGMath into simgear/scene/util/OsgMath.hxx.
Update includes in simgear to reflect this change.
Note that this change also requires an updated flightgear version.
 2012-03-03 13:35:20 +01:00
ThorstenB d4f5a35e87 Alert message formatting. 
Avoid log output cluttering due to "missing animation objects".
 2011-07-03 13:04:00 +02:00
Frederic Bouvier 29c8c9f989 Fix cppcheck performance warning : Prefer prefix ++/-- operators for non-primitive types. 2011-01-30 21:22:06 +01:00
Torsten Dreyer 122d7f681f Add <expression> to animations 
Allow complex animation expressions

Example: translate along the y-axis following a sin
function.
<animation>
  <type>translate</type>
  <axis>
    <y>1</y>
  </axis>
  <expression>
    <sin>
      <product>
        <property>/some/position-norm</property>
        <value>6.28</value>
      </product>
    </sin>
  </expression>
</animation>
 2011-01-07 22:43:46 +01:00
Tim Moore c934b47f2e Issue 110: fix pick animation interaction with effects 
Set OVERRIDE and PROTECTED attributes on pick animation state
attributes. Set up attributes and add a colorMode uniform so that the
default shader will take color and alpha values from the
material. Also, add a DotOsg writer method for ConditionNode.
 2010-12-29 18:09:23 +01:00
Tim Moore fef625ce27 add ConditionNode scenegraph node 
This class directs its scenegraph traversal by evaluating a condition
and doesn't rely on an update callback.
 2010-11-04 07:01:38 +01:00
Torsten Dreyer 1ae0f9c19d 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.
 2010-05-22 23:35:01 +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
John Denker f3bc977d32 Make "repeat" start slower on pick-animation mouse events; 
otherwise it is unusable.
 2009-09-09 22:54:13 +02:00
frohlich 795d481ca6 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
 2009-09-09 08:39:55 +02:00
torsten a92955eade warning fixes 2009-08-23 21:37:02 +02:00
torsten 0e5e760135 Allow multiple <button> elements for <action> elements in pick animations. Nice to have to have a single action for mouse-button and mouse-wheel. 2009-08-08 00:49:40 +02:00
timoore 03b9303f22 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
 2009-07-16 12:09:44 +02:00
frohlich 5850464ba7 Move the carrier interactive geometry configuration into the model files. 
Modified Files:
	Makefile.am animation.cxx
Added Files:
	SGInteractionAnimation.hxx SGInteractionAnimation.cxx
 2009-06-23 10:42:42 +02:00
durk 812170ebce Torsten Dreyer: the rotate animation has two ways to define a axis 
1. by using center/x-m and axis/[xyz]
2. by using axis/[xyz]1-m and axis/[xyz]2-m

The translate animation only supports method 1. and here comes a patch that
enables method 2 for this animations, too.
 2009-02-22 23:49:45 +01:00
fredb 15893bc558 Csaba/Jester : fix a problem with tex transform animation 2008-12-12 20:02:44 +00:00
timoore c8c693db53 From Benoit Laniel: replace SG threading constructs with those from OpenThreads 
Also, move any static local mutexes up to global level.
 2008-06-12 08:14:40 +00:00
mfranz 8f48515b80 Till BUSCH: 
this is a small (-1/+3) patch to fix pick animations on scenery objects.
since picking apparently doesn't care for polygon offsets, the objects
got into the picklist in the wrong way. now, no matter if the "highlight
group" or the "normal group" gets hit first, the callback will fire.
 2008-04-23 12:28:45 +00:00
timoore b09e484492 particles from Tiago_G 2008-02-15 06:44:05 +00:00
frohlich 22f2fac56b Modified Files: 
simgear/scene/model/animation.cxx:
	Change factor/offset order for texture animations.
	Fixes remaining bug with texture animations.
 2008-01-07 22:05:48 +00:00
frohlich 9c51bf3edf Modified Files: 
simgear/scene/model/animation.cxx: Create animation inputs if not
	already there. Fixes broken texture animations from past checkin.
 2007-12-31 15:48:02 +00:00
frohlich c3719f35e3 Modified Files: 
animation.cxx animation.hxx: Make use of the expression stuff.
	Factors out common code with other animations stuff in flightgear.
 2007-12-26 19:12:04 +00:00
timoore 94be52886e Pass ReaderWriter options to SGMaterialAnimation 
It needs to grab the path list from options in order to support the texture
change animation.
 2007-12-23 23:33:04 +00:00
timoore 4efa087cd1 Don't modify OSG Registry with file path 
To set a path when loading model files, use an osg ReaderWriter::Options object.

Put locks in ModelRegistry::readNode and ModelRegistry::readImage to avoid
conflicts when files are loaded from both the pager and the main thread.
 2007-12-04 22:38:40 +00:00
timoore 34704a17f2 Avoid copying drawables and dirtying display lists. 
For the alpha-test animation, use an OVERRIDE attribute on the state
set of the top level node instead of copying drawables and state sets
throughout the model.

As a temporary hack in the blend animation, don't use display lists in
the cloned drawables.

These changes are aimed at cutting down the number of display lists
that the pager needs to compile.
 2007-11-29 23:56:31 +00:00
timoore cafcecf03d StateSet optimizations 
Use only one shared StateSet to control GL_NORMALIZE. This removes
thousands of state sets from the scene graph.

Fix a typo that was causing two copies of groundLights0 to be added to
each tile.
 2007-11-18 23:31:03 +00:00
mfranz 8d3bf19422 sooner than planned: fix "scale" animation offsets (1 -> 0) 2007-06-17 21:01:40 +00:00
frohlich 487701a143 Modified Files: 
simgear/scene/model/Makefile.am
	simgear/scene/model/animation.cxx
	simgear/scene/model/animation.hxx
Added Files:
	simgear/scene/model/SGRotateTransform.cxx
	simgear/scene/model/SGRotateTransform.hxx
	simgear/scene/model/SGScaleTransform.cxx
	simgear/scene/model/SGScaleTransform.hxx
	simgear/scene/model/SGTranslateTransform.cxx
	simgear/scene/model/SGTranslateTransform.hxx:
	Factor out some useful classes.
 2007-05-28 07:13:07 +00:00
andy 6c5d35d6ce "bias" argument to texture animations by Ron Jensen 2007-02-07 19:21:24 +00:00
frohlich 1bb6c03bd0 Modified Files: 
simgear/scene/util/SGNodeMasks.hxx
	simgear/scene/model/animation.cxx:
	More finegrained cull masks
 2007-02-02 07:00:54 +00:00
fredb d534cf6f02 Better fix for the constant scale factor problem 2007-01-21 11:15:36 +00:00
fredb dd4326f7c4 Support constant scaling factor 2007-01-21 10:33:34 +00:00
frohlich 63730a6e2c Modified Files: 
animation.cxx: Add a visible configuration option to the pick
	animation.
 2007-01-15 19:01:20 +00:00