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/OBJ/OSGOBJSceneFileType.h

    r799 r1039  
    8585    /*! \{                                                                 */ 
    8686 
    87     virtual NodePtr read(std::istream &is, 
    88                          const Char8 *fileNameOrExtension) const; 
     87    virtual NodeTransitPtr read(std::istream &is, 
     88                                const Char8 *fileNameOrExtension) const; 
    8989 
    9090    /*! \}                                                                 */ 
    …… 
    179179 
    180180    struct Mesh { 
    181       std::string name; 
    182       std::list<Face> faceList; 
    183       SimpleMaterialPtr mtlPtr; 
     181      std::string          name; 
     182      std::list<Face>      faceList; 
     183      SimpleMaterialRefPtr mtlPtr; 
    184184    }; 
    185185 
    …… 
    187187    Int32 readMTL (const Char8 *fileName, 
    188188                   std::map<std::string, 
    189                    SimpleTexturedMaterialPtr> &mtlMap  ) const; 
     189                   SimpleTexturedMaterialRefPtr> &mtlMap  ) const; 
    190190 
    191191    void write(const NodePtr &node,