James Turner
139217dc79
Configure.as updates for ALUT changes, make --with-alut-framework= work.
2010-05-06 10:27:38 +01:00
Tim Moore
9b0ba10b0b
Merge branch 'jmt/ref_ptr-conv' into next
2010-05-05 10:42:41 +02:00
jmt
9f9c4cf32c
Compile even if OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION is not set.
2010-05-05 10:42:29 +02:00
Tim Moore
536ebf604f
Merge branch 'ehofman/framebuffer' into next
2010-05-05 10:39:32 +02:00
ehofman
03a616b737
Add support for EXT_framebuffer_object for Atlas
2010-05-05 10:39:18 +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
frohlich
d81545a871
Add -ldl for newer ld defaults from fedora 13
...
Modified Files:
simgear/screen/Makefile.am
2010-05-05 10:38:09 +02:00
Tim Moore
1cda1fc201
Merge branch 'mathias/intersect' into next
2010-05-05 09:43:40 +02:00
frohlich
490dad7838
Provide a more exact sphere/box test.
...
Modified Files:
simgear/math/SGIntersect.hxx simgear/math/SGBox.hxx
2010-05-05 09:43:32 +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
frohlich
c5de65f115
Make the bounding volume debug visitor compile again.
...
Modified Files:
simgear/scene/bvh/BVHDebugCollectVisitor.hxx
2010-05-05 09:40:06 +02:00
Tim Moore
4fffcf9975
Merge branch 'ehofman/sound' into next
2010-05-05 09:05:35 +02:00
jmt
8962d9b293
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!
2010-05-05 09:05:23 +02:00
Tim Moore
050c1560e8
Merge branch 'fredb/msvc-cleanup' into next
2010-05-05 09:03:20 +02:00
fredb
68b3041f50
Remove obsolete file
2010-05-05 09:03:10 +02:00
fredb
1ddd153399
Cleanup MSVC projects
2010-05-05 09:02:58 +02:00
Tim Moore
df0a60caae
Merge branch 'ehofman/model' into next
2010-05-05 08:44:32 +02:00
fredb
675c86582d
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.
2010-05-05 08:44:18 +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
fredb
f19e83dcf1
Add a new node "float-property" to be used in float comparision in effect predicates
2010-04-12 07:25:13 +02:00
fredb
caabe8fc87
Add a "scale" parameter that combine xsize and ysize in a vec3 property. There is no vec2 property, so the third component is zero
2010-04-12 07:25:13 +02:00
fredb
7c4e5309fc
Declare some material parameters as implicit effect parameters
2010-04-12 07:25:13 +02:00
fredb
542124e90c
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>
2010-04-12 07:25:13 +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
fredb
bff1584012
Geometry shader support
2010-03-30 12:07:38 +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
ehofman
44c93d5074
Csaba Halasz: fix a compilation error for non-bsd systems that happen to return
...
const char* from dlerror().
2010-03-27 13:39:37 +01:00
ehofman
dcf07a46aa
Allow particles to be frozen on pause.
2010-03-27 13:38:59 +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
ehofman
64072be83c
iprovide a slightly more helpfull exception message
2010-03-16 17:15:12 +01:00
