]>
git.mxchange.org Git - simgear.git/log
frohlich [Tue, 24 Mar 2009 08:12:58 +0000 (08:12 +0000)]
Clean up placementtrans a bit.
Modified Files:
simgear/scene/model/placement.cxx
simgear/scene/model/placementtrans.cxx
simgear/scene/model/placementtrans.hxx
frohlich [Tue, 24 Mar 2009 08:11:36 +0000 (08:11 +0000)]
Zap aliasing compiler warnings.
Modified Files:
simgear/io/lowlevel.cxx
frohlich [Tue, 24 Mar 2009 08:10:47 +0000 (08:10 +0000)]
Remove second, identical to the first one license header.
Modified Files:
simgear/scene/model/SGScaleTransform.cxx
frohlich [Tue, 24 Mar 2009 08:09:34 +0000 (08:09 +0000)]
Remove unused header.
Modified Files:
simgear/scene/tgdb/TileEntry.cxx
frohlich [Tue, 24 Mar 2009 08:09:16 +0000 (08:09 +0000)]
Make it compile with gcc-4.4.
Modified Files:
simgear/debug/logstream.hxx
frohlich [Tue, 24 Mar 2009 08:03:15 +0000 (08:03 +0000)]
Make use of optimized matrix multiplication routines in osg.
Modified Files:
simgear/scene/model/SGTranslateTransform.cxx
frohlich [Thu, 19 Mar 2009 07:58:32 +0000 (07:58 +0000)]
No longer change the material properties for ac models on the fly.
Modified Files:
simgear/scene/model/ModelRegistry.cxx
frohlich [Tue, 17 Mar 2009 12:25:26 +0000 (12:25 +0000)]
Cleanup. Use already structured data instead of copying stuff.
frohlich [Tue, 17 Mar 2009 12:23:15 +0000 (12:23 +0000)]
Add const accessors.
Modified Files:
simgear/ephemeris/ephemeris.hxx
frohlich [Sun, 15 Mar 2009 15:06:19 +0000 (15:06 +0000)]
Make sure the boundingvolumes for the btg files are as high as possible
in the scenegraph.
Modified Files:
simgear/scene/tgdb/SGReaderWriterBTG.cxx
frohlich [Sun, 15 Mar 2009 12:56:02 +0000 (12:56 +0000)]
Use triangle sphere intersection directly.
Modified Files:
simgear/scene/bvh/BVHSubTreeCollector.cxx
frohlich [Sun, 15 Mar 2009 12:50:24 +0000 (12:50 +0000)]
Make triangle sphere intersection tests usable with mixes types.
Modified Files:
simgear/math/SGIntersect.hxx
frohlich [Sun, 15 Mar 2009 11:03:37 +0000 (11:03 +0000)]
Preparations for improoved timing behaviour.
Modified Files:
simgear/scene/bvh/BVHMotionTransform.cxx
simgear/scene/bvh/BVHMotionTransform.hxx
simgear/scene/bvh/BVHSubTreeCollector.cxx
frohlich [Sat, 14 Mar 2009 12:26:30 +0000 (12:26 +0000)]
Add a reference time to the velocity stuff.
Modified Files:
simgear/scene/model/ModelRegistry.cxx
simgear/scene/model/placement.cxx
simgear/scene/model/placement.hxx
simgear/scene/util/SGSceneUserData.hxx
frohlich [Sat, 14 Mar 2009 11:08:43 +0000 (11:08 +0000)]
The chunked stuff is no longer needed for the ground tiles.
... I (Mathias Froehlich), believe that it is more performant (for the GPU) to
build the biggest indexed sets possible at the expense of tight culling.
I (Mathias Froehlich) also know that the CPU is more performant on smaller chunks
building the old flat groundcache on such tiles. :)
So this code *was* to balance these two contrary requirements to some degree.
Now we have optimized datastructures for drawing and differently optimized
datastructures for intersection tests.
Modified Files:
simgear/scene/tgdb/obj.cxx
frohlich [Sat, 14 Mar 2009 11:00:40 +0000 (11:00 +0000)]
Also align the ocean tiles with some horizontal axis.
This way the bounding boxes for this geometry is slightly smaller.
Helps ground intersection stuff to avoid the ocean triangles earlier.
Modified Files:
simgear/scene/tgdb/SGOceanTile.cxx
frohlich [Sat, 14 Mar 2009 09:17:00 +0000 (09:17 +0000)]
Improove bounding volume building in the scenery loading process.
Refactor common code in the BoundingVolumeBuildVisitor.hxx.
Modified Files:
simgear/scene/model/BoundingVolumeBuildVisitor.hxx
simgear/scene/model/ModelRegistry.cxx
simgear/scene/model/ModelRegistry.hxx
frohlich [Sat, 14 Mar 2009 09:16:06 +0000 (09:16 +0000)]
Make the debug geometry stuff work with a time argument.
Modified Files:
simgear/scene/bvh/BVHDebugCollectVisitor.hxx
fredb [Fri, 13 Mar 2009 07:33:38 +0000 (07:33 +0000)]
Compile under windows
frohlich [Fri, 13 Mar 2009 05:45:11 +0000 (05:45 +0000)]
Make sure each carrier gets its own valocity.
Modified Files:
simgear/scene/model/ModelRegistry.cxx
mfranz [Thu, 12 Mar 2009 20:07:47 +0000 (20:07 +0000)]
warning--
frohlich [Thu, 12 Mar 2009 18:34:07 +0000 (18:34 +0000)]
Make use of posix clocks if available.
Have a more general timestamp implementation.
Very useful for higher accuracy timings.
Modified Files:
simgear/structure/subsystem_mgr.cxx
simgear/structure/subsystem_mgr.hxx
simgear/timing/testtimestamp.cxx simgear/timing/timestamp.cxx
simgear/timing/timestamp.hxx
frohlich [Wed, 11 Mar 2009 05:34:02 +0000 (05:34 +0000)]
Use a reference counted pointer for the condition.
Modified Files:
simgear/sound/xmlsound.hxx simgear/sound/xmlsound.cxx
frohlich [Tue, 10 Mar 2009 19:23:19 +0000 (19:23 +0000)]
Remove unused methods.
Modified Files:
material/matmodel.hxx material/matmodel.cxx
frohlich [Tue, 10 Mar 2009 19:22:08 +0000 (19:22 +0000)]
Make local functions static.
Modified Files:
model/SGReaderWriterXML.cxx
frohlich [Tue, 10 Mar 2009 19:20:44 +0000 (19:20 +0000)]
Remove unused functions/includes ...
Modified Files:
simgear/scene/tgdb/userdata.hxx
simgear/scene/tgdb/userdata.cxx
frohlich [Sat, 7 Mar 2009 21:47:22 +0000 (21:47 +0000)]
Zap SGLocation.
Modified Files:
projects/VC7.1/SimGear.vcproj projects/VC8/SimGear.vcproj
simgear/scene/model/Makefile.am
simgear/scene/model/placement.cxx
simgear/scene/model/placement.hxx
Removed Files:
simgear/scene/model/location.cxx
simgear/scene/model/location.hxx
frohlich [Sat, 7 Mar 2009 21:45:14 +0000 (21:45 +0000)]
Ignore winding order since it is ignored later anyway.
Only emit fully defined primitives.
Modified Files:
simgear/scene/model/BoundingVolumeBuildVisitor.hxx
frohlich [Sat, 7 Mar 2009 11:11:52 +0000 (11:11 +0000)]
Use SGGeod in the model placement.
Modified Files:
simgear/scene/model/placement.cxx
simgear/scene/model/placement.hxx
frohlich [Sat, 7 Mar 2009 11:10:57 +0000 (11:10 +0000)]
Add convenience function to keep position with just an other elevation.
Modified Files:
simgear/math/SGGeod.hxx
frohlich [Thu, 5 Mar 2009 06:06:02 +0000 (06:06 +0000)]
First step for something doing static friction stuff.
Add an id field to identify BVHMotionTransforms.
Provide a factory for ids.
Use that to identify velocity data.
Track the lowermost id in the visitors.
Modified Files:
simgear/scene/bvh/BVHLineSegmentVisitor.cxx
simgear/scene/bvh/BVHLineSegmentVisitor.hxx
simgear/scene/bvh/BVHMotionTransform.cxx
simgear/scene/bvh/BVHMotionTransform.hxx
simgear/scene/bvh/BVHNearestPointVisitor.hxx
simgear/scene/bvh/BVHNode.cxx simgear/scene/bvh/BVHNode.hxx
simgear/scene/util/SGSceneUserData.cxx
simgear/scene/util/SGSceneUserData.hxx
frohlich [Tue, 3 Mar 2009 08:25:19 +0000 (08:25 +0000)]
Avoid duplicate triangles.
Modified Files:
simgear/scene/bvh/BVHStaticGeometryBuilder.hxx
frohlich [Mon, 2 Mar 2009 18:02:50 +0000 (18:02 +0000)]
Remove the StaticLeaf visitor slot.
Add a nearest point visitor.
Modified Files:
BVHBoundingBoxVisitor.hxx BVHDebugCollectVisitor.hxx
BVHLineSegmentVisitor.cxx BVHLineSegmentVisitor.hxx
BVHStaticGeometryBuilder.hxx BVHStaticLeaf.cxx
BVHStaticLeaf.hxx BVHSubTreeCollector.cxx
BVHSubTreeCollector.hxx BVHVisitor.hxx Makefile.am bvhtest.cxx
Added Files:
BVHNearestPointVisitor.hxx
frohlich [Sun, 1 Mar 2009 21:31:18 +0000 (21:31 +0000)]
Crude hack to work around my today introduced collision tree sharing problem.
Modified Files:
simgear/scene/model/ModelRegistry.cxx
frohlich [Sun, 1 Mar 2009 21:25:48 +0000 (21:25 +0000)]
Don't waste space with too huge stl containers.
Modified Files:
simgear/scene/bvh/BVHStaticGeometryBuilder.hxx
frohlich [Sun, 1 Mar 2009 21:25:14 +0000 (21:25 +0000)]
Don't waste space with too huge stl containers.
Modified Files:
simgear/scene/bvh/BVHStaticData.hxx
fredb [Sun, 1 Mar 2009 15:50:45 +0000 (15:50 +0000)]
Win32 fix
frohlich [Sun, 1 Mar 2009 15:40:22 +0000 (15:40 +0000)]
Build boundingvolumes in the model loading phase.
Modified Files:
ModelRegistry.hxx ModelRegistry.cxx
Added Files:
BoundingVolumeBuildVisitor.hxx
fredb [Sun, 1 Mar 2009 12:50:39 +0000 (12:50 +0000)]
Update MSVC 7.1 projects - Add the BVH library
fredb [Sun, 1 Mar 2009 12:49:52 +0000 (12:49 +0000)]
SGMatrix<T>::preMultTranslate should return self ( as postMultTranslate do )
fredb [Sun, 1 Mar 2009 12:48:15 +0000 (12:48 +0000)]
BVHLineSegmentVisitor::setLineSegmentEnd doesn't return anything
frohlich [Sun, 1 Mar 2009 12:40:50 +0000 (12:40 +0000)]
Implement setters for velocity notes in the model placement code.
Modified Files:
simgear/scene/model/placement.cxx
simgear/scene/model/placement.hxx
frohlich [Sun, 1 Mar 2009 12:37:50 +0000 (12:37 +0000)]
More data to attach to the user data field.
Modified Files:
simgear/scene/util/SGSceneUserData.hxx
frohlich [Sun, 1 Mar 2009 12:36:54 +0000 (12:36 +0000)]
Include the bounding volume tree on the build system.
Modified Files:
configure.ac simgear/scene/Makefile.am
frohlich [Sun, 1 Mar 2009 12:35:49 +0000 (12:35 +0000)]
Initial commit of the bounding volume tree implementation.
The aim is to prove a better collion model in plenty ways.
Added Files:
.cvsignore BVHBoundingBoxVisitor.hxx
BVHDebugCollectVisitor.hxx BVHGroup.cxx BVHGroup.hxx
BVHLineGeometry.cxx BVHLineGeometry.hxx
BVHLineSegmentVisitor.cxx BVHLineSegmentVisitor.hxx
BVHMotionTransform.cxx BVHMotionTransform.hxx BVHNode.cxx
BVHNode.hxx BVHStaticBinary.cxx BVHStaticBinary.hxx
BVHStaticData.hxx BVHStaticGeometry.cxx BVHStaticGeometry.hxx
BVHStaticGeometryBuilder.hxx BVHStaticLeaf.cxx
BVHStaticLeaf.hxx BVHStaticNode.cxx BVHStaticNode.hxx
BVHStaticTriangle.cxx BVHStaticTriangle.hxx
BVHSubTreeCollector.cxx BVHSubTreeCollector.hxx
BVHTransform.cxx BVHTransform.hxx BVHVisitor.hxx Makefile.am
bvhtest.cxx
frohlich [Sun, 1 Mar 2009 12:22:56 +0000 (12:22 +0000)]
Additions for the boundingvolumes
Modified Files:
SGGeometryTest.cxx SGIntersect.hxx SGLineSegment.hxx
SGTriangle.hxx
frohlich [Fri, 27 Feb 2009 19:59:47 +0000 (19:59 +0000)]
Rotate the scenery tiles so that the horizont is axis aligned.
This might help culling and much more the upcomming collision tree.
Modified Files:
simgear/scene/tgdb/obj.cxx
frohlich [Fri, 27 Feb 2009 19:30:28 +0000 (19:30 +0000)]
Make material get helper function static.
Modified Files:
simgear/scene/material/matlib.cxx
simgear/scene/material/matlib.hxx
frohlich [Fri, 27 Feb 2009 18:52:53 +0000 (18:52 +0000)]
Initialize random number for the tests.
Define the triangles center by the weighted sum of the vertices.
Modified Files:
SGGeometryTest.cxx SGTriangle.hxx
frohlich [Fri, 27 Feb 2009 06:05:36 +0000 (06:05 +0000)]
Use template arguments instead of hard coded double.
Modified Files:
simgear/math/SGTriangle.hxx
frohlich [Fri, 27 Feb 2009 05:18:31 +0000 (05:18 +0000)]
Initialize uninitialized variables.
Adapt the precision bounds to what matches the expectations of IEEE math.
Modified Files:
SGMathTest.cxx
frohlich [Fri, 27 Feb 2009 05:16:52 +0000 (05:16 +0000)]
Fix problem in unit quaternion return.
Modified Files:
SGQuat.hxx
frohlich [Fri, 27 Feb 2009 05:16:12 +0000 (05:16 +0000)]
Make make check link again.
Modified Files:
simgear/math/Makefile.am
frohlich [Sun, 22 Feb 2009 09:15:44 +0000 (09:15 +0000)]
The scenery center is history for a long time now.
Remove that from the transforms.
Modified Files:
simgear/scene/model/placement.hxx
simgear/scene/model/placementtrans.cxx
simgear/scene/model/placementtrans.hxx
frohlich [Sun, 22 Feb 2009 08:13:24 +0000 (08:13 +0000)]
Small cleanups, bug fixes and improovements to the geometry/math stuff.
Modified Files:
simgear/math/SGBox.hxx simgear/math/SGIntersect.hxx
simgear/math/SGLineSegment.hxx simgear/math/SGMatrix.hxx
simgear/math/SGPlane.hxx simgear/math/SGRay.hxx
simgear/math/SGSphere.hxx simgear/math/SGVec2.hxx
simgear/math/SGVec3.hxx simgear/math/SGVec4.hxx
durk [Sat, 21 Feb 2009 09:11:41 +0000 (09:11 +0000)]
Torsten Dreyer: the rotate animation has two ways to define a axis
1. by using center/x-m and axis/[xyz]
2. by using axis/[xyz]1-m and axis/[xyz]2-m
The translate animation only supports method 1. and here comes a patch that
enables method 2 for this animations, too.
fredb [Thu, 19 Feb 2009 20:41:36 +0000 (20:41 +0000)]
Fix to compile with MSC
Tim Moore [Sun, 15 Feb 2009 23:48:00 +0000 (00:48 +0100)]
Merge branch 'topic/nasal' into next
mfranz [Sun, 15 Feb 2009 16:54:39 +0000 (16:54 +0000)]
"io.flush() implementation from Melchior. Also add a final filetype
element to the io.stat() array, which has been sitting around on my
box for a while and doesn't seem to have broken anything." -- Andy
(forward port from nasal/cvs)
Tim Moore [Fri, 13 Feb 2009 09:07:15 +0000 (10:07 +0100)]
Merge branch 'topic/gcintersect' into next
Tim Moore [Fri, 13 Feb 2009 08:35:50 +0000 (09:35 +0100)]
New getPrimitive function.
This searches for the primitive found in an OSG intersection query.
Tim Moore [Fri, 6 Feb 2009 23:37:47 +0000 (00:37 +0100)]
Make SGSubsystemGroup::Member copy constructor private.
The copy constructor wouldn't make any sense and would confuse ownership of
the subsystem pointer. Problem noted by John Denker.
Tim Moore [Fri, 6 Feb 2009 18:16:19 +0000 (19:16 +0100)]
Merge branch 'topic/cloudz' into next
Tim Moore [Fri, 6 Feb 2009 16:47:55 +0000 (17:47 +0100)]
Turn off z buffer writes for clouds.
This is standard practice for semi-transparent objects and should cut down
on the flickering and other sorting artifacts.
fredb [Sun, 25 Jan 2009 11:53:35 +0000 (11:53 +0000)]
Update MSVC 7.1 projects - Remove pthreads dependency
Tim Moore [Wed, 4 Feb 2009 10:03:20 +0000 (11:03 +0100)]
Merge branch 'maint' into next
Tim Moore [Wed, 4 Feb 2009 10:02:30 +0000 (11:02 +0100)]
Merge branch 'releng/1.9.1' into maint
durk [Mon, 2 Feb 2009 05:34:13 +0000 (05:34 +0000)]
Synchronize the version number with our mainantance release.
Tim Moore [Fri, 30 Jan 2009 09:37:06 +0000 (10:37 +0100)]
Build trees under a transform note that is rotated to Z-up.
This allows the tree geometry to be shared across the entire scene because it
doesn't need to be rotated for each scenery tile.
Tim Moore [Thu, 29 Jan 2009 06:22:42 +0000 (07:22 +0100)]
Don't expand all the trees into display lists.
This can chew up large amounts of memory for questionable gains. We do
let the tree model geometry be in a display list if OSG chooses to put
it there.
Various renaming and cleanup. Save some memory by reverting
ShaderGeometry's base class back to osg::Drawable.
Tim Moore [Wed, 28 Jan 2009 06:53:38 +0000 (07:53 +0100)]
Merge branch 'topic/yontree' into next
Tim Moore [Wed, 28 Jan 2009 06:53:31 +0000 (07:53 +0100)]
Merge branch 'maint' into next
durk [Tue, 27 Jan 2009 22:43:13 +0000 (22:43 +0000)]
For the first time (no pun intended) in almost ten years time (again no
pun intended) that I'm touching the time library.
Brian Schack reported that the traffic scheduler messes up the timestamps
of the atlas network output. As it turns out, the c library functions
asctime, and gmtime use a static copy of the tm struct to do the internal
formatting. Our linux port of the SGTime class, incidentally, also stored
it's master time stamp in this very same struct. Thus, formatting an
arbitrary time value, would have the unwanted side effect of time travel.
Usually, this would go unnoticed, because the actual time parameters would
be updated before any damage could be done. But unwanted side effects, as
in Brian's example could occur.
On the MSVC port this appears to not have been a problem. Since that port
used a copy of the tm struct to store it's master time stamps. Since the
MSVC code also compiles cleanly on linux, it seems to be the way to go to
use that approach. In addition, it also removes some conditional compile
directives.
I've only run a short test, but didn't see any undesirable side effects.
mfranz [Mon, 26 Jan 2009 18:01:48 +0000 (18:01 +0000)]
Csaba HALASZ: set _arg even if there's no <command> (crash fix)
Tim Moore [Wed, 28 Jan 2009 06:43:09 +0000 (07:43 +0100)]
Use osg::Geometry code to draw trees ourselves.
This reverts back in the direction of Yon's original patch: the model is
drawn within ShaderGeometry::drawImplementation. This saves a lot of memory
over the previous approach of creating a PrimitiveSet for each model.
Tim Moore [Fri, 23 Jan 2009 22:27:48 +0000 (23:27 +0100)]
Merge branch 'topic/modelopt' into next
Tim Moore [Fri, 23 Jan 2009 22:27:37 +0000 (23:27 +0100)]
Merge branch 'topic/yontree' into next
Tim Moore [Fri, 23 Jan 2009 13:36:53 +0000 (14:36 +0100)]
QuadTreeBuilder: create leaves on demand
This avoids lots of empty leaves.
Tim Moore [Wed, 21 Jan 2009 21:20:03 +0000 (22:20 +0100)]
Rewrite ShaderGeometry to use display lists and OSG primitives.
Based on a patch from Yon Uriarte.
Eliminate _trees list from ShaderGeometry
Use the position and scale values that are already available.
Tim Moore [Fri, 23 Jan 2009 14:22:40 +0000 (15:22 +0100)]
Optimize empty groups from .ac models
The OSG optimizer seems to have changed since this work was originally done.
Tim Moore [Sun, 18 Jan 2009 23:13:07 +0000 (00:13 +0100)]
Merge branch 'maint' into next
Tim Moore [Sun, 18 Jan 2009 23:04:59 +0000 (00:04 +0100)]
Protect against division by zero in QuadTreeBuilder
This could only happen when there's one leaf in the tree, or all the objects
happen to have the same position. Noticed by Csaba Halaz
Tim Moore [Thu, 15 Jan 2009 23:37:40 +0000 (00:37 +0100)]
Sort cloud sprites using std::sort, based on projected Z.
A "cleanup" of cloud sorting.
Tim Moore [Thu, 15 Jan 2009 21:52:11 +0000 (22:52 +0100)]
Merge branch 'foo' into next
jmt [Thu, 15 Jan 2009 14:46:37 +0000 (14:46 +0000)]
Fix linkage of test programs with OpenThreads.
jmt [Thu, 15 Jan 2009 14:34:33 +0000 (14:34 +0000)]
Commit Benoit Laniel's patch which converts more SimGear pieces to use
OpenThreads primitives directly.
jmt [Thu, 15 Jan 2009 14:31:51 +0000 (14:31 +0000)]
Since we're now sure 1.9.1 will not be released from trunk, here's Yon
Uriarte's patch to convert SGReferenced over to OpenThread's atomic int.
Tim Moore [Wed, 14 Jan 2009 21:34:20 +0000 (22:34 +0100)]
Merge branch 'maint' into next
Tim Moore [Wed, 14 Jan 2009 21:13:12 +0000 (22:13 +0100)]
Remove OptionsPusher and manipulation of osgDB dataFilePathList.
The bug it worked around has been fixed in the OSG ac3d loader, and changing
the path list has unpleasant multithreading implications.
Tim Moore [Wed, 14 Jan 2009 11:13:44 +0000 (12:13 +0100)]
Merge branch 'maint' into next
Tim Moore [Wed, 14 Jan 2009 11:10:23 +0000 (12:10 +0100)]
SGPropertyNode must increment / decrement the reference counter in an aliased
node.
From Csaba Halász.
Tim Moore [Tue, 13 Jan 2009 21:58:45 +0000 (22:58 +0100)]
Merge branch 'topic/mat-anim' into next
Tim Moore [Tue, 13 Jan 2009 21:52:19 +0000 (22:52 +0100)]
Merge branch 'maint' into next
Tim Moore [Tue, 13 Jan 2009 13:10:15 +0000 (14:10 +0100)]
SGMaterialAnimation: Don't install an update callback if values are static
Tim Moore [Tue, 13 Jan 2009 11:50:47 +0000 (12:50 +0100)]
SGMaterialAnimation: factor out update of osg::Material
fredb [Tue, 13 Jan 2009 07:49:14 +0000 (07:49 +0000)]
Csaba/Jester : fix the material animation and display night textures
Tim Moore [Mon, 12 Jan 2009 12:14:31 +0000 (13:14 +0100)]
Merge branch 'maint' into next
fredb [Sat, 10 Jan 2009 18:53:50 +0000 (18:53 +0000)]
fix end of file
fredb [Sat, 10 Jan 2009 16:12:50 +0000 (16:12 +0000)]
ignore generated files
timoore [Sat, 27 Dec 2008 08:16:03 +0000 (08:16 +0000)]
Fix include path