Changeset 3528

Show
Ignore:
Timestamp:
10/24/04 22:04:00 (10 years ago)
Author:
robert
Message:

Changed ABSOLUTE and RELATIVE to ABSOLUTE_RF and RELATIVE_RF to avoid stooppid Win32 #define

Location:
OpenSceneGraph/trunk
Files:
35 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/examples/osgdistortion/osgdistortion.cpp

    r3516 r3528  
    145145    // create the hud. 
    146146    osg::MatrixTransform* modelview_abs = new osg::MatrixTransform; 
    147     modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE); 
     147    modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF); 
    148148    modelview_abs->setMatrix(osg::Matrix::identity()); 
    149149    modelview_abs->addChild(geode); 
  • OpenSceneGraph/trunk/examples/osgforest/osgforest.cpp

    r3516 r3528  
    745745    // create the hud. 
    746746    osg::MatrixTransform* modelview_abs = new osg::MatrixTransform; 
    747     modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE); 
     747    modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF); 
    748748    modelview_abs->setMatrix(osg::Matrix::identity()); 
    749749    modelview_abs->addChild(geode); 
  • OpenSceneGraph/trunk/examples/osgfxbrowser/osgfxbrowser.cpp

    r3516 r3528  
    233233 
    234234        osg::ref_ptr<osg::MatrixTransform> xform = new osg::MatrixTransform(osg::Matrix::identity()); 
    235         xform->setReferenceFrame(osg::Transform::ABSOLUTE); 
     235        xform->setReferenceFrame(osg::Transform::ABSOLUTE_RF); 
    236236        proj->addChild(xform.get()); 
    237237 
  • OpenSceneGraph/trunk/examples/osghud/osghud.cpp

    r3516 r3528  
    103103        text->setFont(timesFont); 
    104104        text->setPosition(position); 
    105         text->setText("And add an osg::ModelViewMatrix set to ABSOLUTE to ensure\nit remains independent from any external model view matrices."); 
     105        text->setText("And add an osg::ModelViewMatrix set to ABSOLUTE_RF to ensure\nit remains independent from any external model view matrices."); 
    106106         
    107107        position += delta; 
     
    149149    // create the hud. 
    150150    osg::MatrixTransform* modelview_abs = new osg::MatrixTransform; 
    151     modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE); 
     151    modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF); 
    152152    modelview_abs->setMatrix(osg::Matrix::identity()); 
    153153    modelview_abs->addChild(geode); 
  • OpenSceneGraph/trunk/examples/osglauncher/osglauncher.cpp

    r3516 r3528  
    112112    // Can pick texts too! 
    113113    osg::MatrixTransform* modelview_abs = new osg::MatrixTransform; 
    114     modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE); 
     114    modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF); 
    115115    modelview_abs->setMatrix(osg::Matrix::identity()); 
    116116     
  • OpenSceneGraph/trunk/examples/osgparticle/osgparticle.cpp

    r3516 r3528  
    4848        void beginOperate(osgParticle::Program *prg) 
    4949        { 
    50                 // we have to check whether the reference frame is relative to parents 
     50                // we have to check whether the reference frame is RELATIVE_RF to parents 
    5151                // or it's absolute; in the first case, we must transform the vectors 
    5252                // from local to world space. 
    53                 if (prg->getReferenceFrame() == osgParticle::Program::RELATIVE) { 
     53                if (prg->getReferenceFrame() == osgParticle::Program::RELATIVE_RF) { 
    5454                        // transform the center point (full transformation) 
    5555                        xf_center_ = prg->transformLocalToWorld(center_); 
  • OpenSceneGraph/trunk/examples/osgphotoalbum/osgphotoalbum.cpp

    r3516 r3528  
    8181    virtual bool computeLocalToWorldMatrix(osg::Matrix& matrix,osg::NodeVisitor*) const  
    8282    { 
    83         if (_referenceFrame==RELATIVE) 
     83        if (_referenceFrame==RELATIVE_RF) 
    8484        { 
    8585            matrix.preMult(getMatrix()); 
     
    9797        const osg::Matrix& inverse = getInverseMatrix(); 
    9898 
    99         if (_referenceFrame==RELATIVE) 
     99        if (_referenceFrame==RELATIVE_RF) 
    100100        { 
    101101            matrix.postMult(inverse); 
  • OpenSceneGraph/trunk/examples/osgpick/osgpick.cpp

    r3516 r3528  
    113113    // Can pick texts too! 
    114114    osg::MatrixTransform* modelview_abs = new osg::MatrixTransform; 
    115     modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE); 
     115    modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF); 
    116116    modelview_abs->setMatrix(osg::Matrix::identity()); 
    117117     
  • OpenSceneGraph/trunk/examples/osgscalarbar/osgscalarbar.cpp

    r3516 r3528  
    8585 
    8686    osg::MatrixTransform * modelview = new osg::MatrixTransform; 
    87     modelview->setReferenceFrame(osg::Transform::ABSOLUTE); 
     87    modelview->setReferenceFrame(osg::Transform::ABSOLUTE_RF); 
    8888    osg::Matrixd matrix(osg::Matrixd::scale(1000,1000,1000) * osg::Matrixd::translate(120,10,0)); // I've played with these values a lot and it seems to work, but I have no idea why 
    8989    modelview->setMatrix(matrix); 
  • OpenSceneGraph/trunk/examples/osgtesselate/osgtesselate.cpp

    r3516 r3528  
    526526    // create the hud. 
    527527    osg::MatrixTransform* modelview_abs = new osg::MatrixTransform; 
    528     modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE); 
     528    modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF); 
    529529    modelview_abs->setMatrix(osg::Matrix::identity()); 
    530530    modelview_abs->addChild(geode); 
  • OpenSceneGraph/trunk/examples/osgtext/osgtext.cpp

    r3516 r3528  
    502502 
    503503            osg::MatrixTransform* modelview_abs = new osg::MatrixTransform; 
    504             modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE); 
     504            modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF); 
    505505            modelview_abs->setMatrix(osg::Matrix::identity()); 
    506506 
  • OpenSceneGraph/trunk/examples/osgtexturerectangle/osgtexturerectangle.cpp

    r3516 r3528  
    210210    // create HUD 
    211211    osg::MatrixTransform* modelview_abs = new osg::MatrixTransform; 
    212     modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE); 
     212    modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF); 
    213213    modelview_abs->setMatrix(osg::Matrix::identity()); 
    214214    modelview_abs->addChild(group); 
  • OpenSceneGraph/trunk/include/osg/LightSource

    r3516 r3528  
    3939        enum ReferenceFrame 
    4040        { 
    41             RELATIVE, 
    42             ABSOLUTE 
     41            RELATIVE_RF, 
     42            ABSOLUTE_RF 
    4343#ifdef USE_DEPRECATED_API 
    4444            , 
    45             RELATIVE_TO_PARENTS=RELATIVE, 
    46             RELATIVE_TO_ABSOLUTE=ABSOLUTE, 
     45            RELATIVE_TO_PARENTS=RELATIVE_RF, 
     46            RELATIVE_TO_ABSOLUTE=ABSOLUTE_RF, 
    4747#endif 
    4848        }; 
     
    5050        /** Set the light sources's ReferenceFrame, either to be relative to its 
    5151          * parent reference frame, or relative to an absolute coordinate 
    52           * frame. RELATIVE is the default. 
    53           * Note: setting the ReferenceFrame to be RELATIVE_TO_ABSOLUTE will 
     52          * frame. RELATIVE_RF is the default. 
     53          * Note: setting the ReferenceFrame to be ABSOLUTE_RF will 
    5454          * also set the CullingActive flag on the light source, and hence all 
    5555          * of its parents, to false, thereby disabling culling of it and 
  • OpenSceneGraph/trunk/include/osg/Transform

    r3516 r3528  
    9090        enum ReferenceFrame 
    9191        { 
    92             RELATIVE, 
    93             ABSOLUTE 
     92            RELATIVE_RF, 
     93            ABSOLUTE_RF 
    9494#ifdef USE_DEPRECATED_API 
    9595            , 
    96             RELATIVE_TO_PARENTS=RELATIVE, 
    97             RELATIVE_TO_ABSOLUTE=ABSOLUTE, 
     96            RELATIVE_TO_PARENTS=RELATIVE_RF, 
     97            RELATIVE_TO_ABSOLUTE=ABSOLUTE_RF, 
    9898#endif 
    9999        }; 
     
    101101        /** Set the transform's ReferenceFrame, either to be relative to its 
    102102          * parent reference frame, or relative to an absolute coordinate 
    103           * frame. RELATIVE is the default. 
    104           * Note: Setting the ReferenceFrame to be RELATIVE_TO_ABSOLUTE will 
     103          * frame. RELATIVE_RF is the default. 
     104          * Note: Setting the ReferenceFrame to be ABSOLUTE_RF will 
    105105          * also set the CullingActive flag on the transform, and hence all 
    106106          * of its parents, to false, thereby disabling culling of it and 
     
    117117        virtual bool computeLocalToWorldMatrix(Matrix& matrix,NodeVisitor*) const 
    118118        { 
    119             if (_referenceFrame==RELATIVE) 
     119            if (_referenceFrame==RELATIVE_RF) 
    120120            { 
    121121                return false; 
     
    130130        virtual bool computeWorldToLocalMatrix(Matrix& matrix,NodeVisitor*) const 
    131131        { 
    132             if (_referenceFrame==RELATIVE) 
     132            if (_referenceFrame==RELATIVE_RF) 
    133133            { 
    134134                return false; 
  • OpenSceneGraph/trunk/include/osgParticle/AccelOperator

    r3516 r3528  
    9696    inline void AccelOperator::beginOperate(Program *prg) 
    9797    { 
    98         if (prg->getReferenceFrame() == ModularProgram::RELATIVE) { 
     98        if (prg->getReferenceFrame() == ModularProgram::RELATIVE_RF) { 
    9999            xf_accel_ = prg->rotateLocalToWorld(accel_); 
    100100        } else { 
  • OpenSceneGraph/trunk/include/osgParticle/AngularAccelOperator

    r3516 r3528  
    8787    inline void AngularAccelOperator::beginOperate(Program *prg) 
    8888    { 
    89         if (prg->getReferenceFrame() == ModularProgram::RELATIVE) { 
     89        if (prg->getReferenceFrame() == ModularProgram::RELATIVE_RF) { 
    9090            xf_angular_accel_ = prg->rotateLocalToWorld(angular_accel_); 
    9191        } else { 
  • OpenSceneGraph/trunk/include/osgParticle/ForceOperator

    r3516 r3528  
    8888    inline void ForceOperator::beginOperate(Program *prg) 
    8989    { 
    90         if (prg->getReferenceFrame() == ModularProgram::RELATIVE) { 
     90        if (prg->getReferenceFrame() == ModularProgram::RELATIVE_RF) { 
    9191            xf_force_ = prg->rotateLocalToWorld(force_); 
    9292        } else { 
  • OpenSceneGraph/trunk/include/osgParticle/Operator

    r3516 r3528  
    5858        /** Do something before processing particles via the <CODE>operate()</CODE> method. 
    5959            Overriding this method could be necessary to query the calling <CODE>Program</CODE> object 
    60             for the current reference frame. If the reference frame is RELATIVE, then your 
     60            for the current reference frame. If the reference frame is RELATIVE_RF, then your 
    6161            class should prepare itself to do all operations in local coordinates. 
    6262        */ 
  • OpenSceneGraph/trunk/include/osgParticle/ParticleProcessor

    r3516 r3528  
    4040     
    4141        enum ReferenceFrame { 
    42             RELATIVE, 
    43             ABSOLUTE 
     42            RELATIVE_RF, 
     43            ABSOLUTE_RF 
    4444#ifdef USE_DEPRECATED_API 
    4545            , 
    46             RELATIVE_TO_PARENTS=RELATIVE, 
    47             RELATIVE_TO_ABSOLUTE=ABSOLUTE, 
     46            RELATIVE_RF_TO_PARENTS=RELATIVE_RF, 
     47            RELATIVE_RF_TO_ABSOLUTE=ABSOLUTE_RF, 
    4848#endif 
    4949        }; 
  • OpenSceneGraph/trunk/src/osg/AutoTransform.cpp

    r3516 r3528  
    4646    if (_matrixDirty) computeMatrix(); 
    4747     
    48     if (_referenceFrame==RELATIVE) 
     48    if (_referenceFrame==RELATIVE_RF) 
    4949    { 
    5050        matrix.preMult(_cachedMatrix); 
     
    6060bool AutoTransform::computeWorldToLocalMatrix(Matrix& matrix,NodeVisitor*) const 
    6161{ 
    62     if (_referenceFrame==RELATIVE) 
     62    if (_referenceFrame==RELATIVE_RF) 
    6363    { 
    6464        matrix.postMult(osg::Matrix::translate(-_position)* 
  • OpenSceneGraph/trunk/src/osg/Group.cpp

    r3520 r3528  
    361361    { 
    362362        const osg::Transform* transform = (*itr)->asTransform(); 
    363         if (!transform || transform->getReferenceFrame()==osg::Transform::RELATIVE) 
     363        if (!transform || transform->getReferenceFrame()==osg::Transform::RELATIVE_RF) 
    364364        { 
    365365            bb.expandBy((*itr)->getBound()); 
     
    380380    { 
    381381        const osg::Transform* transform = (*itr)->asTransform(); 
    382         if (!transform || transform->getReferenceFrame()==osg::Transform::RELATIVE) 
     382        if (!transform || transform->getReferenceFrame()==osg::Transform::RELATIVE_RF) 
    383383        { 
    384384            _bsphere.expandRadiusBy((*itr)->getBound()); 
  • OpenSceneGraph/trunk/src/osg/LightSource.cpp

    r3516 r3528  
    1717LightSource::LightSource(): 
    1818    _value(StateAttribute::ON), 
    19     _referenceFrame(RELATIVE) 
     19    _referenceFrame(RELATIVE_RF) 
    2020{ 
    2121    // switch off culling of light source nodes by default. 
     
    3434{ 
    3535    _referenceFrame = rf; 
    36     setCullingActive(_referenceFrame==RELATIVE); 
     36    setCullingActive(_referenceFrame==RELATIVE_RF); 
    3737} 
    3838 
     
    6363    Group::computeBound(); 
    6464     
    65     if (_light.valid() && _referenceFrame==RELATIVE) 
     65    if (_light.valid() && _referenceFrame==RELATIVE_RF) 
    6666    { 
    6767        const Vec4& pos = _light->getPosition(); 
  • OpenSceneGraph/trunk/src/osg/MatrixTransform.cpp

    r3516 r3528  
    3030MatrixTransform::MatrixTransform(const Matrix& mat ) 
    3131{ 
    32     _referenceFrame = RELATIVE; 
     32    _referenceFrame = RELATIVE_RF; 
    3333 
    3434    _matrix = mat; 
     
    4343bool MatrixTransform::computeLocalToWorldMatrix(Matrix& matrix,NodeVisitor*) const 
    4444{ 
    45     if (_referenceFrame==RELATIVE) 
     45    if (_referenceFrame==RELATIVE_RF) 
    4646    { 
    4747        matrix.preMult(_matrix); 
     
    5858    const Matrix& inverse = getInverseMatrix(); 
    5959 
    60     if (_referenceFrame==RELATIVE) 
     60    if (_referenceFrame==RELATIVE_RF) 
    6161    { 
    6262        matrix.postMult(inverse); 
  • OpenSceneGraph/trunk/src/osg/PositionAttitudeTransform.cpp

    r3516 r3528  
    2222bool PositionAttitudeTransform::computeLocalToWorldMatrix(Matrix& matrix,NodeVisitor*) const 
    2323{ 
    24     if (_referenceFrame==RELATIVE) 
     24    if (_referenceFrame==RELATIVE_RF) 
    2525    { 
    2626        matrix.preMult(osg::Matrix::translate(-_pivotPoint)* 
     
    4242bool PositionAttitudeTransform::computeWorldToLocalMatrix(Matrix& matrix,NodeVisitor*) const 
    4343{ 
    44     if (_referenceFrame==RELATIVE) 
     44    if (_referenceFrame==RELATIVE_RF) 
    4545    { 
    4646        matrix.postMult(osg::Matrix::translate(-_position)* 
  • OpenSceneGraph/trunk/src/osg/Transform.cpp

    r3516 r3528  
    9999Transform::Transform() 
    100100{ 
    101     _referenceFrame = RELATIVE; 
     101    _referenceFrame = RELATIVE_RF; 
    102102} 
    103103 
     
    119119     
    120120    // switch off culling if transform is absolute. 
    121     if (_referenceFrame==RELATIVE) setCullingActive(false); 
     121    if (_referenceFrame==RELATIVE_RF) setCullingActive(false); 
    122122    else setCullingActive(true); 
    123123} 
  • OpenSceneGraph/trunk/src/osgParticle/FluidFrictionOperator.cpp

    r3516 r3528  
    3838    osg::Vec3 Fr(-R * v.x(), -R * v.y(), -R * v.z()); 
    3939 
    40     if (current_program_->getReferenceFrame() == ModularProgram::RELATIVE) { 
     40    if (current_program_->getReferenceFrame() == ModularProgram::RELATIVE_RF) { 
    4141        Fr = current_program_->rotateLocalToWorld(Fr); 
    4242    } 
  • OpenSceneGraph/trunk/src/osgParticle/ModularEmitter.cpp

    r3516 r3528  
    2626            placer_->place(P); 
    2727            shooter_->shoot(P); 
    28             if (getReferenceFrame() == RELATIVE) { 
     28            if (getReferenceFrame() == RELATIVE_RF) { 
    2929                P->transformPositionVelocity(getLocalToWorldMatrix()); 
    3030            } 
  • OpenSceneGraph/trunk/src/osgParticle/ParticleProcessor.cpp

    r3516 r3528  
    1414osgParticle::ParticleProcessor::ParticleProcessor() 
    1515:    osg::Node(), 
    16     rf_(RELATIVE), 
     16    rf_(RELATIVE_RF), 
    1717    enabled_(true), 
    1818    t0_(-1), 
  • OpenSceneGraph/trunk/src/osgPlugins/osg/LightSource.cpp

    r3516 r3528  
    3030    if (fr[0].matchWord("referenceFrame")) { 
    3131        if (fr[1].matchWord("RELATIVE_TO_ABSOLUTE") || fr[1].matchWord("ABSOLUTE")) { 
    32             lightsource.setReferenceFrame(LightSource::ABSOLUTE); 
     32            lightsource.setReferenceFrame(LightSource::ABSOLUTE_RF); 
    3333            fr += 2; 
    3434            iteratorAdvanced = true; 
    3535        } 
    3636        if (fr[1].matchWord("RELATIVE_TO_PARENTS") || fr[1].matchWord("RELATIVE")) { 
    37             lightsource.setReferenceFrame(LightSource::RELATIVE); 
     37            lightsource.setReferenceFrame(LightSource::RELATIVE_RF); 
    3838            fr += 2; 
    3939            iteratorAdvanced = true; 
     
    5959    fw.indent() << "referenceFrame "; 
    6060    switch (lightsource.getReferenceFrame()) { 
    61         case LightSource::ABSOLUTE: 
     61        case LightSource::ABSOLUTE_RF: 
    6262            fw << "RELATIVE_TO_ABSOLUTE\n"; 
    6363            break; 
    64         case LightSource::RELATIVE: 
     64        case LightSource::RELATIVE_RF: 
    6565        default: 
    6666            fw << "RELATIVE\n"; 
  • OpenSceneGraph/trunk/src/osgPlugins/osg/Transform.cpp

    r3516 r3528  
    5252    if (fr[0].matchWord("referenceFrame")) { 
    5353        if (fr[1].matchWord("RELATIVE_TO_ABSOLUTE") || fr[1].matchWord("ABSOLUTE") ) { 
    54             transform.setReferenceFrame(Transform::ABSOLUTE); 
     54            transform.setReferenceFrame(Transform::ABSOLUTE_RF); 
    5555            fr += 2; 
    5656            iteratorAdvanced = true; 
    5757        } 
    5858        if (fr[1].matchWord("RELATIVE_TO_PARENTS") || fr[1].matchWord("RELATIVE")) { 
    59             transform.setReferenceFrame(Transform::RELATIVE); 
     59            transform.setReferenceFrame(Transform::RELATIVE_RF); 
    6060            fr += 2; 
    6161            iteratorAdvanced = true; 
     
    7373    fw.indent() << "referenceFrame "; 
    7474    switch (transform.getReferenceFrame()) { 
    75         case Transform::ABSOLUTE: 
     75        case Transform::ABSOLUTE_RF: 
    7676            fw << "ABSOLUTE\n"; 
    7777            break; 
    78         case Transform::RELATIVE: 
     78        case Transform::RELATIVE_RF: 
    7979        default: 
    8080            fw << "RELATIVE\n"; 
  • OpenSceneGraph/trunk/src/osgPlugins/osgParticle/IO_ParticleProcessor.cpp

    r3516 r3528  
    5353    if (fr[0].matchWord("referenceFrame")) { 
    5454        if (fr[1].matchWord("RELATIVE_TO_ABSOLUTE") || fr[1].matchWord("ABSOLUTE")) { 
    55             myobj.setReferenceFrame(osgParticle::ParticleProcessor::ABSOLUTE); 
     55            myobj.setReferenceFrame(osgParticle::ParticleProcessor::ABSOLUTE_RF); 
    5656            fr += 2; 
    5757            itAdvanced = true; 
    5858        } 
    5959        if (fr[1].matchWord("RELATIVE_TO_PARENTS") || fr[1].matchWord("RELATIVE")) { 
    60             myobj.setReferenceFrame(osgParticle::ParticleProcessor::RELATIVE); 
     60            myobj.setReferenceFrame(osgParticle::ParticleProcessor::RELATIVE_RF); 
    6161            fr += 2; 
    6262            itAdvanced = true; 
     
    130130    switch (myobj.getReferenceFrame()) 
    131131    { 
    132     case osgParticle::ParticleProcessor::ABSOLUTE: 
     132    case osgParticle::ParticleProcessor::ABSOLUTE_RF: 
    133133        fw << "ABSOLUTE" << std::endl; 
    134134        break; 
    135     case osgParticle::ParticleProcessor::RELATIVE: 
     135    case osgParticle::ParticleProcessor::RELATIVE_RF: 
    136136    default: 
    137137        fw << "RELATIVE" << std::endl; 
  • OpenSceneGraph/trunk/src/osgProducer/Viewer.cpp

    r3516 r3528  
    469469            if (options & HEAD_LIGHT_SOURCE) 
    470470            { 
    471                 lightsource->setReferenceFrame(osg::LightSource::ABSOLUTE); // headlight. 
     471                lightsource->setReferenceFrame(osg::LightSource::ABSOLUTE_RF); // headlight. 
    472472            } 
    473473            else 
    474474            { 
    475                 lightsource->setReferenceFrame(osg::LightSource::RELATIVE); // skylight 
     475                lightsource->setReferenceFrame(osg::LightSource::RELATIVE_RF); // skylight 
    476476            } 
    477477            lightsource->setLocalStateSetModes(osg::StateAttribute::ON); 
  • OpenSceneGraph/trunk/src/osgSim/DOFTransform.cpp

    r3516 r3528  
    142142 
    143143    // finally. 
    144     if (_referenceFrame==RELATIVE) 
     144    if (_referenceFrame==RELATIVE_RF) 
    145145    { 
    146146        matrix.preMult(l2w); 
     
    210210    w2l.postMult(getPutMatrix()); 
    211211 
    212     if (_referenceFrame==RELATIVE) 
     212    if (_referenceFrame==RELATIVE_RF) 
    213213    { 
    214214        //finally: 
  • OpenSceneGraph/trunk/src/osgUtil/CullVisitor.cpp

    r3516 r3528  
    831831    if (light) 
    832832    { 
    833         if (node.getReferenceFrame()==osg::LightSource::RELATIVE) 
     833        if (node.getReferenceFrame()==osg::LightSource::RELATIVE_RF) 
    834834        { 
    835835            RefMatrix& matrix = getModelViewMatrix(); 
  • OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

    r3516 r3528  
    626626                { 
    627627                    if (transform->getDataVariance()==osg::Transform::DYNAMIC) _moreThanOneMatrixRequired=true; 
    628                     else if (transform->getReferenceFrame()==osg::Transform::RELATIVE) _moreThanOneMatrixRequired=true; 
     628                    else if (transform->getReferenceFrame()==osg::Transform::RELATIVE_RF) _moreThanOneMatrixRequired=true; 
    629629                    else 
    630630                    {