FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,828 Commits 1 Branch 121 Tags
1b8dfb2bef9853e4ddc410f8f0379039e4d44ece
Commit Graph
4828 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Turner d3ab2d3fbc Missed files from previous commit, needed for Windows. 2012-05-03 18:55:13 +01:00
James Turner 65aca6607e Update to latest expat for improved BOM / encoding handling. 
(Related to http://code.google.com/p/flightgear-bugs/issues/detail?id=635)
 2012-05-03 17:29:16 +01:00
Stuart Buchanan e44eb39046 Emissive lighting for random buildings. Requires up to date fgdata. 2012-05-01 22:35:42 +01:00
ThorstenB ab7d2a4bcc 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.
 2012-04-30 18:29:44 +02:00
Frederic Bouvier 87c744b88b Use observer_ptr to cache light effects 2012-04-29 13:25:15 +02:00
Frederic Bouvier dfc4b1564f Nasal is C code, not C++ 2012-04-29 00:17:38 +02:00
Stuart Buchanan db6e99f885 Use Effects system for random buildings. 2012-04-28 23:11:52 +01:00
James Turner 35681e3adf Strange, somehow missed this file in last commit. 2012-04-28 23:08:05 +01:00
James Turner a5ca531aac Nasal Ghosts can optionally specify member get/set functions. 2012-04-28 22:25:57 +01:00
Stuart Buchanan 2daf895d00 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.
 2012-04-28 20:02:42 +01:00
Stuart Buchanan 1041445a22 Change random object placement to a grid-like scheme to reduce building overlap. 2012-04-28 19:58:09 +01:00
Christian Schmitt f712bc9294 Implement blinking hold-short line lights 
This is supported by the apt.dat 850 format and latest TG
 2012-04-26 15:02:33 +01:00
James Turner 2d174d0b14 Convert random buildings to avoid use of BIND_PER_PRIMITVE. 
(which pushes me to a slow OSG path)
 2012-04-26 00:18:47 +01:00
ThorstenB dd54f6938e #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).
 2012-04-25 21:08:37 +02:00
Frederic Bouvier 6e0e74a7d9 No round function for MSVC (forgot the template argument) 2012-04-25 08:59:04 +02:00
Frederic Bouvier 6a90696820 No round function for MSVC 2012-04-25 08:54:57 +02:00
Stuart Buchanan f9bf403fc0 Random buildings - initial commit. 2012-04-24 22:00:35 +01:00
James Turner 0c13fb7ae4 Fix latent bug in Nasal hash cget / cset functions, where the embedded string length 
was set to an incorrect marker value.
 2012-04-23 22:29:54 +01:00
ThorstenB 9a113bdb44 Revert "Add virtual destructor to SGReferenced." 
As suggested by Mathias, will use different solution.
This reverts commit 4abcf3215f.
 2012-04-23 19:41:09 +02:00
James Turner 69ef461e6d Merge commit 'refs/merge-requests/22' of git://gitorious.org/fg/simgear into merge-requests/22 2012-04-23 12:21:50 +01:00
ThorstenB 4abcf3215f Add virtual destructor to SGReferenced. 2012-04-21 20:50:07 +02:00
Frederic Bouvier 4b607d6484 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 fe8ba57c94.
 2012-04-18 19:56:31 +02:00
Frederic Bouvier fe8ba57c94 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
 2012-04-16 08:25:59 +02:00
Frederic Bouvier de191107a9 light animation: avoid that similar effects are merged 2012-04-14 23:16:23 +02:00
Frederic Bouvier 77b8b278ea Ensure uniform are there before trying to use them 2012-04-14 18:00:42 +02:00
Frederic Bouvier 4758447370 Add a <dim-factor> parameter in the light animation 
<dim-factor> contains a <property> element, and optionally <factor>,
<offset>, <expression>, <interpolation>, <min> and <max>
 2012-04-14 09:57:20 +02:00
ThorstenB 77909577e4 Error messages when installing property aliases fails. 2012-04-05 20:03:07 +02:00
ThorstenB 1a835a2e1b performance monitor: start measurement interval with a fresh timestamp. 2012-04-05 19:30:00 +02:00
James Turner 8d0330675a Set the filename as the OSG object name on shaders - should have done this years ago :) 2012-04-04 16:44:23 +01:00
Frederic Bouvier 95a9d7a229 Revert "Disable LOD when rendering to the shadow map." 
This reverts commit b95fb48a16.
 2012-04-02 23:37:18 +02:00
ThorstenB 2fed46e222 performance monitor improvement 
Record cumulative time consumed (all time) and current total time (current
measurement only) for subsystems.
 2012-04-02 20:47:27 +02:00
ThorstenB 9ad070871a 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).
 2012-04-02 20:47:27 +02:00
Frederic Bouvier b95fb48a16 Disable LOD when rendering to the shadow map. 
Produce few NaNs at start
 2012-04-01 23:06:32 +02:00
Mathias Froehlich 29462005b7 Fix typo in SGGeodesy. 
Pointed out by Carl Godkin.
Thanks!
 2012-04-01 17:50:49 +02:00
Frederic Bouvier 4de05629ee Shadow map now available in effects 2012-03-31 22:40:39 +02:00
ThorstenB 2b62411a78 Remove dead code. 2012-03-28 22:55:40 +02:00
ThorstenB 6fa4c7e138 Add file name to error message. 2012-03-28 22:54:27 +02:00
ThorstenB ece38a6dbf 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).
 2012-03-28 22:53:30 +02:00
Mathias Froehlich a592488f3e 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.
 2012-03-28 07:47:31 +02:00
Mathias Froehlich 191675cc79 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
 2012-03-28 07:44:41 +02:00
Mathias Froehlich df2e5bf39f 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 986d2cc42a.
 2012-03-28 07:34:36 +02:00
ThorstenB ac29faf3bb osg::Uniform::get does not return a value on error. 
Fixes "usage of uninitialized data" errors reported by valgrind.
 2012-03-26 21:00:10 +02:00
Frederic Bouvier 94eabf6220 Merge Specular and Emission buffers 2012-03-25 14:14:14 +02:00
Frederic Bouvier 40bc0cbd48 Compile under MSVC 9 2012-03-25 14:14:12 +02:00
ThorstenB b55e9df70a Don't crash when "avionics == NULL". 2012-03-22 23:54:01 +01:00
Mathias Froehlich 986d2cc42a 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
 2012-03-22 08:38:16 +01:00
ThorstenB 0b8bfd9ed8 More checks/error messages for missing files, 
checking return value of findDataFile.
 2012-03-17 10:15:31 +01:00
ThorstenB eff0c610e2 More consistent indentation. 2012-03-17 10:02:43 +01:00
ThorstenB ca97e67511 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).
 2012-03-17 10:02:13 +01:00
James Goppert 47c2dce26d Removed include breaking headless build. 2012-03-16 23:04:24 +01:00