Show
Ignore:
Timestamp:
01/16/08 16:07:40 (1 year ago)
Author:
cneumann
Message:

changed: - factory functions return a TransitPtr? that can not be implicitly

converted to C Ptr. Should help with porting.

added: - GlobalRefPtr?, needed for cases where upon return from main

a RefPtr? goes out of scope (it would attempt to access the
FCFactory which is already shutdown at that point).

status: - vrml loader does not compile (needs porting to ref ptr)

  • tutorials compile, run and exit cleanly
  • multithreading and cluster are untested, yet
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/NodeCores/Drawables/Terrain/QuadTree/OSGTiledQuadTreeTerrain.cpp

    r1032 r1039  
    171171                for(i=0; i<roi; ++i)  
    172172                { 
    173                     QuadTreeTerrainPtr terrain = QuadTreeTerrain::create(); 
     173                    QuadTreeTerrainRefPtr terrain = QuadTreeTerrain::create(); 
    174174 
    175175                    terrain->setVertexSpacing(getVertexSpacing()); 
    …… 
    182182                    terrain->setPerPixelLighting(getPerPixelLighting()); 
    183183 
    184                     NodePtr node = Node::create(); 
     184                    NodeRefPtr node = Node::create(); 
    185185                     
    186                     addRef(node); 
    187  
    188186                    node->setCore(terrain); 
    189187                    // activate the roi*roi tiles for current point 
    190188                    // (getCurrentX()=getSizeROI(),getCurrentY()=getSizeROI()) 
    191189 
    192                     if (i < getSizeX() && j < getSizeY())  
     190                    if(i < getSizeX() && j < getSizeY())  
    193191                    { 
    194192                        terrain->setHeightData(getHeightTiles(j*getSizeX()+i)); 
    …… 
    244242                else  
    245243                { // use material of this MaterialGroup 
    246                     MaterialPtr mat = cloneMaterial(getMaterial()); 
     244                    MaterialRefPtr mat = cloneMaterial(getMaterial()); 
    247245                    terrain->setMaterial(mat); 
    248246                    terrain->setOriginTexX(i*tstepx);