Button hudget #546

gersseba · 2014-03-30T19:53:40Z

Depends on #588

Buttons with std::function Callbacks, implementation example in hud.cpp

… button_hudget Conflicts: src/ui/hud/hud.cpp src/ui/hud/textfieldhudgetvoxels.cpp src/ui/hud/textfieldhudgetvoxels.h

… button_hudget Conflicts: src/ui/hud/hud.cpp src/ui/hud/hud.h src/world/world.cpp src/world/world.h

gersseba · 2014-03-30T20:21:59Z

that was not supposed to be pushed, i'll fix it

xchrdw · 2014-03-31T13:54:39Z

src/ui/hud/buttonhudgetvoxels.cpp

+    for (int i = 0; i < width; i++) {
+        for (int j = 0; j < height; j++) {
+            if (i == 0 || j == 0 || i == width - 1 || j == height - 1) {
+                m_buttonVoxels->addVoxel(new Voxel(glm::ivec3(i, j, 0), 0x0FF00F));


I assume these are border and content colors? please make them constants

or even better: configurable

I will declare them at the beginning of the method (as it is done in all other hudgets). I created a #554 which addresses the issue of a configurable color theme.

… button_hudget Conflicts: src/ui/hud/hud.cpp src/ui/hud/hud.h src/ui/hud/textfieldhudgetvoxels.cpp src/ui/hud/textfieldhudgetvoxels.h src/world/world.h

mrzzzrm · 2014-03-31T21:52:10Z

src/ui/hud/buttonhudgetvoxels.cpp

+    TextFieldHudgetVoxels::draw();
+}
+
+void ButtonHudgetVoxels::setContent(std::string content) {


constref ;)

psieg · 2014-04-10T19:07:20Z

src/ui/hud/hud.cpp

@@ -258,4 +266,7 @@ void HUD::setView(const View* view) {
    m_view = view;
 }

+void HUD::openMenu(ClickType clicktype) {
+    glow::debug("Not yet implemented");
+}


when should a callback with clicktype none be fired? Also, when I click I don't get debug output atm

psieg · 2014-04-13T18:04:45Z

@gersseba ping

gersseba · 2014-04-13T18:43:15Z

Well creating an enum with only one instance seemed wrong, once someone comes up with a different clicktype none can be replaced.

psieg · 2014-04-17T20:20:15Z

I'd really like

if you have the clicktype enum, allow both, "select" and "fire" on the button (at least in a menu I want to left-click on buttons to use them, this could be done by changing the button meaning though...)
I think a button version with a border but without a background would be nice

either way. Please consider making the button useful though, maybe reset the scenario or something...

psieg · 2014-04-21T09:45:26Z

this one needs merge, work, reviews and/or discussion...

…hudget

mrzzzrm · 2014-05-18T14:57:28Z

Crashes on multiple clicks on Reset

… button_hudget Conflicts: src/ui/hud/hudelements.cpp src/ui/hud/textfieldhudgetvoxels.h

gersseba · 2014-05-31T12:00:32Z

@mrzzzrm fixed the bug, if possible review again

psieg · 2014-07-31T19:02:53Z

the github diff is rather useless here atm.
If you want this merged for the clean state please make it mergable.
Afair there were no real objections to this feature and now that there isn't going to be the awesome menu-around-a-planet this will be it I guess :)

… button_hudget Conflicts: src/display/rendering/starfield.h

gersseba · 2014-08-01T14:33:24Z

Well awesome, the mergeconflict was an empty line note being empty enough...

gersseba · 2014-08-04T10:00:57Z

@psieg done merging, can this be shipped then?

psieg · 2014-08-08T09:52:30Z

I'm ok, just have someone else confirm :P

gersseba · 2014-08-08T13:45:38Z

fair enough, I'll just strap on my confirmation-helmet, squeeze into my confirmation-cannon and fire of into confirmation-land 😉

mrzzzrm · 2014-08-10T17:21:08Z

src/gamestate/gameplay/gameplay.cpp

    m_soundManager(new SoundManager())
 {
+	World::instance()->player().hud().resetButton()->setCallback((std::function<void(ClickType clickType)>)std::bind(&GamePlay::resetButtonCallback, this, std::placeholders::_1));


this line seems to be the same as setResetCallback(). Please use this method then.

mrzzzrm · 2014-08-10T17:37:20Z

Still quite some comments from my side. I'm leaving again on Wednesday morning, so until then I will look into your fixes ;) Otherwise I'll return on the 17th.

gersseba added 9 commits March 5, 2014 21:38

wip

ef177fe

Buttons have borders

508130f

wip

17c6736

Merge branch 'master' of https://github.com/voxelinc/voxellancer into…

ccaa5c0

… button_hudget Conflicts: src/ui/hud/hud.cpp src/ui/hud/textfieldhudgetvoxels.cpp src/ui/hud/textfieldhudgetvoxels.h

update glow

6abe92d

wip

de7421f

Merge branch 'master' of https://github.com/voxelinc/voxellancer into…

28dd753

… button_hudget Conflicts: src/ui/hud/hud.cpp src/ui/hud/hud.h src/world/world.cpp src/world/world.h

added assertion and constuctor with callback

c483e2b

fix const HUD issue

30cbecb

fix reference from bind

4cb1f33

xchrdw reviewed Mar 31, 2014
View reviewed changes

gersseba added 3 commits March 31, 2014 17:32

coding convention

2025c05

const ref & colors

b10a8e4

Merge branch 'master' of https://github.com/voxelinc/voxellancer into…

ff88081

… button_hudget Conflicts: src/ui/hud/hud.cpp src/ui/hud/hud.h src/ui/hud/textfieldhudgetvoxels.cpp src/ui/hud/textfieldhudgetvoxels.h src/world/world.h

mrzzzrm reviewed Mar 31, 2014
View reviewed changes

src/ui/hud/buttonhudgetvoxels.cpp

TextFieldHudgetVoxels::draw();

}

void ButtonHudgetVoxels::setContent(std::string content) {

Copy link

mrzzzrm Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

constref ;)

gersseba added 2 commits April 1, 2014 00:02

adapting to changes in hud from mission script pr

f9cc792

more changes to fit recent pr

0ffe45d

psieg reviewed Apr 10, 2014
View reviewed changes

wip

a8d7c0f

Merge branch 'master' of github.com:voxelinc/voxellancer into button_…

e37bf54

…hudget

gersseba added 2 commits May 31, 2014 10:45

fixed crash

2f8f3ba

Merge branch 'master' of https://github.com/voxelinc/voxellancer into…

50527ce

… button_hudget Conflicts: src/ui/hud/hudelements.cpp src/ui/hud/textfieldhudgetvoxels.h

Merge branch 'master' of https://github.com/voxelinc/voxellancer into…

85435b5

… button_hudget Conflicts: src/display/rendering/starfield.h

fix for problem with master merge

ec7c65c

mrzzzrm reviewed Aug 10, 2014
View reviewed changes

gersseba added 2 commits August 11, 2014 19:53

removed old code, changed to match code docs

287ec9d

button w/out callback possible

3ed3521

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Button hudget #546

Button hudget #546

gersseba commented Mar 30, 2014

gersseba commented Mar 30, 2014

xchrdw Mar 31, 2014

xchrdw Mar 31, 2014

gersseba Mar 31, 2014

mrzzzrm Mar 31, 2014

psieg Apr 10, 2014

psieg commented Apr 13, 2014

gersseba commented Apr 13, 2014

psieg commented Apr 17, 2014

psieg commented Apr 21, 2014

mrzzzrm commented May 18, 2014

gersseba commented May 31, 2014

psieg commented Jul 31, 2014

gersseba commented Aug 1, 2014

gersseba commented Aug 4, 2014

psieg commented Aug 8, 2014

gersseba commented Aug 8, 2014

mrzzzrm Aug 10, 2014

mrzzzrm commented Aug 10, 2014

Button hudget #546

Are you sure you want to change the base?

Button hudget #546

Conversation

gersseba commented Mar 30, 2014

gersseba commented Mar 30, 2014

xchrdw Mar 31, 2014

Choose a reason for hiding this comment

xchrdw Mar 31, 2014

Choose a reason for hiding this comment

gersseba Mar 31, 2014

Choose a reason for hiding this comment

mrzzzrm Mar 31, 2014

Choose a reason for hiding this comment

psieg Apr 10, 2014

Choose a reason for hiding this comment

psieg commented Apr 13, 2014

gersseba commented Apr 13, 2014

psieg commented Apr 17, 2014

psieg commented Apr 21, 2014

mrzzzrm commented May 18, 2014

gersseba commented May 31, 2014

psieg commented Jul 31, 2014

gersseba commented Aug 1, 2014

gersseba commented Aug 4, 2014

psieg commented Aug 8, 2014

gersseba commented Aug 8, 2014

mrzzzrm Aug 10, 2014

Choose a reason for hiding this comment

mrzzzrm commented Aug 10, 2014