FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,962 Commits 1 Branch 121 Tags
b159a72ce97db3c1903dd346307eecd5f18e5ffe
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Moore feab25d0be Merge branch 'releases/2.2.0' into next 2011-02-17 11:40:47 +01:00
Tim Moore 956b4406d0 fix SGPagedLOD change for 2.8.3 
One more try...
 2011-02-17 11:39:52 +01:00
Tim Moore 3a0fbae4d9 Merge branch 'releases/2.2.0' into next 2011-02-16 16:54:35 +01:00
Tim Moore f106dc2a29 don't assume that OSG 2.8.3 has PagedLOD options 
I was confused by my git svn import of the OSG tree.
 2011-02-16 16:47:33 +01:00
Tim Moore 252a539e69 Merge branch 'releases/2.2.0' into next 
Conflicts:
	simgear/scene/model/SGPagedLOD.cxx
 2011-02-15 12:52:03 +01:00
Tim Moore df6badfdd5 accomodate changes to osgDB::DatabasePager interface 
The change was introduced in OSG SVN revision 12080. Note: that
revision has a bug that causes fgfs to crash. The bug is fixed in
revision 12170.
 2011-02-15 12:41:23 +01:00
Tim Moore 73c0ce628b Merge remote branch 'gitorious/next' into next 2010-12-29 18:12:56 +01:00
Tim Moore dc68397e48 cmake improvements for shared library build 2010-12-29 18:12:44 +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 33e1a9457a set data variance to DYNAMIC for animated effect attributes 2010-12-26 18:34:00 +01:00
Tim Moore ce67657e0a eliminate property node path cache 
The property path cache was making very little difference in practice
and made the eventual goal of having the property tree be thread safe
for readers more difficult to attain.
 2010-11-17 11:25:07 +01:00
Tim Moore 580a1b7fc2 Add ConditionNode files to VC90 project 2010-11-04 15:04:03 +01:00
Tim Moore 3372f9fc0d add SGMath.hxx header file to ConditionNode.cxx 
Apparently necessary for MSVC 2008.
 2010-11-04 11:04:13 +01:00
Tim Moore bfe953c18d replace glu functions with equivalents from OSG 2010-10-08 23:44:38 +02:00
Tim Moore b5f3978b8a Thorsten Renk's fix for tile manager problems 
Locking tiles in cache keeps tiles from mysteriously disappearing.
 2010-10-02 23:05:52 +02:00
Tim Moore fe7c6554f7 support for integer uniforms 
Also, share common Uniform objects
 2010-08-13 12:54:02 +02:00
Tim Moore 19bb7f5a83 force static models to have effects too 2010-08-13 12:54:02 +02:00
Tim Moore de35658096 Merge remote branch 'gitorious/next' into next 2010-06-17 23:46:52 +02:00
Tim Moore 034f5db3bd use an additional shader program map keyed using the resolved shader filenames 2010-06-17 23:45:27 +02:00
Tim Moore 0d419aba8a Add bool and int uniform types for shaders, and vertex-program-two-sided 
vertex-program-two-sided is an extra parameter written by the code
that creates effects from state sets generated by the ac3d loader. The
objective of this work is to support a workaround for broken
gl_FrontFacing on some Macintosh machines.
 2010-06-15 19:05:18 +02:00
Tim Moore 2cc2a857a2 Merge branch 'jmt/ref_ptr-conv' 2010-05-06 10:43:53 +02:00
Tim Moore 7dfb463ba9 Merge branch 'ehofman/framebuffer' 2010-05-06 10:43:45 +02:00
Tim Moore da07871bc6 Merge branch 'mathias/intersect' 2010-05-06 10:43:27 +02:00
Tim Moore 530d2309e7 Merge branch 'ehofman/sound' 2010-05-06 10:43:12 +02:00
Tim Moore 7e7a5d38f8 Merge branch 'fredb/msvc-cleanup' 2010-05-06 10:42:59 +02:00
Tim Moore ecf949dee0 Merge branch 'ehofman/model' 2010-05-06 10:42:44 +02:00
Tim Moore 9b0ba10b0b Merge branch 'jmt/ref_ptr-conv' into next 2010-05-05 10:42:41 +02:00
Tim Moore 536ebf604f Merge branch 'ehofman/framebuffer' into next 2010-05-05 10:39:32 +02:00
Tim Moore 0b05f67114 Merge branch 'master' into next 2010-05-05 10:38:26 +02:00
Tim Moore 0ede690580 Merge branch 'maint' 2010-05-05 10:38:18 +02:00
Tim Moore 1cda1fc201 Merge branch 'mathias/intersect' into next 2010-05-05 09:43:40 +02:00
Tim Moore 13ecbb8bce Merge branch 'master' into next 2010-05-05 09:40:31 +02:00
Tim Moore 3346bfc9a8 Merge branch 'maint' 2010-05-05 09:40:23 +02:00
Tim Moore 4fffcf9975 Merge branch 'ehofman/sound' into next 2010-05-05 09:05:35 +02:00
Tim Moore 050c1560e8 Merge branch 'fredb/msvc-cleanup' into next 2010-05-05 09:03:20 +02:00
Tim Moore df0a60caae Merge branch 'ehofman/model' into next 2010-05-05 08:44:32 +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 573c4268b6 Merge branch 'fredb/effect-stuff' into next 2010-04-12 07:25:24 +02:00
Tim Moore e0d02be0f5 Merge branch 'zan/cubemap' into next 2010-04-03 22:49:07 +02:00
Tim Moore 461e6d1b5b Zan's cubemap patch 2010-04-03 22:48:58 +02:00
Tim Moore d767e6d7eb Merge branch 'fredb/geom-shader' into next 2010-03-30 12:07:50 +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 4c2dd553f2 Merge branch 'ehofman/particles' into next 2010-03-27 13:39:55 +01:00
Tim Moore 2fb985afa4 Merge branch 'ehofman/dlerror' into next 2010-03-27 13:39:48 +01:00
Tim Moore 284a9e0612 Merge branch 'ehofman/sound' into next 2010-03-16 17:15:34 +01:00
Tim Moore 60349a8690 Merge branch 'ehofman/propfix' into next 2010-03-16 17:15:29 +01:00
Tim Moore 7b1d1fd288 Merge branch 'timoore/clipgroup' into next 2010-03-16 15:44:56 +01: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 0ad66f4bc4 Merge branch 'zan/generate' into next 2010-03-16 14:27:56 +01:00
Tim Moore 7fe40bce86 Merge branch 'jmt/magvar' into next 2010-03-16 14:22:53 +01:00
Tim Moore 2e93b06ac0 Merge branch 'fred/precip' into next 2010-03-16 14:21:57 +01:00
Tim Moore 262383395d Merge branch 'timoore/aptsign' into next 2010-03-12 14:32:11 +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 fabcb021cb Merge branch 'timoore/effects-anim-rebase' into next 2010-03-11 08:46:22 +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 1f37095087 Merge branch 'timoore/effects-anim-rebase' into next 2010-03-09 11:03:25 +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 b6d8e1f842 Merge branch 'zan/cloudsort' into next 2010-03-03 23:12:49 +01:00
Tim Moore a050654b4c Merge branch 'jmt/waypt' into next 2010-02-22 09:42:36 +01:00
Tim Moore c57c3cd1d3 Merge branch 'curt/makefile' 2010-02-17 18:01:29 +01:00
Tim Moore 3ec5e85485 Merge branch 'curt/makefile' into next 2010-02-17 07:20:38 +01:00
Tim Moore dcc9f33357 Merge branch 'ehofman/sound' into next 2010-02-17 07:19:20 +01:00
Tim Moore dc2b87dce1 Merge branch 'ehofman/config' into next 2010-02-17 07:18:30 +01:00
Tim Moore 333d381f41 Merge branch 'ehofman/config' into next 2010-02-14 19:42:59 +01:00
Tim Moore 116a6c1b2e Merge branch 'zan/stencil' into next 2010-02-10 15:48:23 +01:00
Tim Moore c4506b8e6c Merge branch 'ehofman/config' into next 2010-02-10 14:56:36 +01:00
Tim Moore d3f575547c Merge branch 'durk/deadfiles' into next-new 2010-02-06 23:15:09 +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