]> git.mxchange.org Git - simgear.git/log
simgear.git
15 years agoImplement current osgDB::ReaderWriters supportsExtension interface instead
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

15 years agoAttach the ModelData to the options instead of the userdata field.
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

15 years ago * Add a function to create a node after the laste node with the same name
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.

15 years agoMerge branch 'maint' into next
Tim Moore [Sun, 17 May 2009 22:34:06 +0000 (00:34 +0200)]
Merge branch 'maint' into next

15 years agoMake SimGear compile with osg trunk
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

15 years ago- fix one broken #include path (in a not usually compiled test app)
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.)

15 years agotcpserver: typo
mfranz [Wed, 6 May 2009 16:17:05 +0000 (16:17 +0000)]
tcpserver: typo

15 years agofix leaks
mfranz [Wed, 6 May 2009 06:32:09 +0000 (06:32 +0000)]
fix leaks

15 years agoadd a bit of comment
ehofman [Sat, 25 Apr 2009 09:57:06 +0000 (09:57 +0000)]
add a bit of comment

15 years agoStuart Buchanan :
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.

15 years agoRevert most of the previous patch, it didn't improve the dome since it wat adjusting...
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

15 years agoPut some annotations into the loaded models names.
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

15 years agoRemove a newline printf, probably left over from development.
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

15 years agoLet the fog color transition into the sky dome to give a more natural effect
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

15 years agoFix a NaN at higher altitudes: sin_beta could become greater than 1.0 which is hard...
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.

15 years agoRemove unused variables.
frohlich [Thu, 2 Apr 2009 05:38:34 +0000 (05:38 +0000)]
Remove unused variables.

Modified Files:
simgear/bucket/newbucket.hxx

15 years agoMerge branch 'maint' into next
Tim Moore [Mon, 30 Mar 2009 22:04:30 +0000 (00:04 +0200)]
Merge branch 'maint' into next

15 years agofix wrong bucket calculation for western hemisphere, close to poles, full-degree...
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

15 years agoMakes more sense to process the orientation in this order.
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

15 years agoClean up placementtrans a bit.
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

15 years agoZap aliasing compiler warnings.
frohlich [Tue, 24 Mar 2009 08:11:36 +0000 (08:11 +0000)]
Zap aliasing compiler warnings.

Modified Files:
  simgear/io/lowlevel.cxx

15 years agoRemove second, identical to the first one license header.
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

15 years agoRemove unused header.
frohlich [Tue, 24 Mar 2009 08:09:34 +0000 (08:09 +0000)]
Remove unused header.

Modified Files:
simgear/scene/tgdb/TileEntry.cxx

15 years agoMake it compile with gcc-4.4.
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

15 years agoMake use of optimized matrix multiplication routines in osg.
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

15 years agoNo longer change the material properties for ac models on the fly.
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

15 years agoCleanup. Use already structured data instead of copying stuff.
frohlich [Tue, 17 Mar 2009 12:25:26 +0000 (12:25 +0000)]
Cleanup. Use already structured data instead of copying stuff.

15 years agoAdd const accessors.
frohlich [Tue, 17 Mar 2009 12:23:15 +0000 (12:23 +0000)]
Add const accessors.

Modified Files:
simgear/ephemeris/ephemeris.hxx

15 years agoMake sure the boundingvolumes for the btg files are as high as possible
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

15 years agoUse triangle sphere intersection directly.
frohlich [Sun, 15 Mar 2009 12:56:02 +0000 (12:56 +0000)]
Use triangle sphere intersection directly.

Modified Files:
simgear/scene/bvh/BVHSubTreeCollector.cxx

15 years agoMake triangle sphere intersection tests usable with mixes types.
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

15 years agoPreparations for improoved timing behaviour.
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

15 years agoAdd a reference time to the velocity stuff.
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

15 years agoThe chunked stuff is no longer needed for the ground tiles.
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

15 years agoAlso align the ocean tiles with some horizontal axis.
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

15 years agoImproove bounding volume building in the scenery loading process.
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

15 years agoMake the debug geometry stuff work with a time argument.
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

15 years agoCompile under windows
fredb [Fri, 13 Mar 2009 07:33:38 +0000 (07:33 +0000)]
Compile under windows

15 years agoMake sure each carrier gets its own valocity.
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

15 years agowarning--
mfranz [Thu, 12 Mar 2009 20:07:47 +0000 (20:07 +0000)]
warning--

15 years agoMake use of posix clocks if available.
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

15 years agoUse a reference counted pointer for the condition.
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

15 years agoRemove unused methods.
frohlich [Tue, 10 Mar 2009 19:23:19 +0000 (19:23 +0000)]
Remove unused methods.

Modified Files:
material/matmodel.hxx material/matmodel.cxx

15 years agoMake local functions static.
frohlich [Tue, 10 Mar 2009 19:22:08 +0000 (19:22 +0000)]
Make local functions static.

Modified Files:
model/SGReaderWriterXML.cxx

15 years agoRemove unused functions/includes ...
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

15 years agoZap SGLocation.
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

15 years agoIgnore winding order since it is ignored later anyway.
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

15 years agoUse SGGeod in the model placement.
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

15 years agoAdd convenience function to keep position with just an other elevation.
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

15 years agoFirst step for something doing static friction stuff.
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

15 years agoAvoid duplicate triangles.
frohlich [Tue, 3 Mar 2009 08:25:19 +0000 (08:25 +0000)]
Avoid duplicate triangles.

Modified Files:
simgear/scene/bvh/BVHStaticGeometryBuilder.hxx

15 years agoRemove the StaticLeaf visitor slot.
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

15 years agoCrude hack to work around my today introduced collision tree sharing problem.
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

15 years agoDon't waste space with too huge stl containers.
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

15 years agoDon't waste space with too huge stl containers.
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

15 years agoWin32 fix
fredb [Sun, 1 Mar 2009 15:50:45 +0000 (15:50 +0000)]
Win32 fix

15 years agoBuild boundingvolumes in the model loading phase.
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

15 years agoUpdate MSVC 7.1 projects - Add the BVH library
fredb [Sun, 1 Mar 2009 12:50:39 +0000 (12:50 +0000)]
Update MSVC 7.1 projects - Add the BVH library

15 years agoSGMatrix<T>::preMultTranslate should return self ( as postMultTranslate do )
fredb [Sun, 1 Mar 2009 12:49:52 +0000 (12:49 +0000)]
SGMatrix<T>::preMultTranslate should return self ( as postMultTranslate do )

15 years agoBVHLineSegmentVisitor::setLineSegmentEnd doesn't return anything
fredb [Sun, 1 Mar 2009 12:48:15 +0000 (12:48 +0000)]
BVHLineSegmentVisitor::setLineSegmentEnd doesn't return anything

15 years agoImplement setters for velocity notes in the model placement code.
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

15 years agoMore data to attach to the user data field.
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

15 years agoInclude the bounding volume tree on the build system.
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

15 years agoInitial commit of the bounding volume tree implementation.
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

15 years agoAdditions for the boundingvolumes
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

15 years agoRotate the scenery tiles so that the horizont is axis aligned.
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

15 years agoMake material get helper function static.
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

15 years agoInitialize random number for the tests.
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

15 years agoUse template arguments instead of hard coded double.
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

15 years agoInitialize uninitialized variables.
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

15 years agoFix problem in unit quaternion return.
frohlich [Fri, 27 Feb 2009 05:16:52 +0000 (05:16 +0000)]
Fix problem in unit quaternion return.

Modified Files:
SGQuat.hxx

15 years agoMake make check link again.
frohlich [Fri, 27 Feb 2009 05:16:12 +0000 (05:16 +0000)]
Make make check link again.

Modified Files:
simgear/math/Makefile.am

15 years agoThe scenery center is history for a long time now.
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

15 years agoSmall cleanups, bug fixes and improovements to the geometry/math stuff.
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

15 years agoTorsten Dreyer: the rotate animation has two ways to define a axis
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.

15 years agoFix to compile with MSC
fredb [Thu, 19 Feb 2009 20:41:36 +0000 (20:41 +0000)]
Fix to compile with MSC

15 years agoMerge branch 'topic/nasal' into next
Tim Moore [Sun, 15 Feb 2009 23:48:00 +0000 (00:48 +0100)]
Merge branch 'topic/nasal' into next

15 years ago"io.flush() implementation from Melchior. Also add a final filetype
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)

15 years agoMerge branch 'topic/gcintersect' into next
Tim Moore [Fri, 13 Feb 2009 09:07:15 +0000 (10:07 +0100)]
Merge branch 'topic/gcintersect' into next

15 years agoNew getPrimitive function.
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.

15 years agoMake SGSubsystemGroup::Member copy constructor private.
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.

15 years agoMerge branch 'topic/cloudz' into next
Tim Moore [Fri, 6 Feb 2009 18:16:19 +0000 (19:16 +0100)]
Merge branch 'topic/cloudz' into next

15 years agoTurn off z buffer writes for clouds.
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.

15 years agoUpdate MSVC 7.1 projects - Remove pthreads dependency
fredb [Sun, 25 Jan 2009 11:53:35 +0000 (11:53 +0000)]
Update MSVC 7.1 projects - Remove pthreads dependency

15 years agoMerge branch 'maint' into next
Tim Moore [Wed, 4 Feb 2009 10:03:20 +0000 (11:03 +0100)]
Merge branch 'maint' into next

15 years agoMerge branch 'releng/1.9.1' into maint
Tim Moore [Wed, 4 Feb 2009 10:02:30 +0000 (11:02 +0100)]
Merge branch 'releng/1.9.1' into maint

15 years agoSynchronize the version number with our mainantance release.
durk [Mon, 2 Feb 2009 05:34:13 +0000 (05:34 +0000)]
Synchronize the version number with our mainantance release.

15 years agoBuild trees under a transform note that is rotated to Z-up.
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.

15 years agoDon't expand all the trees into display lists.
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.

15 years agoMerge branch 'topic/yontree' into next
Tim Moore [Wed, 28 Jan 2009 06:53:38 +0000 (07:53 +0100)]
Merge branch 'topic/yontree' into next

15 years agoMerge branch 'maint' into next
Tim Moore [Wed, 28 Jan 2009 06:53:31 +0000 (07:53 +0100)]
Merge branch 'maint' into next

15 years ago For the first time (no pun intended) in almost ten years time (again no
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.

15 years agoCsaba HALASZ: set _arg even if there's no <command> (crash fix)
mfranz [Mon, 26 Jan 2009 18:01:48 +0000 (18:01 +0000)]
Csaba HALASZ: set _arg even if there's no <command> (crash fix)

15 years agoUse osg::Geometry code to draw trees ourselves.
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.

15 years agoMerge branch 'topic/modelopt' into next
Tim Moore [Fri, 23 Jan 2009 22:27:48 +0000 (23:27 +0100)]
Merge branch 'topic/modelopt' into next

15 years agoMerge branch 'topic/yontree' into next
Tim Moore [Fri, 23 Jan 2009 22:27:37 +0000 (23:27 +0100)]
Merge branch 'topic/yontree' into next

15 years agoQuadTreeBuilder: create leaves on demand
Tim Moore [Fri, 23 Jan 2009 13:36:53 +0000 (14:36 +0100)]
QuadTreeBuilder: create leaves on demand

This avoids lots of empty leaves.

15 years agoRewrite ShaderGeometry to use display lists and OSG primitives.
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.

15 years agoOptimize empty groups from .ac models
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.

15 years agoMerge branch 'maint' into next
Tim Moore [Sun, 18 Jan 2009 23:13:07 +0000 (00:13 +0100)]
Merge branch 'maint' into next