Changeset 1169

Show
Ignore:
Timestamp:
04/16/08 02:25:38 (4 weeks ago)
Author:
vossg
Message:

readded: cored node ptr

: background loader

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Source/Base/Base/OSGContainerForwards.h

    r1168 r1169  
    242242} 
    243243 
     244template <class CoreT> 
     245class CoredNodeMTRefPtr; 
     246 
     247template <class CoreT> 
     248class CoredNodeRefPtr; 
     249 
     250 
    244251OSG_END_NAMESPACE 
    245252 

  • trunk/Source/Contrib/BackgroundLoader/build.info

    r1085 r1169  
    1414   test_libpath = [] 
    1515  
    16 stop_traversal = True 

  • trunk/Source/Contrib/BackgroundLoader/testBackgroundLoader.cpp

    r790 r1169  
    2727// The SimpleSceneManager to manage simple applications 
    2828SimpleSceneManager *mgr; 
    29 GroupNodePtr gScene; 
     29GroupNodeRefPtr gScene; 
    3030 
    3131unsigned gNextModelIdx = 0; 
    …… 
    6464   {  
    6565      std::cerr << "ERROR: path does not exist: " << dirname << std::endl;  
     66      gScene = NodePtr(NullFC); 
     67      osgExit(); 
    6668      exit(-1); 
    6769   } 
    …… 
    9294    osgInit(argc,argv); 
    9395 
    94     gScene = GroupNodePtr::create(); 
     96    gScene = GroupNodeRefPtr::create(); 
    9597 
    9698    if (argc < 2) 
    9799    { 
    98100       std::cout << "Specify a directory to load models from." << std::endl; 
     101       gScene = NodePtr(NullFC); 
     102       osgExit(); 
    99103       exit(-1); 
    100104    } 
    …… 
    109113 
    110114    // the connection between GLUT and OpenSG 
    111     GLUTWindowPtr gwin= GLUTWindow::create(); 
     115    GLUTWindowUnrecPtr gwin= GLUTWindow::create(); 
    112116    gwin->setGlutId(winid); 
    113117    gwin->init(); 
    …… 
    182186        case 27: 
    183187        { 
     188            delete mgr; 
     189            gScene = NodePtr(NullFC); 
    184190            OSG::osgExit(); 
    185191            exit(0); 

  • trunk/Source/System/FieldContainer/Node/OSGNode.h

    r1160 r1169  
    535535#include "OSGNodeCore.h" 
    536536#include "OSGNode.inl" 
    537 #if 0 
    538537#include "OSGCoredNodePtr.h" 
    539 #endif 
    540538 
    541539#endif /* _OSGNODE_H_ */ 

  • trunk/Tools/fcd2code/FieldContainer.py

    r1155 r1169  
    225225                if not field.isPtrField(): 
    226226                    self["hasValueMField"] = True; 
    227          
     227 
     228        if self.getFCD("isNodeCore") == "true" or self.getFCD("isNodeCore") == "True": 
     229            self["isNodeCore"] = True; 
     230        else: 
     231            self["isNodeCore"] = False; 
     232             
    228233        self["PointerField"]   = False; 
    229234        self["SFPointerField"] = False; 

  • trunk/Tools/fcd2code/TemplateFieldContainerBase_h.txt

    r1155 r1169  
    731731 
    732732typedef @!Classname!@Base *@!Classname!@BaseP; 
     733@@if isNodeCore 
     734 
     735typedef CoredNodeRefPtr  <@!Classname!@> @!Classname!@NodeRefPtr; 
     736typedef CoredNodeMTRefPtr<@!Classname!@> @!Classname!@NodeMTRefPtr; 
     737@@endif 
    733738 
    734739OSG_END_NAMESPACE