Show
Ignore:
Timestamp:
04/02/08 14:18:07 (8 months ago)
Author:
cneumann
Message:

replaced pointer field implementation
split FieldContainer/Fields? directory into Base and Handle subdir

Status: - ref counting seems to work (mt, cluster)

  • new OSB loader works (well, the unittest does)
  • VRML loader is deactivated
  • get/edit handle for dynamic (pointer) fields missing
  • need to remove some more old files - they get moved in this commit
  • generated (i.e. base) code in following commit
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGFieldContainerTest.cpp

    r1068 r1072  
    5151{ 
    5252    OSG::NodeRefPtr nrp = OSG::Node::create(); 
    53     CHECK(nrp->getRefCount()         == 0); 
    54     CHECK(nrp->getExternalRefCount() == 1); 
     53    CHECK(nrp->getRefCount()         == 1); 
    5554    CHECK(nrp->getWeakRefCount()     == 0); 
    5655 
    …… 
    6463    CHECK(r); 
    6564    CHECK(r.get() == nrp); 
    66     CHECK(nrp->getRefCount()         == 0); 
    67     CHECK(nrp->getExternalRefCount() == 2); 
     65    CHECK(nrp->getRefCount()         == 2); 
    6866    CHECK(nrp->getWeakRefCount()     == 0); 
    6967 
    …… 
    7270        CHECK(r2); 
    7371        CHECK(r2.get() == nrp); 
    74         CHECK(nrp->getRefCount()         == 0); 
    75         CHECK(nrp->getExternalRefCount() == 3); 
     72        CHECK(nrp->getRefCount()         == 3); 
    7673        CHECK(nrp->getWeakRefCount()     == 0); 
    7774    } 
     75     
     76    CHECK(nrp->getRefCount()         == 2); 
     77    CHECK(nrp->getWeakRefCount()     == 0); 
    7878} 
    7979 
    …… 
    147147    OSG::NodeRefPtr  node(OSG::Node::create()); 
    148148    OSG::UInt32   node_id   = node.get()->getId(); 
    149     OSG::Int32    ref_count = getRefCount(node.get()); 
     149    OSG::Int32    ref_count = node.get()->getRefCount(); 
    150150    OSG::commitChanges(); 
    151151    CHECK(OSG::FieldContainerFactory::the()->getContainer(node_id) != OSGNullFC);