]> git.mxchange.org Git - simgear.git/log
simgear.git
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

12 years agoMove Noise from scene/material to scene/util
Frederic Bouvier [Sun, 5 Feb 2012 22:25:02 +0000 (23:25 +0100)]
Move Noise from scene/material to scene/util

12 years agoSmaller point light for vasi
Frederic Bouvier [Sat, 4 Feb 2012 20:21:50 +0000 (21:21 +0100)]
Smaller point light for vasi

12 years agoIncrease point sprite size for runway lights
Frederic Bouvier [Tue, 31 Jan 2012 22:40:19 +0000 (23:40 +0100)]
Increase point sprite size for runway lights

12 years agoRemove now useless StateAttributeFactory::getNoiseNormalMap()
Frederic Bouvier [Sun, 29 Jan 2012 22:24:36 +0000 (23:24 +0100)]
Remove now useless StateAttributeFactory::getNoiseNormalMap()

12 years agoUse bigger point sprites for airport lighting
Frederic Bouvier [Wed, 25 Jan 2012 22:42:10 +0000 (23:42 +0100)]
Use bigger point sprites for airport lighting

12 years agoPut airport lights in RenderBin to enable glow
Frederic Bouvier [Tue, 24 Jan 2012 22:13:15 +0000 (23:13 +0100)]
Put airport lights in RenderBin to enable glow

12 years agoNew buffer types for effects
Frederic Bouvier [Sat, 3 Mar 2012 18:04:05 +0000 (19:04 +0100)]
New buffer types for effects

12 years agoAdd noise texture and noise normal map to StateAttributeFactory
Frederic Bouvier [Mon, 23 Jan 2012 20:22:44 +0000 (21:22 +0100)]
Add noise texture and noise normal map to StateAttributeFactory

12 years agoBoolean uniforms are now updatable by properties
Frederic Bouvier [Sun, 15 Jan 2012 14:58:37 +0000 (15:58 +0100)]
Boolean uniforms are now updatable by properties

12 years agoAdd bloom buffer to effects
Frederic Bouvier [Sun, 15 Jan 2012 11:15:06 +0000 (12:15 +0100)]
Add bloom buffer to effects

12 years agoCreate new buffer type : emission
Frederic Bouvier [Sat, 14 Jan 2012 12:35:33 +0000 (13:35 +0100)]
Create new buffer type : emission

12 years agoAdd new texture type in effects : lighting-buffer
Frederic Bouvier [Mon, 9 Jan 2012 20:47:21 +0000 (21:47 +0100)]
Add new texture type in effects : lighting-buffer

12 years agoInclude the light volume in the model
Frederic Bouvier [Sun, 8 Jan 2012 18:04:56 +0000 (19:04 +0100)]
Include the light volume in the model

12 years agoImplement a cache of light effects
Frederic Bouvier [Wed, 4 Jan 2012 18:42:46 +0000 (19:42 +0100)]
Implement a cache of light effects

12 years agoAdd the light animation to the cmake system
Frederic Bouvier [Wed, 4 Jan 2012 16:20:22 +0000 (17:20 +0100)]
Add the light animation to the cmake system

12 years agoFull implementation of the spotlight by Effects
Frederic Bouvier [Mon, 2 Jan 2012 23:32:00 +0000 (00:32 +0100)]
Full implementation of the spotlight by Effects

12 years agoAdd light animation to msvc9 project
Frederic Bouvier [Sat, 3 Mar 2012 17:31:20 +0000 (18:31 +0100)]
Add light animation to msvc9 project

12 years agoAdd preliminary spot light animation
Frederic Bouvier [Mon, 2 Jan 2012 10:35:11 +0000 (11:35 +0100)]
Add preliminary spot light animation

12 years agoAdd positioned uniforms and G-buffer textures to Effects
Frederic Bouvier [Mon, 2 Jan 2012 10:34:11 +0000 (11:34 +0100)]
Add positioned uniforms and G-buffer textures to Effects

12 years agospt: Make use of newly provided earth texture.
Mathias Froehlich [Sun, 4 Mar 2012 19:10:22 +0000 (20:10 +0100)]
spt: Make use of newly provided earth texture.

12 years agohla: Fix the way derived classes accumulate attributes.
Mathias Froehlich [Sun, 4 Mar 2012 18:56:43 +0000 (19:56 +0100)]
hla: Fix the way derived classes accumulate attributes.

12 years agoscenery: Do not use a seperate set of options for loading the model.
Mathias Froehlich [Sun, 4 Mar 2012 16:09:24 +0000 (17:09 +0100)]
scenery: Do not use a seperate set of options for loading the model.

This fixes a problem introduced in commit
4e24095d8be43a8f6a2e060dfea4e7a4aec44ea5.
Also this should fix Bug #698.

12 years agoscenery: Only add trasnform matrices on successful loaded models.
Mathias Froehlich [Sun, 4 Mar 2012 12:07:41 +0000 (13:07 +0100)]
scenery: Only add trasnform matrices on successful loaded models.

12 years agoCompile SGReaderWriterOptions.cxx under Windows
Frederic Bouvier [Sun, 4 Mar 2012 09:36:31 +0000 (10:36 +0100)]
Compile SGReaderWriterOptions.cxx under Windows

12 years agoUse an implementation file for SGReaderWriterOptions.
Mathias Froehlich [Sun, 4 Mar 2012 07:40:56 +0000 (08:40 +0100)]
Use an implementation file for SGReaderWriterOptions.

12 years agoCentralize osgDB::Option handling in SGReaderWriterOptions.
Mathias Froehlich [Sun, 4 Mar 2012 07:33:21 +0000 (08:33 +0100)]
Centralize osgDB::Option handling in SGReaderWriterOptions.

12 years agoMake use of SGReaderWriterOptions::copyOrCreate in SGModelLib
Mathias Froehlich [Sun, 4 Mar 2012 07:17:10 +0000 (08:17 +0100)]
Make use of SGReaderWriterOptions::copyOrCreate in SGModelLib

12 years agoMake use of SGReaderWriterOptions::copyOrCreate in SGMaterial.
Mathias Froehlich [Sun, 4 Mar 2012 07:15:00 +0000 (08:15 +0100)]
Make use of SGReaderWriterOptions::copyOrCreate in SGMaterial.

12 years agoMake use of SGReaderWriterOptions::copyOrCreate in ReaderWriterSTG.
Mathias Froehlich [Sun, 4 Mar 2012 06:50:05 +0000 (07:50 +0100)]
Make use of SGReaderWriterOptions::copyOrCreate in ReaderWriterSTG.

12 years agoMake use of SGReaderWriterOptions::copyOrCreate in SGReaderWriterXML.
Mathias Froehlich [Sun, 4 Mar 2012 06:41:56 +0000 (07:41 +0100)]
Make use of SGReaderWriterOptions::copyOrCreate in SGReaderWriterXML.

12 years agoProvide SGReaderWriterOptions::copyOrCreate(const osgDB::Options*).
Mathias Froehlich [Sun, 4 Mar 2012 06:16:59 +0000 (07:16 +0100)]
Provide SGReaderWriterOptions::copyOrCreate(const osgDB::Options*).

This functions tries to preserve the database options as much
as possible and guarantees to return a non zero options
pointer.

12 years agoReplace osgDB::ReaderWriter::Options to osgDB::Options.
Mathias Froehlich [Sun, 4 Mar 2012 06:07:42 +0000 (07:07 +0100)]
Replace osgDB::ReaderWriter::Options to osgDB::Options.

This has changed in osg, so reflect that here.

12 years agoUntangle osg singleton dependencies.
Mathias Froehlich [Sat, 3 Mar 2012 17:57:48 +0000 (18:57 +0100)]
Untangle osg singleton dependencies.

Take two. The ModelRegistry's are already derived from osg::Referenced.
So also introduce the osg dependent version in simgear/scene/util.

12 years agoRevert "Use simgear internal stuff for the singleton class."
Mathias Froehlich [Sat, 3 Mar 2012 17:21:49 +0000 (18:21 +0100)]
Revert "Use simgear internal stuff for the singleton class."

This reverts commit 80274596dfb0daf3564581e9e855f3debf483b12.

12 years agoDir::tempDir not working on some systems.
ThorstenB [Sat, 3 Mar 2012 16:06:51 +0000 (17:06 +0100)]
Dir::tempDir not working on some systems.
Only worked when TMPDIR environment variable had a trailing slash (i.e.
"/tmp/" worked, but not "/tmp").
(Problem shown by simgear's "test suite". It's good to have tests!)

12 years agoRemove left over from osg/core dependencies.
Mathias Froehlich [Sat, 3 Mar 2012 15:05:23 +0000 (16:05 +0100)]
Remove left over from osg/core dependencies.

This file should be obsolete doe to the latest changes.

12 years agoUse simgear internal stuff for the singleton class.
Mathias Froehlich [Sat, 3 Mar 2012 13:10:37 +0000 (14:10 +0100)]
Use simgear internal stuff for the singleton class.

This removes the other still present dependency on osg
in the future sgcore library.
It also remove the need for the NO_OPENSCENEGRAPH_INTERFACE
compile time definition.

12 years agomath: Remove SGMath osg dependency.
Mathias Froehlich [Sat, 3 Mar 2012 12:32:49 +0000 (13:32 +0100)]
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.

12 years agomath: Move lerp function into SGMisc.
Mathias Froehlich [Sat, 3 Mar 2012 10:56:40 +0000 (11:56 +0100)]
math: Move lerp function into SGMisc.

12 years agoscenery: inline SGGenTile into its single caller.
Mathias Froehlich [Sat, 3 Mar 2012 09:45:15 +0000 (10:45 +0100)]
scenery: inline SGGenTile into its single caller.

12 years agoscenery: Route loader options through the btg loader.
Mathias Froehlich [Sat, 3 Mar 2012 09:37:54 +0000 (10:37 +0100)]
scenery: Route loader options through the btg loader.

12 years agoEvaluate <condition> statements in materials.xml at tile loading time
Stuart Buchanan [Fri, 2 Mar 2012 23:04:18 +0000 (23:04 +0000)]
Evaluate <condition> statements in materials.xml at tile loading time
rather than on startup.  This will allow changing between winter and
summer textures in-sim, and also allow more interesting regional
textures to be defined.

12 years agohla: Fix timeAdvanceAvailable handling when no federate is regulating.
Mathias Froehlich [Fri, 2 Mar 2012 21:25:47 +0000 (22:25 +0100)]
hla: Fix timeAdvanceAvailable handling when no federate is regulating.

12 years agohla: Add propper attribute dirty handling.
Mathias Froehlich [Fri, 2 Mar 2012 20:51:59 +0000 (21:51 +0100)]
hla: Add propper attribute dirty handling.

12 years agohla: Timestamp support down to the DataElements.
Mathias Froehlich [Fri, 2 Mar 2012 20:36:08 +0000 (21:36 +0100)]
hla: Timestamp support down to the DataElements.

12 years agoFix masked rotation so that it's clockwise from above.
Stuart Buchanan [Tue, 28 Feb 2012 21:05:54 +0000 (21:05 +0000)]
Fix masked rotation so that it's clockwise from above.