]>
git.mxchange.org Git - simgear.git/log
Tim Moore [Fri, 17 Jul 2009 09:40:36 +0000 (11:40 +0200)]
Changed SGRawValue::DefaultValue to an inline function.
This avoids MSVC bugs in declaring templated specializations of static members.
Tim Moore [Thu, 16 Jul 2009 22:29:48 +0000 (00:29 +0200)]
Use SGAtomic's compareAndExchange instead of a new SGSwappable class
Also, eliminate the __declspec(32) of that class which is causing problems
in osg::buffered_object.
Tim Moore [Thu, 16 Jul 2009 21:09:10 +0000 (23:09 +0200)]
include file change to make simgear work with OSG 2.9.X again
Tim Moore [Thu, 16 Jul 2009 16:25:36 +0000 (18:25 +0200)]
Fix effects code to work with OSG 2.8.2-rc4
Tim Moore [Thu, 16 Jul 2009 10:53:11 +0000 (12:53 +0200)]
Use std::back_inserter instead of my local hack
BackRefInsertIterator is probably broken and may not be needed at all.
timoore [Wed, 15 Jul 2009 23:12:25 +0000 (23:12 +0000)]
Add new Effects files to vcproj
timoore [Wed, 15 Jul 2009 23:11:55 +0000 (23:11 +0000)]
Fixes for technique predicates
Get tests based on properties and OpenGL extensions working.
timoore [Wed, 15 Jul 2009 23:11:44 +0000 (23:11 +0000)]
more effects features
Materials can specify an effect.
Add support for PolygonMode and initial support for Uniform.
timoore [Wed, 15 Jul 2009 23:10:44 +0000 (23:10 +0000)]
Construct effects from property lists
The material code constructs a property list from its input parameters.
Enable dumping of Pass and Technique objects to a file.
Default effect now uses texture node instead of texture0
timoore [Wed, 15 Jul 2009 23:10:32 +0000 (23:10 +0000)]
materials use only simgear::Effect
Eliminate SGMaterial::get_state function.
Use Effect in BVH visitor, ocean tile generation, and airport signs.
timoore [Wed, 15 Jul 2009 23:10:21 +0000 (23:10 +0000)]
Use Effect to implement point lights
This allows different OpenGL features (point sprites, point attenuation) to
be used depending on hardware support.
timoore [Wed, 15 Jul 2009 23:10:13 +0000 (23:10 +0000)]
Use SGExpressions for evaluating a Technique's validity
timoore [Wed, 15 Jul 2009 23:10:06 +0000 (23:10 +0000)]
Overhaul of SGExpression
Polymorphic additions to expressions: Add an expression base class
with a method for dynamically determining the type of an expression.
Add variables, predicates and boolian expressions.
Support for parsing trees of expressions
timoore [Wed, 15 Jul 2009 23:09:58 +0000 (23:09 +0000)]
Work in progress for Technique validation
timoore [Wed, 15 Jul 2009 23:09:31 +0000 (23:09 +0000)]
Use Effects in materials library, and therefore in scenery
timoore [Wed, 15 Jul 2009 23:09:19 +0000 (23:09 +0000)]
Effects framework
timoore [Wed, 15 Jul 2009 23:08:42 +0000 (23:08 +0000)]
Blow away unused SGMaterialLib::add_item functions
timoore [Wed, 15 Jul 2009 23:08:36 +0000 (23:08 +0000)]
cleanup
Add support for boost::mem_fn to SGSharedPtr.
Remove a couple of "using" declarations from scene/model/model.hxx
timoore [Wed, 15 Jul 2009 23:08:30 +0000 (23:08 +0000)]
Add PropertyList typedef for vectors of property list nodes.
timoore [Wed, 15 Jul 2009 23:08:22 +0000 (23:08 +0000)]
Add a method to setStringValue that takes a std::string argument
timoore [Wed, 15 Jul 2009 23:08:10 +0000 (23:08 +0000)]
Don't cache results of getDisplayName
Return a std::string result instead of char *.
timoore [Wed, 15 Jul 2009 23:08:01 +0000 (23:08 +0000)]
Add VEC3D and VEC4D property types
Add "extended" argument to readProperties, which controls whether the vector
property types are accepted by the XML reader.
timoore [Wed, 15 Jul 2009 23:07:53 +0000 (23:07 +0000)]
Extend properties to support new property types.
An SGRawBase class has been added as a base class to the SGRawValue
hierarchy so that SGPropertyValue functions don't necessarily need to
know the type of the value stored in the node.
A new SGRawValueContainer class stores properties that shouldn't be
stored in the node itself. PropertyTraits indicates if a type is
stored in the property node or externally.
Add getValue and SetValue template member functions to SGPropertyNode.
Read and write new extended properties.
Rearrange props.hxx a bit so that the template magic actually works.
Split out extended raw value virtual functions into a seperate base class.
SGRawExtended is chosen as a base class of SGRawValue for extended property
types.
timoore [Wed, 15 Jul 2009 23:07:45 +0000 (23:07 +0000)]
Cleanup of properties
Change most uses of the SGPropertyNode _value union to use static_cast.
Move SGPropertyNode::Type out of the class into simgear::props namespace. Add
a PropertyTraits class so that templates can calculate the property type tag
based on a C++ type.
In destructor, delete _value.val if it is not 0 (and the property is not
aliased).
fredb [Sun, 12 Jul 2009 17:48:49 +0000 (17:48 +0000)]
Refactor GLX only debug code
fredb [Mon, 6 Jul 2009 22:58:09 +0000 (22:58 +0000)]
Compile when not GLX
ehofman [Thu, 2 Jul 2009 14:01:38 +0000 (14:01 +0000)]
Geoff McLane:
add a bunch of debugging code to find a persistant bug for Atlas/Map and fix them one by one.
fredb [Sun, 28 Jun 2009 22:20:22 +0000 (22:20 +0000)]
Support MSVC 64-bit architecture
fredb [Sun, 28 Jun 2009 20:27:15 +0000 (20:27 +0000)]
Add MSVC90 (VS2008) project files
fredb [Sun, 28 Jun 2009 13:34:31 +0000 (13:34 +0000)]
Update MSVC 7.1 projects - Put PLIB and FLTK in 3rdParty
frohlich [Sun, 28 Jun 2009 09:19:04 +0000 (09:19 +0000)]
Remove unneeded explicit scenegraph deletion.
Modified Files:
simgear/scene/tgdb/TileCache.cxx
simgear/scene/tgdb/TileEntry.cxx
simgear/scene/tgdb/TileEntry.hxx
fredb [Sat, 27 Jun 2009 21:45:25 +0000 (21:45 +0000)]
Remove unmaintained, outdated and misleading project files. Use VC7.1 projects instead
fredb [Sat, 27 Jun 2009 07:41:33 +0000 (07:41 +0000)]
Suppress warnings
fredb [Sat, 27 Jun 2009 06:41:08 +0000 (06:41 +0000)]
Win32 fix
frohlich [Wed, 24 Jun 2009 05:19:52 +0000 (05:19 +0000)]
Provide a thread safe SGWeakPtr implementation.
Extend SGAtomic with atomic exchange and add.
Import updates from the original implementation of that in OpenFDM.
Modified Files:
Makefile.am SGAtomic.cxx SGAtomic.hxx SGReferenced.hxx
SGSharedPtr.hxx
Added Files:
SGWeakPtr.hxx SGWeakReferenced.hxx
fredb [Tue, 23 Jun 2009 20:35:41 +0000 (20:35 +0000)]
Update MSVC 7.1 projects
fredb [Tue, 23 Jun 2009 20:35:17 +0000 (20:35 +0000)]
Win32 fix
frohlich [Tue, 23 Jun 2009 20:34:46 +0000 (20:34 +0000)]
No observed_ptr needed.
Modified Files:
simgear/scene/model/ModelRegistry.cxx
frohlich [Tue, 23 Jun 2009 20:26:57 +0000 (20:26 +0000)]
Remove unused headers.
Modified Files:
simgear/scene/tgdb/TileEntry.cxx
frohlich [Tue, 23 Jun 2009 20:26:26 +0000 (20:26 +0000)]
Propagate the lanel loader through the options.
Modified Files:
simgear/scene/model/SGReaderWriterXML.cxx
frohlich [Mon, 22 Jun 2009 18:39:44 +0000 (18:39 +0000)]
Move the carrier interactive geometry configuration into the model files.
Modified Files:
Makefile.am animation.cxx
Added Files:
SGInteractionAnimation.hxx SGInteractionAnimation.cxx
ehofman [Mon, 22 Jun 2009 09:35:12 +0000 (09:35 +0000)]
Move the texture code to FlightGear/utils/Modeller
frohlich [Sat, 20 Jun 2009 11:11:48 +0000 (11:11 +0000)]
Add some trailing spaces ...
Modified Files:
./simgear/math/SGIntersect.hxx
jmt [Sat, 20 Jun 2009 09:33:44 +0000 (09:33 +0000)]
Fix a warning from GCC - 'ALIAS' was unhandled in the switch stmt.
Tim Moore [Wed, 17 Jun 2009 09:37:21 +0000 (11:37 +0200)]
change MAX_PATH to max_path to avoid Windows compilation problems
Tim Moore [Wed, 4 Mar 2009 10:15:47 +0000 (11:15 +0100)]
overhaul sg_throwable to behave like a proper exception
Make sg_throwable inherit from std::exception.
change exception objects to contain C strings: exception objects should not
include objects, like std::string, whose copy constructor could throw.
fredb [Sun, 14 Jun 2009 10:56:28 +0000 (10:56 +0000)]
Add a simple class to subdivide Bezier curves
fredb [Sun, 14 Jun 2009 10:53:09 +0000 (10:53 +0000)]
Remove unused variable
frohlich [Thu, 11 Jun 2009 18:53:19 +0000 (18:53 +0000)]
Finally get rid of that member in the SGModelData callback.
Move call of SGModelData::modelLoaded directly into the xml reader.
Modified Files:
simgear/scene/model/SGPagedLOD.cxx
simgear/scene/model/modellib.hxx
simgear/scene/model/modellib.cxx
simgear/scene/model/SGReaderWriterXML.cxx
frohlich [Thu, 11 Jun 2009 18:32:46 +0000 (18:32 +0000)]
Mark static transforms as static.
Modified Files:
simgear/scene/tgdb/TileEntry.cxx
frohlich [Thu, 11 Jun 2009 13:39:52 +0000 (13:39 +0000)]
Revert a change from 2009/06/07.
Should make the Nasal code for some xml models work again.
Modified Files:
simgear/scene/model/SGPagedLOD.cxx
simgear/scene/model/SGReaderWriterXML.cxx
simgear/scene/model/modellib.cxx
simgear/scene/model/modellib.hxx
frohlich [Thu, 11 Jun 2009 08:42:44 +0000 (08:42 +0000)]
Also handle PagedLOD nodes frame count in the update visitor.
Modified Files:
simgear/scene/util/SGUpdateVisitor.hxx
frohlich [Thu, 11 Jun 2009 07:15:07 +0000 (07:15 +0000)]
Also test against bounds when updating the scene.
Modified Files:
simgear/scene/util/SGUpdateVisitor.hxx
jmt [Wed, 10 Jun 2009 22:46:15 +0000 (22:46 +0000)]
Fix waypoint test, thanks Martin.
jmt [Wed, 10 Jun 2009 12:42:44 +0000 (12:42 +0000)]
Extend SGWaypoint with track and speed data, and compute tracks with the
distance in SGRoute.
fredb [Tue, 9 Jun 2009 20:51:24 +0000 (20:51 +0000)]
Win32 fix
jmt [Tue, 9 Jun 2009 00:01:14 +0000 (00:01 +0000)]
Fix bad interaction between CourseAndDistance overloads and use of implicit
SGWaypoint construction from SGGeod.
jmt [Mon, 8 Jun 2009 23:30:54 +0000 (23:30 +0000)]
Update route/waypoint tests for revised API
jmt [Mon, 8 Jun 2009 23:18:39 +0000 (23:18 +0000)]
Change SGWaypoint to use SGGeod internally. Remove some unused code, to
support cartesian waypoints and compute distance off a cartesian route.
Add a helper to access the total route distance.
Should not cause any visible functionality change.
frohlich [Sun, 7 Jun 2009 11:58:11 +0000 (11:58 +0000)]
More cleanup.
Modified Files:
simgear/scene/model/SGReaderWriterXML.cxx
frohlich [Sun, 7 Jun 2009 11:50:01 +0000 (11:50 +0000)]
Do not modify danymically generated textures.
Modified Files:
simgear/scene/model/ModelRegistry.cxx
frohlich [Sun, 7 Jun 2009 11:30:12 +0000 (11:30 +0000)]
Provide something more sensible for the properties root
for the modelLoaded call. MAy be this needs to be revisited, but in any
case better than constant zero.
Modified Files:
simgear/scene/model/SGPagedLOD.cxx
simgear/scene/model/modellib.cxx
frohlich [Sun, 7 Jun 2009 11:27:53 +0000 (11:27 +0000)]
Cleanup.
Modified Files:
simgear/scene/model/SGReaderWriterXML.cxx
frohlich [Sun, 7 Jun 2009 11:26:48 +0000 (11:26 +0000)]
Doing the compilers job: constant propagation.
This variable is nowhere set except to zero.
Modified Files:
model/SGPagedLOD.cxx model/SGReaderWriterXML.cxx
model/modellib.cxx model/modellib.hxx
frohlich [Sat, 6 Jun 2009 10:38:53 +0000 (10:38 +0000)]
Slight cleanup.
Remive last reference to plibs file utility library.
Modified Files:
simgear/scene/model/SGReaderWriterXML.cxx
frohlich [Sat, 6 Jun 2009 09:17:37 +0000 (09:17 +0000)]
Remove unused header.
Modified Files:
simgear/scene/tgdb/TileEntry.cxx
frohlich [Sat, 6 Jun 2009 09:16:04 +0000 (09:16 +0000)]
Use osgDB::FileUtils instead of plib file utils.
Modified Files:
simgear/scene/material/mat.cxx
frohlich [Sat, 6 Jun 2009 08:07:20 +0000 (08:07 +0000)]
Replace SGPlacementTrans usage with osg::PositionAttitueTransform.
Remove SGPlacementTrans.
Update build system.
Modified Files:
SimGear.dsp projects/VC7.1/SimGear.vcproj
projects/VC8/SimGear.vcproj simgear/scene/model/Makefile.am
simgear/scene/model/placement.cxx
simgear/scene/model/placement.hxx
simgear/scene/tgdb/TileEntry.cxx
simgear/scene/tgdb/TileEntry.hxx
Removed Files:
simgear/scene/model/placementtrans.cxx
simgear/scene/model/placementtrans.hxx
frohlich [Sat, 6 Jun 2009 07:24:26 +0000 (07:24 +0000)]
Use osg's builtin mechanisms to traverse only in range nodes with the
update visitor.
Modified Files:
simgear/scene/util/SGUpdateVisitor.hxx
simgear/scene/tgdb/TileEntry.cxx
simgear/scene/model/placementtrans.cxx
frohlich [Wed, 3 Jun 2009 19:30:35 +0000 (19:30 +0000)]
Invent a property root if not given in the options struct.
Modified Files:
simgear/scene/model/SGReaderWriterXML.cxx
ehofman [Mon, 25 May 2009 11:12:59 +0000 (11:12 +0000)]
test for addChild also
ehofman [Mon, 25 May 2009 11:12:24 +0000 (11:12 +0000)]
find the last index instead of the last pos for addChild
frohlich [Mon, 25 May 2009 04:59:51 +0000 (04:59 +0000)]
Avoid empty search path extensions for the case that only the bucket index
number is given.
Modified Files:
scene/tgdb/TileEntry.cxx
frohlich [Sun, 24 May 2009 06:38:58 +0000 (06:38 +0000)]
When loading stg files honour the original path if given.
Modified Files:
simgear/scene/tgdb/ReaderWriterSTG.cxx
simgear/scene/tgdb/TileEntry.cxx
simgear/scene/tgdb/TileEntry.hxx
frohlich [Sat, 23 May 2009 12:00:17 +0000 (12:00 +0000)]
Enable stg loading by filename.
Modified Files:
simgear/scene/tgdb/ReaderWriterSTG.cxx
mfranz [Sat, 23 May 2009 07:32:29 +0000 (07:32 +0000)]
segfault--
frohlich [Fri, 22 May 2009 18:20:11 +0000 (18:20 +0000)]
Cleanup.
Additional null pointer checks.
Simplify redundant interface arguments.
Modified Files:
simgear/scene/material/mat.cxx simgear/scene/material/mat.hxx
simgear/scene/material/matlib.cxx
simgear/scene/material/matlib.hxx
simgear/scene/tgdb/ReaderWriterSTG.cxx
simgear/scene/tgdb/SGReaderWriterBTG.cxx
simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx
simgear/scene/tgdb/TileEntry.cxx
simgear/scene/tgdb/TileEntry.hxx simgear/scene/tgdb/obj.cxx
frohlich [Fri, 22 May 2009 14:53:57 +0000 (14:53 +0000)]
Give the models properties as an argument to the init callback.
Modified Files:
SGPagedLOD.cxx
mfranz [Tue, 19 May 2009 21:29:13 +0000 (21:29 +0000)]
remove duplicated header entry
frohlich [Tue, 19 May 2009 05:30:59 +0000 (05:30 +0000)]
Also note the btg reader header in the build system.
Modified Files:
scene/tgdb/Makefile.am
frohlich [Tue, 19 May 2009 05:30:16 +0000 (05:30 +0000)]
Restore the special capability of the btg reader to read compressed files.
Modified Files:
scene/tgdb/SGReaderWriterBTG.cxx
scene/tgdb/SGReaderWriterBTG.hxx
frohlich [Sat, 16 May 2009 18:05:21 +0000 (18:05 +0000)]
Implement current osgDB::ReaderWriters supportsExtension interface instead
of the previous one.
Modified Files:
model/SGReaderWriterXML.cxx model/SGReaderWriterXML.hxx
tgdb/ReaderWriterSTG.cxx tgdb/ReaderWriterSTG.hxx
tgdb/SGReaderWriterBTG.cxx tgdb/SGReaderWriterBTG.hxx
frohlich [Sat, 16 May 2009 17:46:12 +0000 (17:46 +0000)]
Attach the ModelData to the options instead of the userdata field.
Modified Files:
simgear/scene/model/SGPagedLOD.cxx
simgear/scene/model/SGReaderWriterXML.cxx
ehofman [Sat, 9 May 2009 11:34:28 +0000 (11:34 +0000)]
* Add a function to create a node after the laste node with the same name
(this frees the xml property loader from keeping track of the number of
nodes with the same name that have already been added to the property
tree).
* make some small code cleanups at the core of the property tree.
Tim Moore [Sun, 17 May 2009 22:34:06 +0000 (00:34 +0200)]
Merge branch 'maint' into next
frohlich [Sat, 16 May 2009 08:13:52 +0000 (08:13 +0000)]
Make SimGear compile with osg trunk
Modified Files:
simgear/scene/model/SGPagedLOD.cxx
simgear/scene/model/SGPagedLOD.hxx
simgear/scene/sky/cloud.cxx simgear/scene/sky/moon.cxx
simgear/structure/OSGVersion.hxx
mfranz [Tue, 12 May 2009 15:56:30 +0000 (15:56 +0000)]
- fix one broken #include path (in a not usually compiled test app)
- turn four #include paths from the "foo" form to <foo>
The quotes form is normally only used for headers with path relative
to the including file's path, though the standard doesn't strictly
mandate this. This is consistent with the rest of sg, it makes the
code's intent clearer and helps to find headers. (And it's a few
milliseconds faster, too.)
mfranz [Wed, 6 May 2009 16:17:05 +0000 (16:17 +0000)]
tcpserver: typo
mfranz [Wed, 6 May 2009 06:32:09 +0000 (06:32 +0000)]
fix leaks
ehofman [Sat, 25 Apr 2009 09:57:06 +0000 (09:57 +0000)]
add a bit of comment
fredb [Sat, 18 Apr 2009 18:47:01 +0000 (18:47 +0000)]
Stuart Buchanan :
This patch changes the shader so the diffuse light element is applied based on the co-linearity of the light vector and the viewing vector. I think this makes sense, as the tree textures don't represent a surface themselves.
ehofman [Sun, 12 Apr 2009 11:42:34 +0000 (11:42 +0000)]
Revert most of the previous patch, it didn't improve the dome since it wat adjusting the wrong bads
frohlich [Sun, 12 Apr 2009 09:46:36 +0000 (09:46 +0000)]
Put some annotations into the loaded models names.
Modified Files:
simgear/scene/model/modellib.cxx
frohlich [Sun, 12 Apr 2009 08:05:14 +0000 (08:05 +0000)]
Remove a newline printf, probably left over from development.
Modified Files:
dome.cxx
ehofman [Sat, 11 Apr 2009 12:27:05 +0000 (12:27 +0000)]
Let the fog color transition into the sky dome to give a more natural effect
ehofman [Mon, 6 Apr 2009 19:24:29 +0000 (19:24 +0000)]
Fix a NaN at higher altitudes: sin_beta could become greater than 1.0 which is hard to understand for asin.
frohlich [Thu, 2 Apr 2009 05:38:34 +0000 (05:38 +0000)]
Remove unused variables.
Modified Files:
simgear/bucket/newbucket.hxx
Tim Moore [Mon, 30 Mar 2009 22:04:30 +0000 (00:04 +0200)]
Merge branch 'maint' into next
torsten [Fri, 27 Mar 2009 22:38:54 +0000 (22:38 +0000)]
fix wrong bucket calculation for western hemisphere, close to poles, full-degree-longitude calculations.
set_bucket computed false left border, if the span was greater than 1, longitudes were less than zero
and longitudes were within SG_EPSILON on a full degree. Example: -179.0, +87.5 returned -176, 87
but should return -180, 87.
Discovered by Brian Schack
frohlich [Tue, 24 Mar 2009 09:09:00 +0000 (09:09 +0000)]
Makes more sense to process the orientation in this order.
Modified Files:
simgear/scene/model/placement.cxx