diff --git a/code/nel/include/nel/gui/dbview_bar3.h b/code/nel/include/nel/gui/dbview_bar3.h new file mode 100644 index 000000000..40301f1e2 --- /dev/null +++ b/code/nel/include/nel/gui/dbview_bar3.h @@ -0,0 +1,103 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + + + +#ifndef RZ_DBVIEW_BAR3_H +#define RZ_DBVIEW_BAR3_H + +#include "nel/misc/types_nl.h" +#include "nel/gui/view_bitmap.h" + +namespace NLGUI +{ + + /** + * class implementing a 3 Bar widget + * \author Matthieu 'TrapII' Besson + * \author Nevrax France + * \date 2002 + */ + class CDBViewBar3 : public CViewBitmap + { + public: + + /// Constructor + CDBViewBar3(const TCtorParam ¶m); + + bool parse(xmlNodePtr cur,CInterfaceGroup * parentGroup); + virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); } + virtual void updateCoords (); + + void setMini (bool mini); + + virtual void draw (); + + /// Nbs: Values by Int are not used if the Links are setuped + void setValue0 (sint32 r) { _ValueInt[0] = r; } + void setValue1 (sint32 r) { _ValueInt[1] = r; } + void setValue2 (sint32 r) { _ValueInt[2] = r; } + void setRange0 (sint32 r) { _RangeInt[0] = r; } + void setRange1 (sint32 r) { _RangeInt[1] = r; } + void setRange2 (sint32 r) { _RangeInt[2] = r; } + sint32 getValue0 () const { return _ValueInt[0]; } + sint32 getValue1 () const { return _ValueInt[1]; } + sint32 getValue2 () const { return _ValueInt[2]; } + sint32 getRange0 () const { return _RangeInt[0]; } + sint32 getRange1 () const { return _RangeInt[1]; } + sint32 getRange2 () const { return _RangeInt[2]; } + + // Reflect ValueInt (ie not used if the link is setuped) + REFLECT_EXPORT_START(CDBViewBar3, CViewBitmap) + REFLECT_SINT32 ("value1", getValue0, setValue0); + REFLECT_SINT32 ("value2", getValue1, setValue1); + REFLECT_SINT32 ("value3", getValue2, setValue2); + REFLECT_SINT32 ("range1", getRange0, setRange0); + REFLECT_SINT32 ("range2", getRange1, setRange1); + REFLECT_SINT32 ("range3", getRange2, setRange2); + REFLECT_EXPORT_END + + protected: + + CViewBitmap _Slot; + + // Value of the progression in arbitrary units. should be integer + CInterfaceProperty _Value[3]; + // Max range of the progression in arbitrary units. should be integer + CInterfaceProperty _Range[3]; + + /// Nbs: Values by Int are not used if the Links are setuped. NB: not overwritten by links + sint32 _ValueInt[3]; + sint32 _RangeInt[3]; + + + NLMISC::CRGBA _Colors[3]; + NLMISC::CRGBA _ColorsNegative[3]; + + bool _Mini; + + // Height of the bitmap + sint32 _BarH; + + void parseValProp(xmlNodePtr cur, CInterfaceProperty &dbProp, sint32 &intProp, const char *name); + sint32 getCurrentValProp(const CInterfaceProperty &dbProp, sint32 intProp); + }; + +} + +#endif // RZ_DBVIEW_BAR3_H + +/* End of dbview_bar3.h */ diff --git a/code/nel/src/gui/dbview_bar3.cpp b/code/nel/src/gui/dbview_bar3.cpp new file mode 100644 index 000000000..03eda066d --- /dev/null +++ b/code/nel/src/gui/dbview_bar3.cpp @@ -0,0 +1,239 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + + +#include "nel/gui/dbview_bar3.h" +#include "nel/misc/xml_auto_ptr.h" +#include "nel/gui/widget_manager.h" +#include "nel/gui/db_manager.h" +#include "nel/gui/interface_group.h" + +using namespace std; +using namespace NL3D; +using namespace NLMISC; + +namespace NLGUI +{ + + NLMISC_REGISTER_OBJECT(CViewBase, CDBViewBar3, std::string, "bar3"); + + // ---------------------------------------------------------------------------- + CDBViewBar3::CDBViewBar3(const TCtorParam ¶m) + : CViewBitmap(param), + _Slot(TCtorParam()) + { + _Mini = false; + _ColorsNegative[0] = _ColorsNegative[1] = _ColorsNegative[2] = NLMISC::CRGBA(0,0,0,0); + _ValueInt[0] = _ValueInt[1] = _ValueInt[2] = 0; + _RangeInt[0] = _RangeInt[1] = _RangeInt[2] = 255; + } + + + // ---------------------------------------------------------------------------- + void CDBViewBar3::parseValProp(xmlNodePtr cur, CInterfaceProperty &dbProp, sint32 &intProp, const char *name) + { + CXMLAutoPtr prop((const char*) xmlGetProp( cur, (xmlChar*)name )); + if (prop) + { + if ( isdigit(*prop.getDatas()) || *(prop.getDatas())=='-') + fromString((const char*)prop, intProp); + else + dbProp.link(prop); + } + } + + + // ---------------------------------------------------------------------------- + bool CDBViewBar3::parse (xmlNodePtr cur, CInterfaceGroup * parentGroup) + { + if (!CViewBitmap::parse(cur, parentGroup)) + { + string tmp = "cannot parse view:"+getId()+", parent:"+parentGroup->getId(); + nlinfo(tmp.c_str()); + return false; + } + + // read values + parseValProp(cur, _Value[0], _ValueInt[0], "value1" ); + parseValProp(cur, _Value[1], _ValueInt[1], "value2" ); + parseValProp(cur, _Value[2], _ValueInt[2], "value3" ); + + // read ranges + parseValProp(cur, _Range[0], _RangeInt[0], "range1" ); + parseValProp(cur, _Range[1], _RangeInt[1], "range2" ); + parseValProp(cur, _Range[2], _RangeInt[2], "range3" ); + + + // Read colors etc.... + CXMLAutoPtr prop; + + prop = (char*) xmlGetProp( cur, (xmlChar*)"color1" ); + _Colors[0] = convertColor(prop); + prop = (char*) xmlGetProp( cur, (xmlChar*)"color2" ); + _Colors[1] = convertColor(prop); + prop = (char*) xmlGetProp( cur, (xmlChar*)"color3" ); + _Colors[2] = convertColor(prop); + + prop = (char*) xmlGetProp( cur, (xmlChar*)"color1_negative" ); + _ColorsNegative[0] = convertColor(prop); + prop = (char*) xmlGetProp( cur, (xmlChar*)"color2_negative" ); + _ColorsNegative[1] = convertColor(prop); + prop = (char*) xmlGetProp( cur, (xmlChar*)"color3_negative" ); + _ColorsNegative[2] = convertColor(prop); + + + _Mini = false; + prop = (char*) xmlGetProp( cur, (xmlChar*)"mini" ); + if (prop) + if (convertBool(prop)) + setMini(true); + + if (_Mini == false) + setMini(false); + + return true; + } + + // ---------------------------------------------------------------------------- + void CDBViewBar3::setMini(bool b) + { + _Mini = b; + if (_Mini) + _Slot.setTexture ("w_slot_jauge_3_mini.tga"); + else + _Slot.setTexture ("w_slot_jauge_3.tga"); + + _Slot.setPosRef (_PosRef); + _Slot.setParentPosRef (_ParentPosRef); + _Slot.setX (_X); + _Slot.setY (_Y); + + _Scale = true; + if (_Mini) + setTexture ("w_jauge_fill_mini.tga"); + else + setTexture ("w_jauge_fill.tga"); + } + + // ---------------------------------------------------------------------------- + void CDBViewBar3::updateCoords () + { + if (_ParentPos == NULL) + _Slot.setParentPos (_Parent); + else + _Slot.setParentPos (_ParentPos); + _Slot.updateCoords(); + _W = _Slot.getW(); + _H = _Slot.getH(); + + // get the height of the texture + sint32 dummy; + CViewRenderer::getInstance()->getTextureSizeFromId(_TextureId, dummy, _BarH); + + CViewBitmap::updateCoords(); + } + + // ---------------------------------------------------------------------------- + sint32 CDBViewBar3::getCurrentValProp(const CInterfaceProperty &dbProp, sint32 intProp) + { + if(dbProp.getNodePtr()) + return dbProp.getSInt32(); + else + return intProp; + } + + + // ---------------------------------------------------------------------------- + void CDBViewBar3::draw () + { + _Slot.draw(); + + CViewRenderer &rVR = *CViewRenderer::getInstance(); + CRGBA gColor = CWidgetManager::getInstance()->getGlobalColorForContent(); + + if (_Mini) + { + for (uint32 i = 0; i < 3; ++i) + { + float factor; + CRGBA color; + + sint32 value= getCurrentValProp(_Value[i], _ValueInt[i]); + sint32 range= getCurrentValProp(_Range[i], _RangeInt[i]); + + if (range > 0) + factor = ( (float)value / (float)range ); + else + factor = 0; + + if (factor < 0) + { + factor = -factor; + color = _ColorsNegative[i]; + } + else + { + color = _Colors[i]; + } + + // clamp the factor to 0/1 + clamp(factor, 0, 1); + float wBar= factor * (float)(_Slot.getWReal()-2); + + color.A = (uint8)(((sint32)color.A*((sint32)gColor.A+1))>>8); + _WReal = (sint32)wBar; + + rVR.drawRotFlipBitmap (_RenderLayer, _XReal+1, _YReal+i*3+2, _WReal, _BarH, 0, false, _TextureId, color); + } + } + else + { + for (uint32 i = 0; i < 3; ++i) + { + float factor; + CRGBA color; + + sint32 value= getCurrentValProp(_Value[i], _ValueInt[i]); + sint32 range= getCurrentValProp(_Range[i], _RangeInt[i]); + + if (range > 0) + factor = ( (float)value / (float)range ); + else + factor = 0; + + if (factor < 0) + { + factor = -factor; + color = _ColorsNegative[i]; + } + else + { + color = _Colors[i]; + } + + // clamp the factor to 0/1 + clamp(factor, 0, 1); + float wBar= factor * (float)(_Slot.getWReal()-4); + + color.A = (uint8)(((sint32)color.A*((sint32)gColor.A+1))>>8); + _WReal = (sint32)wBar; + + rVR.drawRotFlipBitmap (_RenderLayer, _XReal+2, _YReal+i*7+4, _WReal, _BarH, 0, false, _TextureId, color); + } + } + } +} + diff --git a/code/ryzom/client/src/interface_v3/dbview_bar3.cpp b/code/ryzom/client/src/interface_v3/dbview_bar3.cpp deleted file mode 100644 index 543ed12a9..000000000 --- a/code/ryzom/client/src/interface_v3/dbview_bar3.cpp +++ /dev/null @@ -1,235 +0,0 @@ -// Ryzom - MMORPG Framework -// Copyright (C) 2010 Winch Gate Property Limited -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - - -#include "dbview_bar3.h" -#include "nel/misc/xml_auto_ptr.h" -#include "nel/gui/widget_manager.h" -#include "nel/gui/db_manager.h" -#include "nel/gui/interface_group.h" - -using namespace std; -using namespace NL3D; -using namespace NLMISC; - - -NLMISC_REGISTER_OBJECT(CViewBase, CDBViewBar3, std::string, "bar3"); - -// ---------------------------------------------------------------------------- -CDBViewBar3::CDBViewBar3(const TCtorParam ¶m) -: CViewBitmap(param), - _Slot(TCtorParam()) -{ - _Mini = false; - _ColorsNegative[0] = _ColorsNegative[1] = _ColorsNegative[2] = NLMISC::CRGBA(0,0,0,0); - _ValueInt[0] = _ValueInt[1] = _ValueInt[2] = 0; - _RangeInt[0] = _RangeInt[1] = _RangeInt[2] = 255; -} - - -// ---------------------------------------------------------------------------- -void CDBViewBar3::parseValProp(xmlNodePtr cur, CInterfaceProperty &dbProp, sint32 &intProp, const char *name) -{ - CXMLAutoPtr prop((const char*) xmlGetProp( cur, (xmlChar*)name )); - if (prop) - { - if ( isdigit(*prop.getDatas()) || *(prop.getDatas())=='-') - fromString((const char*)prop, intProp); - else - dbProp.link(prop); - } -} - - -// ---------------------------------------------------------------------------- -bool CDBViewBar3::parse (xmlNodePtr cur, CInterfaceGroup * parentGroup) -{ - if (!CViewBitmap::parse(cur, parentGroup)) - { - string tmp = "cannot parse view:"+getId()+", parent:"+parentGroup->getId(); - nlinfo(tmp.c_str()); - return false; - } - - // read values - parseValProp(cur, _Value[0], _ValueInt[0], "value1" ); - parseValProp(cur, _Value[1], _ValueInt[1], "value2" ); - parseValProp(cur, _Value[2], _ValueInt[2], "value3" ); - - // read ranges - parseValProp(cur, _Range[0], _RangeInt[0], "range1" ); - parseValProp(cur, _Range[1], _RangeInt[1], "range2" ); - parseValProp(cur, _Range[2], _RangeInt[2], "range3" ); - - - // Read colors etc.... - CXMLAutoPtr prop; - - prop = (char*) xmlGetProp( cur, (xmlChar*)"color1" ); - _Colors[0] = convertColor(prop); - prop = (char*) xmlGetProp( cur, (xmlChar*)"color2" ); - _Colors[1] = convertColor(prop); - prop = (char*) xmlGetProp( cur, (xmlChar*)"color3" ); - _Colors[2] = convertColor(prop); - - prop = (char*) xmlGetProp( cur, (xmlChar*)"color1_negative" ); - _ColorsNegative[0] = convertColor(prop); - prop = (char*) xmlGetProp( cur, (xmlChar*)"color2_negative" ); - _ColorsNegative[1] = convertColor(prop); - prop = (char*) xmlGetProp( cur, (xmlChar*)"color3_negative" ); - _ColorsNegative[2] = convertColor(prop); - - - _Mini = false; - prop = (char*) xmlGetProp( cur, (xmlChar*)"mini" ); - if (prop) - if (convertBool(prop)) - setMini(true); - - if (_Mini == false) - setMini(false); - - return true; -} - -// ---------------------------------------------------------------------------- -void CDBViewBar3::setMini(bool b) -{ - _Mini = b; - if (_Mini) - _Slot.setTexture ("w_slot_jauge_3_mini.tga"); - else - _Slot.setTexture ("w_slot_jauge_3.tga"); - - _Slot.setPosRef (_PosRef); - _Slot.setParentPosRef (_ParentPosRef); - _Slot.setX (_X); - _Slot.setY (_Y); - - _Scale = true; - if (_Mini) - setTexture ("w_jauge_fill_mini.tga"); - else - setTexture ("w_jauge_fill.tga"); -} - -// ---------------------------------------------------------------------------- -void CDBViewBar3::updateCoords () -{ - if (_ParentPos == NULL) - _Slot.setParentPos (_Parent); - else - _Slot.setParentPos (_ParentPos); - _Slot.updateCoords(); - _W = _Slot.getW(); - _H = _Slot.getH(); - - // get the height of the texture - sint32 dummy; - CViewRenderer::getInstance()->getTextureSizeFromId(_TextureId, dummy, _BarH); - - CViewBitmap::updateCoords(); -} - -// ---------------------------------------------------------------------------- -sint32 CDBViewBar3::getCurrentValProp(const CInterfaceProperty &dbProp, sint32 intProp) -{ - if(dbProp.getNodePtr()) - return dbProp.getSInt32(); - else - return intProp; -} - - -// ---------------------------------------------------------------------------- -void CDBViewBar3::draw () -{ - _Slot.draw(); - - CViewRenderer &rVR = *CViewRenderer::getInstance(); - CRGBA gColor = CWidgetManager::getInstance()->getGlobalColorForContent(); - - if (_Mini) - { - for (uint32 i = 0; i < 3; ++i) - { - float factor; - CRGBA color; - - sint32 value= getCurrentValProp(_Value[i], _ValueInt[i]); - sint32 range= getCurrentValProp(_Range[i], _RangeInt[i]); - - if (range > 0) - factor = ( (float)value / (float)range ); - else - factor = 0; - - if (factor < 0) - { - factor = -factor; - color = _ColorsNegative[i]; - } - else - { - color = _Colors[i]; - } - - // clamp the factor to 0/1 - clamp(factor, 0, 1); - float wBar= factor * (float)(_Slot.getWReal()-2); - - color.A = (uint8)(((sint32)color.A*((sint32)gColor.A+1))>>8); - _WReal = (sint32)wBar; - - rVR.drawRotFlipBitmap (_RenderLayer, _XReal+1, _YReal+i*3+2, _WReal, _BarH, 0, false, _TextureId, color); - } - } - else - { - for (uint32 i = 0; i < 3; ++i) - { - float factor; - CRGBA color; - - sint32 value= getCurrentValProp(_Value[i], _ValueInt[i]); - sint32 range= getCurrentValProp(_Range[i], _RangeInt[i]); - - if (range > 0) - factor = ( (float)value / (float)range ); - else - factor = 0; - - if (factor < 0) - { - factor = -factor; - color = _ColorsNegative[i]; - } - else - { - color = _Colors[i]; - } - - // clamp the factor to 0/1 - clamp(factor, 0, 1); - float wBar= factor * (float)(_Slot.getWReal()-4); - - color.A = (uint8)(((sint32)color.A*((sint32)gColor.A+1))>>8); - _WReal = (sint32)wBar; - - rVR.drawRotFlipBitmap (_RenderLayer, _XReal+2, _YReal+i*7+4, _WReal, _BarH, 0, false, _TextureId, color); - } - } -} diff --git a/code/ryzom/client/src/interface_v3/dbview_bar3.h b/code/ryzom/client/src/interface_v3/dbview_bar3.h deleted file mode 100644 index f745564c3..000000000 --- a/code/ryzom/client/src/interface_v3/dbview_bar3.h +++ /dev/null @@ -1,99 +0,0 @@ -// Ryzom - MMORPG Framework -// Copyright (C) 2010 Winch Gate Property Limited -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - - - -#ifndef RZ_DBVIEW_BAR3_H -#define RZ_DBVIEW_BAR3_H - -#include "nel/misc/types_nl.h" -#include "nel/gui/view_bitmap.h" - -/** - * class implementing a 3 Bar widget - * \author Matthieu 'TrapII' Besson - * \author Nevrax France - * \date 2002 - */ -class CDBViewBar3 : public CViewBitmap -{ -public: - - /// Constructor - CDBViewBar3(const TCtorParam ¶m); - - bool parse(xmlNodePtr cur,CInterfaceGroup * parentGroup); - virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); } - virtual void updateCoords (); - - void setMini (bool mini); - - virtual void draw (); - - /// Nbs: Values by Int are not used if the Links are setuped - void setValue0 (sint32 r) { _ValueInt[0] = r; } - void setValue1 (sint32 r) { _ValueInt[1] = r; } - void setValue2 (sint32 r) { _ValueInt[2] = r; } - void setRange0 (sint32 r) { _RangeInt[0] = r; } - void setRange1 (sint32 r) { _RangeInt[1] = r; } - void setRange2 (sint32 r) { _RangeInt[2] = r; } - sint32 getValue0 () const { return _ValueInt[0]; } - sint32 getValue1 () const { return _ValueInt[1]; } - sint32 getValue2 () const { return _ValueInt[2]; } - sint32 getRange0 () const { return _RangeInt[0]; } - sint32 getRange1 () const { return _RangeInt[1]; } - sint32 getRange2 () const { return _RangeInt[2]; } - - // Reflect ValueInt (ie not used if the link is setuped) - REFLECT_EXPORT_START(CDBViewBar3, CViewBitmap) - REFLECT_SINT32 ("value1", getValue0, setValue0); - REFLECT_SINT32 ("value2", getValue1, setValue1); - REFLECT_SINT32 ("value3", getValue2, setValue2); - REFLECT_SINT32 ("range1", getRange0, setRange0); - REFLECT_SINT32 ("range2", getRange1, setRange1); - REFLECT_SINT32 ("range3", getRange2, setRange2); - REFLECT_EXPORT_END - -protected: - - CViewBitmap _Slot; - - // Value of the progression in arbitrary units. should be integer - CInterfaceProperty _Value[3]; - // Max range of the progression in arbitrary units. should be integer - CInterfaceProperty _Range[3]; - - /// Nbs: Values by Int are not used if the Links are setuped. NB: not overwritten by links - sint32 _ValueInt[3]; - sint32 _RangeInt[3]; - - - NLMISC::CRGBA _Colors[3]; - NLMISC::CRGBA _ColorsNegative[3]; - - bool _Mini; - - // Height of the bitmap - sint32 _BarH; - - void parseValProp(xmlNodePtr cur, CInterfaceProperty &dbProp, sint32 &intProp, const char *name); - sint32 getCurrentValProp(const CInterfaceProperty &dbProp, sint32 intProp); -}; - - -#endif // RZ_DBVIEW_BAR3_H - -/* End of dbview_bar3.h */ diff --git a/code/ryzom/client/src/interface_v3/interface_parser.cpp b/code/ryzom/client/src/interface_v3/interface_parser.cpp index 484d46bea..33a5e4dd4 100644 --- a/code/ryzom/client/src/interface_v3/interface_parser.cpp +++ b/code/ryzom/client/src/interface_v3/interface_parser.cpp @@ -47,7 +47,7 @@ #include "view_pointer.h" // DBView (View linked to the database) #include "nel/gui/dbview_bar.h" -#include "dbview_bar3.h" +#include "nel/gui/dbview_bar3.h" #include "dbview_number.h" #include "dbview_quantity.h" #include "dbview_digit.h" diff --git a/code/ryzom/client/src/interface_v3/register_interface_elements.cpp b/code/ryzom/client/src/interface_v3/register_interface_elements.cpp index e2375447c..bfca22dd5 100644 --- a/code/ryzom/client/src/interface_v3/register_interface_elements.cpp +++ b/code/ryzom/client/src/interface_v3/register_interface_elements.cpp @@ -44,7 +44,7 @@ #include "nel/gui/group_tree.h" #include "nel/gui/reflect.h" #include "nel/gui/dbview_bar.h" -#include "dbview_bar3.h" +#include "nel/gui/dbview_bar3.h" #include "nel/gui/ctrl_scroll_base.h" #include "nel/gui/ctrl_scroll.h" #include "dbgroup_combo_box.h"