This commit is contained in:
parent
7fc3ccda80
commit
9bc47a36d2
4 changed files with 46 additions and 3 deletions
|
@ -86,7 +86,8 @@ gfx_src := prim \
|
|||
# anim \
|
||||
# bilboard
|
||||
|
||||
gui_src := gbutton \
|
||||
gui_src := gbubbles \
|
||||
gbutton \
|
||||
gfactory \
|
||||
gframe \
|
||||
greadout \
|
||||
|
|
|
@ -55,7 +55,7 @@ BubicleEmitterData CGUIBubbles::s_emitterData=
|
|||
0,100, // m_theta,m_vtheta
|
||||
100,2,0, // m_wobbleWidth,m_vwobbleWidth,m_vdwobbleWidth
|
||||
40, // m_ot
|
||||
{ 128,128,128, } // m_colour
|
||||
{ 127,127,127, } // m_colour
|
||||
},
|
||||
{ // m_bubicleRange
|
||||
100, // m_life
|
||||
|
@ -66,7 +66,7 @@ BubicleEmitterData CGUIBubbles::s_emitterData=
|
|||
4095,50, // m_theta,m_vtheta
|
||||
100,5,0, // m_wobbleWidth,m_vwobbleWidth,m_vdwobbleWidth
|
||||
0, // m_ot
|
||||
{ 0, 64,127, } // m_colour
|
||||
{ 0, 0, 0, } // m_colour
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -38,6 +38,10 @@
|
|||
#include "gui\greadout.h"
|
||||
#endif
|
||||
|
||||
#ifndef __GUI_GBUBBLEs_H__
|
||||
#include "gui\gbubbles.h"
|
||||
#endif
|
||||
|
||||
#ifndef __MEMORY_HEADER__
|
||||
#include "mem\memory.h"
|
||||
#endif
|
||||
|
@ -79,6 +83,8 @@ void CGUIFactory::createValueButtonFrame(class CGUIObject *_parent,
|
|||
CGUIGroupFrame *fr;
|
||||
CGUITextBox *tb;
|
||||
CGUIValueButton *vb;
|
||||
CGUIBubbles *bu;
|
||||
int x,y,w,h;
|
||||
|
||||
fr=new ("frame") CGUIGroupFrame();
|
||||
fr->init(_parent);
|
||||
|
@ -91,6 +97,14 @@ void CGUIFactory::createValueButtonFrame(class CGUIObject *_parent,
|
|||
vb->init(fr);
|
||||
vb->setButtonTarget(_target);
|
||||
vb->setButtonValue(_value);
|
||||
|
||||
w=tb->getTextWidth();
|
||||
h=tb->getTextHeight();
|
||||
x=(_w-w)/2;
|
||||
y=(_h-h)/2;
|
||||
bu=new ("bubbles") CGUIBubbles();
|
||||
bu->init(fr);
|
||||
bu->setObjectXYWH(x,y,w,h);
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
|
@ -108,6 +122,8 @@ void CGUIFactory::createCycleButtonFrame(class CGUIObject *_parent,
|
|||
CGUITextBox *tb;
|
||||
CGUICycleButton *cb;
|
||||
CGUITextReadout *tr;
|
||||
CGUIBubbles *bu;
|
||||
int x,y,w,h;
|
||||
|
||||
fr=new ("frame") CGUIGroupFrame();
|
||||
fr->init(_parent);
|
||||
|
@ -125,6 +141,14 @@ void CGUIFactory::createCycleButtonFrame(class CGUIObject *_parent,
|
|||
tr->setObjectXYWH(0,(_h*2)/3,_w,(_h*1)/3);
|
||||
tr->setReadoutTarget(_target);
|
||||
tr->setReadoutData(_readoutData);
|
||||
|
||||
w=tb->getTextWidth();
|
||||
h=tb->getTextHeight();
|
||||
x=(_w-w)/2;
|
||||
y=(_h-h)/2;
|
||||
bu=new ("bubbles") CGUIBubbles();
|
||||
bu->init(fr);
|
||||
bu->setObjectXYWH(x,y,w,h);
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
|
@ -142,6 +166,8 @@ void CGUIFactory::createSliderButtonFrame(class CGUIObject *_parent,
|
|||
CGUITextBox *tb;
|
||||
CGUISliderButton *sb;
|
||||
CGUIBarReadout *br;
|
||||
CGUIBubbles *bu;
|
||||
int x,y,w,h;
|
||||
|
||||
fr=new ("frame") CGUIGroupFrame();
|
||||
fr->init(_parent);
|
||||
|
@ -159,6 +185,14 @@ void CGUIFactory::createSliderButtonFrame(class CGUIObject *_parent,
|
|||
br->setObjectXYWH(0,(_h*2)/3,_w,(_h*1)/3);
|
||||
br->setReadoutTarget(_target);
|
||||
br->setReadoutRange(_min,_max);
|
||||
|
||||
w=tb->getTextWidth();
|
||||
h=tb->getTextHeight();
|
||||
x=(_w-w)/2;
|
||||
y=(_h-h)/2;
|
||||
bu=new ("bubbles") CGUIBubbles();
|
||||
bu->init(fr);
|
||||
bu->setObjectXYWH(x,y,w,h);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -333,6 +333,14 @@ SOURCE=..\..\..\source\gfx\tpage.h
|
|||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\gui\gbubbles.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\gui\gbubbles.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\gui\gbutton.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
Loading…
Add table
Reference in a new issue