Hi,
[EMAIL PROTECTED] wrote:
> Author: cneumann
> Date: Thu Jul 24 15:24:28 2008
> New Revision: 1387
> Trac changeset: http://opensg.vrsource.org/trac/changeset/1387
> ViewVC: http://realityforge.vrsource.org/viewvc/opensg?view=rev&revision=1387
>
> Added:
> trunk/Source/System/GraphOp/OSGGeometryMergeGraphOp.cpp
> trunk/Source/System/GraphOp/OSGGeometryMergeGraphOp.h
> - copied, changed from r1386,
> trunk/Source/System/NodeCores/Drawables/Geometry/Properties/OSGGeoPropertyFactory.h
> trunk/Source/System/GraphOp/OSGGroupMergeGraphOp.cpp
> trunk/Source/System/GraphOp/OSGGroupMergeGraphOp.h
> trunk/Source/System/GraphOp/OSGMaterialGroupPushGraphOp.cpp
> trunk/Source/System/GraphOp/OSGMaterialGroupPushGraphOp.h
> trunk/Source/System/GraphOp/OSGTransformPushGraphOp.cpp
> trunk/Source/System/GraphOp/OSGTransformPushGraphOp.h
> Modified:
> trunk/Source/System/GraphOp/Base/OSGGraphOp.cpp
> trunk/Source/System/GraphOp/Base/OSGGraphOp.h
> trunk/Source/System/GraphOp/Base/OSGGraphOpFactory.cpp
> trunk/Source/System/GraphOp/Base/OSGGraphOpFactory.h
> trunk/Source/System/GraphOp/Base/OSGGraphOpSeq.cpp
> trunk/Source/System/GraphOp/Base/OSGGraphOpSeq.h
> trunk/Source/System/GraphOp/OSGGeoTypeGraphOp.cpp
> trunk/Source/System/GraphOp/OSGGeoTypeGraphOp.h
> trunk/Source/System/GraphOp/OSGMakeTransparentGraphOp.cpp
> trunk/Source/System/GraphOp/OSGMakeTransparentGraphOp.h
> trunk/Source/System/GraphOp/OSGMaterialMergeGraphOp.cpp
> trunk/Source/System/GraphOp/OSGMaterialMergeGraphOp.h
> trunk/Source/System/GraphOp/OSGMergeGraphOp.cpp
> trunk/Source/System/GraphOp/OSGMergeGraphOp.h
> trunk/Source/System/GraphOp/OSGPruneGraphOp.cpp
> trunk/Source/System/GraphOp/OSGPruneGraphOp.h
> trunk/Source/System/GraphOp/OSGSharePtrGraphOp.cpp
> trunk/Source/System/GraphOp/OSGSharePtrGraphOp.h
> trunk/Source/System/GraphOp/OSGSingleTypeGraphOp.inl
> trunk/Source/System/GraphOp/OSGSplitGraphOp.cpp
> trunk/Source/System/GraphOp/OSGSplitGraphOp.h
> trunk/Source/System/GraphOp/OSGStripeGraphOp.cpp
> trunk/Source/System/GraphOp/OSGStripeGraphOp.h
> trunk/Source/System/GraphOp/OSGVerifyGeoGraphOp.cpp
> trunk/Source/System/GraphOp/OSGVerifyGeoGraphOp.h
> trunk/Source/System/GraphOp/OSGVerifyGraphOp.cpp
> trunk/Source/System/GraphOp/OSGVerifyGraphOp.h
>
> trunk/Source/System/NodeCores/Drawables/Geometry/Properties/OSGGeoIntegralProperty.h
>
> trunk/Source/System/NodeCores/Drawables/Geometry/Properties/OSGGeoIntegralProperty.inl
>
> trunk/Source/System/NodeCores/Drawables/Geometry/Properties/OSGGeoMultiProperty.cpp
>
> trunk/Source/System/NodeCores/Drawables/Geometry/Properties/OSGGeoMultiProperty.h
>
> trunk/Source/System/NodeCores/Drawables/Geometry/Properties/OSGGeoProperty.h
>
> trunk/Source/System/NodeCores/Drawables/Geometry/Properties/OSGGeoPropertyFactory.cpp
>
> trunk/Source/System/NodeCores/Drawables/Geometry/Properties/OSGGeoPropertyFactory.h
>
> trunk/Source/System/NodeCores/Drawables/Geometry/Properties/OSGGeoPropertyFactory.inl
>
> trunk/Source/System/NodeCores/Drawables/Geometry/Properties/OSGTypedGeoVectorProperty.h
>
> trunk/Source/System/NodeCores/Drawables/Geometry/Properties/OSGTypedGeoVectorProperty.inl
> trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoFunctions.cpp
> trunk/Source/WindowSystem/GLUT/testWindowGLUT.cpp
> Log:
> Merge branch 'merge_graph_op'
sorry about the log message, this was my first experiment doing a
git-svn dcommit.
FVIW, this is what I'd like to have used as log:
added: GroupMergeGraphOp, GeometryMergeGraphOp,
MaterialGroupPushGraphOp, TransformPushGraphOp
GeoProperty::getVectorType to distinguish between Pnt,Vec,Color
fixed: mergeGeo makes use of getVectorType for deciding merged property
types
use ref ptr/transit ptr in GraphOp and GraphOp{Factory, Seq}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Opensg-core mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensg-core
