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/FileIO/RAW/OSGRAWSceneFileType.cpp

    r799 r1039  
    123123#endif 
    124124 
    125 NodePtr RAWSceneFileType::read(std::istream &is, const Char8 *) const 
    126 { 
    127     NodePtr                 root; 
    128     GeometryPtr             geo; 
    129     GeoPnt3rPropertyPtr     points; 
    130     GeoVec3rPropertyPtr     normals; 
    131     GeoIntegralPropertyPtr  index; 
    132     GeoIntegralPropertyPtr  lens; 
    133     GeoIntegralPropertyPtr  type; 
     125NodeTransitPtr RAWSceneFileType::read(std::istream &is, const Char8 *) const 
     126{ 
     127    Node::ObjRefPtr                 root; 
     128    Geometry::ObjRefPtr             geo; 
     129    GeoPnt3rProperty::ObjRefPtr     points; 
     130    GeoVec3rProperty::ObjRefPtr     normals; 
     131    GeoIntegralProperty::ObjRefPtr  index; 
     132    GeoIntegralProperty::ObjRefPtr  lens; 
     133    GeoIntegralProperty::ObjRefPtr  type; 
    134134 
    135135    Vec3r vec[3]; 
    …… 
    221221        } 
    222222 
    223         SimpleMaterialPtr mat = SimpleMaterial::create(); 
     223        SimpleMaterialRefPtr mat = SimpleMaterial::create(); 
    224224 
    225225        mat->setDiffuse  (Color3r(  .8f,  .8f,  .8f)); 
    …… 
    235235    } 
    236236 
    237     return root; 
     237    return NodeTransitPtr(root); 
    238238} 
    239239