Show
Ignore:
Timestamp:
12/12/07 18:00:42 (9 months ago)
Author:
cneumann
Message:

added: generic interface
changed: factory functions return RefPtr?

The unittests don't pass right now, because of the change
to the factory functions, which leads to containers
being immediately destroyed as they are not assigned to
a RefPtr?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/Cluster/Window/BalancedMultiWindow/OSGBalancedMultiWindow.cpp

    r1017 r1032  
    855855{ 
    856856    Int32 cleft,cright,ctop,cbottom; 
    857     ViewportPtr serverPort,clientPort; 
    858     TileCameraDecoratorPtr deco; 
     857    ViewportRefPtr serverPort,clientPort; 
     858    TileCameraDecoratorRefPtr deco; 
    859859    UInt32 cv,sv=0; 
    860860 
    …… 
    929929    if(port.serverPort == NullFC) 
    930930    { 
    931         port.serverPort = dynamic_cast<ViewportPtr>(getPort()[port.id]->shallowCopy()); 
     931        port.serverPort = boost::dynamic_pointer_cast<Viewport>( 
     932            getPort()[port.id]->shallowCopy()); 
    932933        addRef(port.serverPort); 
    933934        deco = TileCameraDecorator::create(); 
    …… 
    936937    else 
    937938    { 
    938         deco = dynamic_cast<TileCameraDecoratorPtr>(port.serverPort->getCamera()); 
     939        deco = TileCameraDecoratorRefPtr(dynamic_cast<TileCameraDecoratorPtr>( 
     940            port.serverPort->getCamera())); 
    939941    } 
    940942    // decorate client camera 
    941     deco->setDecoratee( clientPort->getCamera() ); 
     943    deco->setDecoratee(clientPort->getCamera()); 
    942944 
    943945    serverPort = port.serverPort; 
    …… 
    957959    if(serverPort->getBottom() == 1.0) 
    958960        serverPort->setBottom(1.0001); 
    959     serverPort->setRoot      ( clientPort->getRoot()       ); 
    960     serverPort->setBackground( clientPort->getBackground() ); 
    961     serverPort->assignForegrounds(clientPort->getForegrounds() ); 
    962     serverPort->setTravMask  ( clientPort->getTravMask()   ); 
     961    serverPort->setRoot          (clientPort->getRoot()       ); 
     962    serverPort->setBackground    (clientPort->getBackground() ); 
     963    serverPort->assignForegrounds(clientPort->getForegrounds()); 
     964    serverPort->setTravMask      (clientPort->getTravMask()   ); 
    963965     
    964966    // calculate tile parameters