]> git.mxchange.org Git - simgear.git/log
simgear.git
12 years agoHack to avoid redrawing the whole scene another time when only light volume are requested
Frederic Bouvier [Sat, 19 May 2012 17:39:38 +0000 (19:39 +0200)]
Hack to avoid redrawing the whole scene another time when only light volume are requested

12 years agoReaderWriterSPT: Cull out tiles that we look at from downside.
Mathias Froehlich [Sat, 19 May 2012 14:09:58 +0000 (16:09 +0200)]
ReaderWriterSPT: Cull out tiles that we look at from downside.

Add a cull callback that culls away complete tile areas that
we look at from the far away downside.

12 years agoAllow to change texture buffer name on the fly
Frederic Bouvier [Fri, 18 May 2012 10:27:08 +0000 (12:27 +0200)]
Allow to change texture buffer name on the fly

12 years ago#767 related: fix sound resource management
ThorstenB [Sat, 12 May 2012 21:35:10 +0000 (23:35 +0200)]
#767 related: fix sound resource management
Use _smgr->release_buffer instead of direct alDeleteBuffers.

12 years agoAllow to specify buffer name from parameters in effects
Frederic Bouvier [Wed, 9 May 2012 21:31:06 +0000 (23:31 +0200)]
Allow to specify buffer name from parameters in effects

12 years agoUse names to identify deferred buffers
Frederic Bouvier [Sun, 15 Apr 2012 12:51:20 +0000 (14:51 +0200)]
Use names to identify deferred buffers
Change effect syntax for buffers

12 years agoUpdated sign case UV calculation from Christian.
James Turner [Fri, 11 May 2012 09:00:35 +0000 (10:00 +0100)]
Updated sign case UV calculation from Christian.

12 years agobuild signs for an STG into single geometry.
James Turner [Tue, 8 May 2012 12:29:34 +0000 (13:29 +0100)]
build signs for an STG into single geometry.

12 years agoPhase 1 - single geometry per material
James Turner [Tue, 8 May 2012 08:47:42 +0000 (09:47 +0100)]
Phase 1 - single geometry per material

12 years agoUpdates to buildings and trees
Stuart Buchanan [Thu, 10 May 2012 22:03:38 +0000 (23:03 +0100)]
Updates to buildings and trees
1) Clean up after ourselves - remove memory leak
2) Face buildings the right way

12 years agoAdd support for double-sided taxiway signs and create 3D models for them
Christian Schmitt [Wed, 25 Apr 2012 15:36:11 +0000 (17:36 +0200)]
Add support for double-sided taxiway signs and create 3D models for them

12 years agoRemove unused SGMakeRunwaySign function.
Christian Schmitt [Thu, 3 May 2012 14:35:47 +0000 (16:35 +0200)]
Remove unused SGMakeRunwaySign function.

12 years agoRemove redundant inclusion of math/SGMath.hxx
Frederic Bouvier [Sat, 5 May 2012 09:19:20 +0000 (11:19 +0200)]
Remove redundant inclusion of math/SGMath.hxx

12 years agoFix C compiler warning.
ThorstenB [Sat, 5 May 2012 07:46:11 +0000 (09:46 +0200)]
Fix C compiler warning.
"no-overloaded-virtual" warnings are a CXX-compiler feature

12 years agoFix rpmlint/Linux packager complaints
ThorstenB [Fri, 4 May 2012 23:41:45 +0000 (01:41 +0200)]
Fix rpmlint/Linux packager complaints
about outdated/invalid FSF address in some license headers.

12 years agoFix rpmlint/Linux packager complaints
ThorstenB [Fri, 4 May 2012 22:30:16 +0000 (00:30 +0200)]
Fix rpmlint/Linux packager complaints
about outdated/invalid FSF address in some license headers.

12 years agoopenSUSE "more architectures" patch
ThorstenB [Fri, 4 May 2012 22:18:26 +0000 (00:18 +0200)]
openSUSE "more architectures" patch
(Alpha anyone? ;-) )

12 years agoMove vector property templates to separate header file.
ThorstenB [Fri, 4 May 2012 22:07:07 +0000 (00:07 +0200)]
Move vector property templates to separate header file.
Fixes the "weirdness" with MSVC complaining about incomplete class specs,
since forward declarations (SGMathFwd.hxx) are used in props.hxx only.
Only the few extended (vector) property templates require including the
full SGMath.hxx (with MSVC) - and these are used in few places.

12 years agoGanael Laplanche: fix include dependencies for FreeBSD support
ThorstenB [Fri, 4 May 2012 21:24:10 +0000 (23:24 +0200)]
Ganael Laplanche: fix include dependencies for FreeBSD support

12 years agoFix signed vs unsigned compiler warnings
ThorstenB [Fri, 4 May 2012 21:13:54 +0000 (23:13 +0200)]
Fix signed vs unsigned compiler warnings

12 years agoFixes to Random Buildings:
Stuart Buchanan [Fri, 4 May 2012 20:12:41 +0000 (21:12 +0100)]
Fixes to Random Buildings:
1) Correct texture mapping so textures aren't flipped!
2) Add constraints to medium buildings (not taller than they are wide)

12 years agoRevert "Temporary hack to make the new version of expat build under windows"
Frederic Bouvier [Fri, 4 May 2012 18:48:04 +0000 (20:48 +0200)]
Revert "Temporary hack to make the new version of expat build under windows"
A proper fix has been provided

This reverts commit 655971208fb491628e610788d1b4d1e581755573.

12 years agoChange how HAVE_EXPAT_CONFIG_H is defined, to hopefully fix MSVC properly.
James Turner [Fri, 4 May 2012 09:10:46 +0000 (10:10 +0100)]
Change how HAVE_EXPAT_CONFIG_H is defined, to hopefully fix MSVC properly.

12 years agoTemporary hack to make the new version of expat build under windows
Frederic Bouvier [Fri, 4 May 2012 07:09:11 +0000 (09:09 +0200)]
Temporary hack to make the new version of expat build under windows

12 years agoMissed files from previous commit, needed for Windows.
James Turner [Thu, 3 May 2012 17:55:13 +0000 (18:55 +0100)]
Missed files from previous commit, needed for Windows.

12 years agoUpdate to latest expat for improved BOM / encoding handling.
James Turner [Thu, 3 May 2012 16:29:16 +0000 (17:29 +0100)]
Update to latest expat for improved BOM / encoding handling.

(Related to http://code.google.com/p/flightgear-bugs/issues/detail?id=635)

12 years agoEmissive lighting for random buildings. Requires up to date fgdata.
Stuart Buchanan [Tue, 1 May 2012 21:35:42 +0000 (22:35 +0100)]
Emissive lighting for random buildings.  Requires up to date fgdata.

12 years agoAllow "texture-path" XML entries to be present but empty.
ThorstenB [Mon, 30 Apr 2012 16:29:44 +0000 (18:29 +0200)]
Allow "texture-path" XML entries to be present but empty.
This had worked with previous FG versions and is used by many models -
so it shouldn't be treated as an error now.

12 years agoUse observer_ptr to cache light effects
Frederic Bouvier [Sun, 29 Apr 2012 11:25:15 +0000 (13:25 +0200)]
Use observer_ptr to cache light effects

12 years agoNasal is C code, not C++
Frederic Bouvier [Sat, 28 Apr 2012 22:17:38 +0000 (00:17 +0200)]
Nasal is C code, not C++

12 years agoUse Effects system for random buildings.
Stuart Buchanan [Sat, 28 Apr 2012 22:11:52 +0000 (23:11 +0100)]
Use Effects system for random buildings.

12 years agoStrange, somehow missed this file in last commit.
James Turner [Sat, 28 Apr 2012 22:08:05 +0000 (23:08 +0100)]
Strange, somehow missed this file in last commit.

12 years agoNasal Ghosts can optionally specify member get/set functions.
James Turner [Sat, 28 Apr 2012 21:25:57 +0000 (22:25 +0100)]
Nasal Ghosts can optionally specify member get/set functions.

12 years agoReduce the number of Drawables generated by the random buildings by reducing the...
Stuart Buchanan [Sat, 28 Apr 2012 19:02:42 +0000 (20:02 +0100)]
Reduce the number of Drawables generated by the random buildings by reducing the number of levels of the quad tree, and reducing the number of different
fade-out distances generated.

12 years agoChange random object placement to a grid-like scheme to reduce building overlap.
Stuart Buchanan [Sat, 28 Apr 2012 18:58:09 +0000 (19:58 +0100)]
Change random object placement to a grid-like scheme to reduce building overlap.

12 years agoImplement blinking hold-short line lights
Christian Schmitt [Fri, 30 Mar 2012 17:17:59 +0000 (19:17 +0200)]
Implement blinking hold-short line lights
This is supported by the apt.dat 850 format and latest TG

12 years agoConvert random buildings to avoid use of BIND_PER_PRIMITVE.
James Turner [Wed, 25 Apr 2012 23:18:47 +0000 (00:18 +0100)]
Convert random buildings to avoid use of BIND_PER_PRIMITVE.
(which pushes me to a slow OSG path)

12 years ago#717: Disabling advanced weather crashes the sim
ThorstenB [Wed, 25 Apr 2012 19:08:37 +0000 (21:08 +0200)]
#717: Disabling advanced weather crashes the sim
Protect from a NULL-pointer segfault in SGCloudField::removeCloudFromTree
when disabling advanced weather (may just fix a symptom).

12 years agoNo round function for MSVC (forgot the template argument)
Frederic Bouvier [Wed, 25 Apr 2012 06:59:04 +0000 (08:59 +0200)]
No round function for MSVC (forgot the template argument)

12 years agoNo round function for MSVC
Frederic Bouvier [Wed, 25 Apr 2012 06:54:57 +0000 (08:54 +0200)]
No round function for MSVC

12 years agoRandom buildings - initial commit.
Stuart Buchanan [Tue, 24 Apr 2012 21:00:35 +0000 (22:00 +0100)]
Random buildings - initial commit.

12 years agoFix latent bug in Nasal hash cget / cset functions, where the embedded string length
James Turner [Mon, 23 Apr 2012 21:29:54 +0000 (22:29 +0100)]
Fix latent bug in Nasal hash cget / cset functions, where the embedded string length
was set to an incorrect marker value.

12 years agoRevert "Add virtual destructor to SGReferenced."
ThorstenB [Mon, 23 Apr 2012 17:41:09 +0000 (19:41 +0200)]
Revert "Add virtual destructor to SGReferenced."
As suggested by Mathias, will use different solution.
This reverts commit 4abcf3215f6322c467718c69d0968e123231f9fa.

12 years agoMerge commit 'refs/merge-requests/22' of git://gitorious.org/fg/simgear into merge...
James Turner [Sun, 22 Apr 2012 19:21:45 +0000 (20:21 +0100)]
Merge commit 'refs/merge-requests/22' of git://gitorious.org/fg/simgear into merge-requests/22

12 years agoAdd virtual destructor to SGReferenced.
ThorstenB [Sat, 21 Apr 2012 18:50:07 +0000 (20:50 +0200)]
Add virtual destructor to SGReferenced.

12 years agoRevert "Remove ambient component of additional lights" because this was Yet Another...
Frederic Bouvier [Wed, 18 Apr 2012 17:56:31 +0000 (19:56 +0200)]
Revert "Remove ambient component of additional lights" because this was Yet Another Bad Idea
Ambient light is attenuated so it is possible to achieve smooth edges with it

This reverts commit fe8ba57c9412c18681429c4cea6f37a6ef5ec14d.

12 years agoRemove ambient component of additional lights
Frederic Bouvier [Mon, 16 Apr 2012 06:25:59 +0000 (08:25 +0200)]
Remove ambient component of additional lights
It creates artifacts at edges of light volumes and should come from the main light source (sun and moon) anyway

12 years agolight animation: avoid that similar effects are merged
Frederic Bouvier [Sat, 14 Apr 2012 21:16:23 +0000 (23:16 +0200)]
light animation: avoid that similar effects are merged

12 years agoEnsure uniform are there before trying to use them
Frederic Bouvier [Sat, 14 Apr 2012 16:00:42 +0000 (18:00 +0200)]
Ensure uniform are there before trying to use them

12 years agoAdd a <dim-factor> parameter in the light animation
Frederic Bouvier [Sat, 14 Apr 2012 07:57:20 +0000 (09:57 +0200)]
Add a <dim-factor> parameter in the light animation
<dim-factor> contains a <property> element, and optionally <factor>,
<offset>, <expression>, <interpolation>, <min> and <max>

12 years agoError messages when installing property aliases fails.
ThorstenB [Thu, 5 Apr 2012 18:03:07 +0000 (20:03 +0200)]
Error messages when installing property aliases fails.

12 years agoperformance monitor: start measurement interval with a fresh timestamp.
ThorstenB [Thu, 5 Apr 2012 17:30:00 +0000 (19:30 +0200)]
performance monitor: start measurement interval with a fresh timestamp.

12 years agoSet the filename as the OSG object name on shaders - should have done this years...
James Turner [Wed, 4 Apr 2012 15:44:23 +0000 (16:44 +0100)]
Set the filename as the OSG object name on shaders - should have done this years ago :)

12 years agoRevert "Disable LOD when rendering to the shadow map."
Frederic Bouvier [Mon, 2 Apr 2012 17:50:50 +0000 (19:50 +0200)]
Revert "Disable LOD when rendering to the shadow map."

This reverts commit b95fb48a162fcdea8ec1384c265dc799001c8bac.

12 years agoperformance monitor improvement
ThorstenB [Mon, 2 Apr 2012 18:26:17 +0000 (20:26 +0200)]
performance monitor improvement
Record cumulative time consumed (all time) and current total time (current
measurement only) for subsystems.

12 years agoUse observer_ptr::lock for thread-safe pointer retrieval.
ThorstenB [Mon, 2 Apr 2012 18:09:02 +0000 (20:09 +0200)]
Use observer_ptr::lock for thread-safe pointer retrieval.
Also revert to using ref_ptr for the top-level EffectMap, since it holds
elements no one else references (and don't affect memory much).

12 years agoDisable LOD when rendering to the shadow map.
Frederic Bouvier [Sun, 1 Apr 2012 21:06:32 +0000 (23:06 +0200)]
Disable LOD when rendering to the shadow map.
Produce few NaNs at start

12 years agoFix typo in SGGeodesy.
Mathias Froehlich [Sun, 1 Apr 2012 15:50:49 +0000 (17:50 +0200)]
Fix typo in SGGeodesy.

Pointed out by Carl Godkin.
Thanks!

12 years agoShadow map now available in effects
Frederic Bouvier [Sat, 31 Mar 2012 20:40:39 +0000 (22:40 +0200)]
Shadow map now available in effects

12 years agoRemove dead code.
ThorstenB [Wed, 28 Mar 2012 20:55:40 +0000 (22:55 +0200)]
Remove dead code.

12 years agoAdd file name to error message.
ThorstenB [Wed, 28 Mar 2012 20:54:27 +0000 (22:54 +0200)]
Add file name to error message.

12 years agoFix growing memory consumption issues
ThorstenB [Wed, 28 Mar 2012 20:53:30 +0000 (22:53 +0200)]
Fix growing memory consumption issues
References in simgear's cache maps prevented effects, textures, clouds,
trees and lights from being unloaded at run-time (ref-counter could never
reach 0). Changed cache maps to use OSG 'observer' pointers instead, so
reference counters aren't influenced, though cache maps still hold an
(observing) pointer. Also take care when finding a cache entry with empty
content (i.e. texture was unloaded).

12 years agoscenery: Remove redundant setting the property root.
Mathias Froehlich [Wed, 28 Mar 2012 05:47:31 +0000 (07:47 +0200)]
scenery: Remove redundant setting the property root.

The same value was extracted out of the same options value
in the code above. So, skip resetting to the same value.

12 years agoscenery: Only run SGModelData in the topmost model.
Mathias Froehlich [Wed, 28 Mar 2012 05:44:41 +0000 (07:44 +0200)]
scenery: Only run SGModelData in the topmost model.

It looks like that we loose the nasal script stored
in the property tree when this callback is issued
multiple times.

This should fix
 http://code.google.com/p/flightgear-bugs/issues/detail?id=714

12 years agoRevert "scenery: Use correct property root in xml loading."
Mathias Froehlich [Wed, 28 Mar 2012 05:34:36 +0000 (07:34 +0200)]
Revert "scenery: Use correct property root in xml loading."

This helps for one symptom but it does not fix the
underlying problem. So ...

This reverts commit 986d2cc42a94d558687be7c52027a9123551b676.

12 years agoosg::Uniform::get does not return a value on error.
ThorstenB [Sun, 25 Mar 2012 13:11:50 +0000 (15:11 +0200)]
osg::Uniform::get does not return a value on error.
Fixes "usage of uninitialized data" errors reported by valgrind.

12 years agoMerge Specular and Emission buffers
Frederic Bouvier [Sun, 25 Mar 2012 12:12:46 +0000 (14:12 +0200)]
Merge Specular and Emission buffers

12 years agoCompile under MSVC 9
Frederic Bouvier [Sun, 25 Mar 2012 12:12:04 +0000 (14:12 +0200)]
Compile under MSVC 9

12 years agoDon't crash when "avionics == NULL".
ThorstenB [Thu, 22 Mar 2012 22:54:01 +0000 (23:54 +0100)]
Don't crash when "avionics == NULL".

12 years agoscenery: Use correct property root in xml loading.
Mathias Froehlich [Thu, 22 Mar 2012 07:38:16 +0000 (08:38 +0100)]
scenery: Use correct property root in xml loading.

Really query for the root node when loading xml files.
This should fix
 http://code.google.com/p/flightgear-bugs/issues/detail?id=714

12 years agoMore checks/error messages for missing files,
ThorstenB [Sat, 17 Mar 2012 09:15:31 +0000 (10:15 +0100)]
More checks/error messages for missing files,
checking return value of findDataFile.

12 years agoMore consistent indentation.
ThorstenB [Sat, 17 Mar 2012 09:02:43 +0000 (10:02 +0100)]
More consistent indentation.

12 years agoAvoid segfault when a texture file is missing.
ThorstenB [Sat, 17 Mar 2012 09:02:13 +0000 (10:02 +0100)]
Avoid segfault when a texture file is missing.
Always check the return value of "findDataFile". If it's empty, always
provide the _original_ path being searched in an error message. Otherwise
we eventually just get useless 'Can't find file "".' error messages
(and also a segfault here, since osgDB::readImageFile("") returns NULL).

12 years agoRemoved include breaking headless build.
James Goppert [Fri, 16 Mar 2012 00:27:29 +0000 (20:27 -0400)]
Removed include breaking headless build.

12 years agoFixed mingw build.
James Goppert [Thu, 15 Mar 2012 22:29:06 +0000 (18:29 -0400)]
Fixed mingw build.

12 years agoscenery: Really, most people don't care for the noise.
Mathias Froehlich [Fri, 16 Mar 2012 06:27:44 +0000 (07:27 +0100)]
scenery: Really, most people don't care for the noise.

12 years agoscenery: Make stg loader files members of the loader.
Mathias Froehlich [Fri, 16 Mar 2012 06:22:16 +0000 (07:22 +0100)]
scenery: Make stg loader files members of the loader.

12 years agoscenery: TileEntry and TileCache have moved back to flightgear.
Mathias Froehlich [Thu, 15 Mar 2012 19:43:31 +0000 (20:43 +0100)]
scenery: TileEntry and TileCache have moved back to flightgear.

12 years agoscenery: Move the stg read code.
Mathias Froehlich [Thu, 15 Mar 2012 19:28:48 +0000 (20:28 +0100)]
scenery: Move the stg read code.

Move the code reading the stg files
into ReaderWriterSTG.cxx.

12 years agoscenery: ModelLoadHelper is no longer needed.
Mathias Froehlich [Thu, 15 Mar 2012 19:08:38 +0000 (20:08 +0100)]
scenery: ModelLoadHelper is no longer needed.

12 years agoscenery: move static ReaderWriter proxies around.
Mathias Froehlich [Thu, 15 Mar 2012 18:44:36 +0000 (19:44 +0100)]
scenery: move static ReaderWriter proxies around.

Not yet sure where they end, but make sure they are currently pulled.
... now watching jenkins.

12 years agoscenery: Accumulate stg files until we find an OBJECT_BASE.
Mathias Froehlich [Sun, 11 Mar 2012 20:32:35 +0000 (21:32 +0100)]
scenery: Accumulate stg files until we find an OBJECT_BASE.

This should recover most of the old scenery loading behavior
before the last change. The z-fighting due to model duplication
does not happen over solid ground. Sea tiles are still broken.

12 years agoscenery: Allow switching off particle systems on scenery load.
Mathias Froehlich [Sun, 11 Mar 2012 13:20:33 +0000 (14:20 +0100)]
scenery: Allow switching off particle systems on scenery load.

12 years agoscenery: Allow switching off bvh generation.
Mathias Froehlich [Sun, 11 Mar 2012 13:20:07 +0000 (14:20 +0100)]
scenery: Allow switching off bvh generation.

12 years agohla: Add convenience function to set version by string.
Mathias Froehlich [Sun, 11 Mar 2012 08:21:47 +0000 (09:21 +0100)]
hla: Add convenience function to set version by string.

12 years agohla: Enalble creating object instances without object class.
Mathias Froehlich [Sat, 10 Mar 2012 07:30:10 +0000 (08:30 +0100)]
hla: Enalble creating object instances without object class.

This enables creating HLAObjectInstance instances without
valid initial object class pointer. This is useful for local
implemented object instances.

12 years agohla: Remove old comment.
Mathias Froehlich [Sat, 10 Mar 2012 07:28:30 +0000 (08:28 +0100)]
hla: Remove old comment.

12 years agoMake the sky disable cutoff distance configurable
Torsten Dreyer [Fri, 9 Mar 2012 19:58:24 +0000 (20:58 +0100)]
Make the sky disable cutoff distance configurable

12 years agoscenery: rework stg loading code.
Mathias Froehlich [Tue, 6 Mar 2012 22:06:15 +0000 (23:06 +0100)]
scenery: rework stg loading code.

This change reworks the code block loading the stg files.
It fixes a long standing problem where we end up loading
similar models from different entries of the scenery
path at the same geographic location. This usually results
in models that appear to have z figting, even if the isolated
model does not show z fighting at all.
As a result the lookup sequence for models and scenery has
changed a bit. This should be closer to what it supposed to
be and did not show any problems on the areas and sceneries
I tested.

12 years agoRevert "Put airport lights in RenderBin to enable glow"
Frederic Bouvier [Wed, 7 Mar 2012 19:48:53 +0000 (20:48 +0100)]
Revert "Put airport lights in RenderBin to enable glow"

This reverts commit 1fa27f2d19cfbd3663d8e7f537b159a9643e1c34.

12 years agoRevert commit 7864516... Increase point sprite size for runway lights
Frederic Bouvier [Wed, 7 Mar 2012 19:16:14 +0000 (20:16 +0100)]
Revert commit 7864516... Increase point sprite size for runway lights

12 years agoscenery: Remove unused argument from runway signs.
Mathias Froehlich [Tue, 6 Mar 2012 20:14:24 +0000 (21:14 +0100)]
scenery: Remove unused argument from runway signs.

12 years agoRevert "Allow the not operator in expressions" - this is not required for
Frederic Bouvier [Tue, 6 Mar 2012 22:15:18 +0000 (23:15 +0100)]
Revert "Allow the not operator in expressions" - this is not required for
effects

This reverts commit 92074f0d3c29ed5d064db0c943cf88760c930e23.

12 years agohla: include config.h and compiler.h in implementation files.
Mathias Froehlich [Mon, 5 Mar 2012 05:59:37 +0000 (06:59 +0100)]
hla: include config.h and compiler.h in implementation files.

12 years agohla: Provide access to the parent federate.
Mathias Froehlich [Sun, 4 Mar 2012 20:34:09 +0000 (21:34 +0100)]
hla: Provide access to the parent federate.

12 years agoAllow the not operator in expressions
Frederic Bouvier [Sun, 4 Mar 2012 20:24:54 +0000 (21:24 +0100)]
Allow the not operator in expressions

12 years agoImplement point light
Frederic Bouvier [Wed, 8 Feb 2012 23:04:02 +0000 (00:04 +0100)]
Implement point light

12 years agoFix path in include directive
Frederic Bouvier [Sun, 5 Feb 2012 22:55:38 +0000 (23:55 +0100)]
Fix path in include directive

12 years agoSave work on shadows
Frederic Bouvier [Sun, 5 Feb 2012 22:35:39 +0000 (23:35 +0100)]
Save work on shadows

12 years agoMove noise functions from scene/material to scene/util
Frederic Bouvier [Sat, 3 Mar 2012 18:19:38 +0000 (19:19 +0100)]
Move noise functions from scene/material to scene/util