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/Groups/DynamicStateGenerators/OSGCubeMapGenerator.cpp

    r997 r1039  
    326326        return returnValue; 
    327327 
    328     FrameBufferObjectPtr pCubeTarget  = FrameBufferObject::create(); 
    329  
    330     RenderBufferPtr      pDepthBuffer = RenderBuffer     ::create(); 
     328    FrameBufferObjectRefPtr pCubeTarget (FrameBufferObject::create()); 
     329    RenderBufferRefPtr      pDepthBuffer(RenderBuffer     ::create()); 
    331330 
    332331    pDepthBuffer->setInternalFormat(GL_DEPTH_COMPONENT24   ); 
    333332 
    334     TextureObjChunkPtr pCubeTex     = NullFC; 
     333    TextureObjChunkRefPtr   pCubeTex; 
    335334 
    336335    if(0x0000 != (_sfSetupMode.getValue() & SetupTexture)) 
    337336    { 
    338         pCubeTex = TextureObjChunk::create(); 
    339  
    340         ImagePtr           pImg         = Image          ::create(); 
     337        pCubeTex = TextureObjChunk::create(); 
     338         
     339        ImageRefPtr           pImg       (Image          ::create()); 
    341340     
    342341        pImg->set(Image::OSG_RGB_PF,  
    …… 
    364363    } 
    365364 
    366     TextureEnvChunkPtr pCubeTexEnv  = NullFC; 
     365    TextureEnvChunkRefPtr pCubeTexEnv; 
    367366 
    368367    if(0x0000 != (_sfSetupMode.getValue() & SetupTexEnv)) 
    …… 
    373372    } 
    374373 
    375     TexGenChunkPtr     pCubeTexGen  = NullFC; 
     374    TexGenChunkRefPtr     pCubeTexGen; 
    376375 
    377376    if(0x0000 != (_sfSetupMode.getValue() & SetupTexGen)) 
    …… 
    401400    for(UInt32 i = 0; i < 6; ++i) 
    402401    { 
    403         TextureBufferPtr pCubeTexBuffer = TextureBuffer::create(); 
     402        TextureBufferRefPtr pCubeTexBuffer = TextureBuffer::create(); 
    404403     
    405404        pCubeTexBuffer->setTexture  (pCubeTex  );