Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 26, 2010, 10:38:57 PM (14 years ago)
Author:
dafrick
Message:

Reverting changes to Billboard. Apparently Ogre 1.4 doesn't support rotations, so this is out for now…

Location:
code/trunk/src/orxonox/graphics
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/graphics/Billboard.cc

    r7491 r7492  
    4646
    4747        this->colour_ = ColourValue::White;
    48         this->rotation_ = 0;
     48        //this->rotation_ = 0;
    4949
    5050        this->registerVariables();
     
    6666        XMLPortParam(Billboard, "material", setMaterial, getMaterial, xmlelement, mode);
    6767        XMLPortParam(Billboard, "colour",   setColour,   getColour,   xmlelement, mode).defaultValues(ColourValue::White);
    68         XMLPortParam(Billboard, "rotation", setRotation, getRotation, xmlelement, mode).defaultValues(0);
     68        //XMLPortParam(Billboard, "rotation", setRotation, getRotation, xmlelement, mode).defaultValues(0);
    6969    }
    7070
     
    7373        registerVariable(this->material_, VariableDirection::ToClient, new NetworkCallback<Billboard>(this, &Billboard::changedMaterial));
    7474        registerVariable(this->colour_,   VariableDirection::ToClient, new NetworkCallback<Billboard>(this, &Billboard::changedColour));
    75         registerVariable(this->rotation_, VariableDirection::ToClient, new NetworkCallback<Billboard>(this, &Billboard::changedRotation));
     75        //registerVariable(this->rotation_, VariableDirection::ToClient, new NetworkCallback<Billboard>(this, &Billboard::changedRotation));
    7676    }
    7777
     
    8989                     this->attachOgreObject(this->billboard_.getBillboardSet());
    9090                this->billboard_.setVisible(this->isVisible());
    91                 this->changedRotation();
     91                //this->changedRotation();
    9292            }
    9393        }
     
    114114    }
    115115
     116/*
    116117    void Billboard::changedRotation()
    117118    {
     
    127128        }
    128129    }
     130*/
    129131
    130132    void Billboard::changedVisibility()
  • code/trunk/src/orxonox/graphics/Billboard.h

    r7491 r7492  
    6262                { return this->colour_; }
    6363
     64/*
    6465            inline void setRotation(const Radian& rotation)
    6566                { this->rotation_ = rotation; this->changedRotation(); }
    6667            inline const Radian& getRotation() const
    6768                { return this->rotation_; }
     69*/
    6870
    6971            virtual void setTeamColour(const ColourValue& colour)
     
    7981            void registerVariables();
    8082            void changedMaterial();
    81             void changedRotation();
     83            //void changedRotation();
    8284
    8385            BillboardSet billboard_;
    8486            std::string material_;
    8587            ColourValue colour_;
    86             Radian rotation_;
     88            //Radian rotation_;
    8789    };
    8890}
Note: See TracChangeset for help on using the changeset viewer.