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/3DS/OSG3DSSceneFileType.h

    r1033 r1039  
    7070    virtual const Char8 *getName(void) const; 
    7171 
    72     virtual NodePtr read(std::istream &is, const Char8 *fileNameOrExtension) const; 
     72    virtual NodeTransitPtr read(std::istream &is, const Char8 *fileNameOrExtension) const; 
    7373 
    7474protected: 
    …… 
    8787private: 
    8888 
    89     NodeRefPtr     createMesh    (L3DS &scene, LMesh &mesh) const; 
    90     MaterialRefPtr createMaterial(L3DS &scene, UInt32 id) const; 
    91  
    92     mutable std::map<UInt32, MaterialPtr> _materials; 
    93     typedef std::map<UInt32, MaterialPtr>::iterator materialIt; 
     89    NodeTransitPtr     createMesh    (L3DS &scene, LMesh &mesh) const; 
     90    MaterialTransitPtr createMaterial(L3DS &scene, UInt32 id) const; 
     91     
     92    typedef std::map<UInt32, MaterialRefPtr> MaterialMap; 
     93    typedef MaterialMap::iterator            MaterialMapIt; 
     94    typedef MaterialMap::const_iterator      MaterialMapConstIt; 
     95     
     96    mutable MaterialMap _materials; 
     97     
    9498}; 
    9599