comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-02-03 09:44:26 -05:00
Code Issues Projects Releases Wiki Activity

simplify alt. coordinate sys on panel contents only, y-up otherwise

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-07-05 18:54:46 -04:00
parent 48308145b7
commit 5ac0dc8c41
4 changed files with 54 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/ui/GLPanel.cpp
View File

@ -10,10 +10,12 @@ GLPanel::GLPanel() : fillType(GLPANEL_FILL_SOLID), contentsVisible(true), transf
fill[0] = RGB(0.5,0.5,0.5);
fill[1] = RGB(0.1,0.1,0.1);
borderColor = RGB(0.8, 0.8, 0.8);
setCoordinateSystem(GLPANEL_Y_DOWN_ZERO_ONE);
setCoordinateSystem(GLPANEL_Y_UP);
}
void GLPanel::genArrays() {
float min = -1.0, mid = 0, max = 1.0;
if (fillType == GLPANEL_FILL_SOLID || fillType == GLPANEL_FILL_GRAD_X || fillType == GLPANEL_FILL_GRAD_Y) {
glPoints.reserve(2 * 4);
glPoints.resize(2 * 4);
@ -173,15 +175,9 @@ void GLPanel::setFillColor(RGB color1, RGB color2) {
}
void GLPanel::setMarginPx(float marg) {
marginPx.left = marginPx.right = marginPx.top = marginPx.bottom = marg;
marginPx = marg;
}
void GLPanel::setMarginPx(float margl, float margr, float margt, float margb) {
marginPx.left = margl;
marginPx.right = margr;
marginPx.top = margt;
marginPx.bottom = margb;
}
void GLPanel::setBorderColor(RGB clr) {
borderColor = clr;
@ -219,39 +215,9 @@ void GLPanel::drawPanelContents() {
void GLPanel::draw(CubicVR::mat4 transform_in, GLPanel *parent) {
using namespace CubicVR;
mat4 mCoord = mat4::identity();
if (!parent) {
if (coord == GLPANEL_Y_DOWN_ZERO_ONE) {
mCoord *= mat4::translate(-1.0f, 1.0f, 0.0f) * mat4::scale(2.0f, -2.0f, 2.0f);
}
if (coord == GLPANEL_Y_UP_ZERO_ONE) {
mCoord = mat4::translate(-1.0f, -1.0f, 0.0f) * mat4::scale(2.0f, 2.0f, 2.0f);
}
if (coord == GLPANEL_Y_DOWN) {
mCoord = mat4::scale(2.0f, 2.0f, 2.0f);
}
// if (coord == GLPANEL_Y_UP) {
// }
} else if (parent->coord != coord) {
if (parent->coord == GLPANEL_Y_DOWN_ZERO_ONE && coord == GLPANEL_Y_UP_ZERO_ONE) {
mCoord *= mat4::translate(0.0f, 1.0f, 0.0f) * mat4::scale(1.0f, -1.0f, 1.0f);
}
if (parent->coord == GLPANEL_Y_UP_ZERO_ONE && coord == GLPANEL_Y_DOWN_ZERO_ONE) {
mCoord *= mat4::translate(0.0f, -1.0f, 0.0f) * mat4::scale(1.0f, -1.0f, 1.0f);
}
// if (coord == GLPANEL_Y_UP_ZERO_ONE) {
// mCoord = mat4::translate(-1.0f, -1.0f, 0.0f) * mat4::scale(2.0f, 2.0f, 2.0f);
// }
// if (coord == GLPANEL_Y_DOWN) {
// mCoord = mat4::scale(2.0f, 2.0f, 2.0f);
// }
// if (coord == GLPANEL_Y_UP) {
// }
}
// compute local transform
localTransform = mCoord * (mat4::translate(pos[0], pos[1], 0) * mat4::scale(size[0], size[1], 0));
localTransform = mat4::translate(pos[0], pos[1], 0) * mat4::scale(size[0], size[1], 0);
// compute global transform
transform = transform_in * localTransform;
@ -273,15 +239,13 @@ void GLPanel::draw(CubicVR::mat4 transform_in, GLPanel *parent) {
ucenter = vec2((umin + umax) * 0.5);
// pixel dimensions
pdim = vec2((umax.x - umin.x) * view[0], (umax.y - umin.y) * view[1]);
pvec = vec2((vmax.x - vmin.x) / pdim.x, (vmax.y - vmin.y) / pdim.y);
pdim = vec2((vmax.x - vmin.x) / 2.0 * view[0], (vmax.y - vmin.y) / 2.0 * view[1]);
pvec = vec2(((vmax.x - vmin.x) / 2.0) / pdim.x, ((vmax.y - vmin.y) / 2.0) / pdim.y);
std::cout << umin << " :: " << ucenter << " :: " << pdim << " :: " << pvec << std::endl;
if (marginPx.left || marginPx.right || marginPx.top || marginPx.bottom) {
localTransform *= mat4::translate(marginPx.left * pvec.x / size[0], marginPx.top * pvec.y / size[1], 0) *
mat4::scale(1.0 - (marginPx.left + marginPx.right) * pvec.x / size[0], 1.0 - (marginPx.top + marginPx.bottom) * pvec.y / size[1], 0);
transform = transform_in * localTransform;
if (marginPx) {
transform *= mat4::scale(1.0 - marginPx * 2.0 * pvec.x / size[0], 1.0 - marginPx * 2.0 * pvec.y / size[1], 0);
}
glLoadMatrixf(transform);
@ -338,20 +302,32 @@ void GLPanel::draw(CubicVR::mat4 transform_in, GLPanel *parent) {
}
if (contentsVisible) {
glPushMatrix();
mat4 mCoord = mat4::identity();
if (coord == GLPANEL_Y_DOWN_ZERO_ONE) {
mCoord *= mat4::translate(-1.0f, 1.0f, 0.0f) * mat4::scale(2.0f, -2.0f, 2.0f);
}
if (coord == GLPANEL_Y_UP_ZERO_ONE) {
mCoord = mat4::translate(-1.0f, -1.0f, 0.0f) * mat4::scale(2.0f, 2.0f, 2.0f);
}
if (coord == GLPANEL_Y_DOWN) {
mCoord = mat4::scale(1.0f, -1.0f, 1.0f);
}
// if (coord == GLPANEL_Y_UP) {
// }
glLoadMatrixf(transform * mCoord);
drawPanelContents();
glPopMatrix();
}
}
GLTextPanel::GLTextPanel() : GLPanel() {
coord = GLPANEL_Y_UP_ZERO_ONE;
coord = GLPANEL_Y_UP;
}
void GLTextPanel::drawPanelContents() {
glColor4f(1, 1, 1, 1.0);
GLFont::getFont(GLFont::GLFONT_SIZE48).drawString(textVal, mid, mid, 48, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, (int)pdim.x*2, (int)pdim.y*2);
GLFont::getFont(GLFont::GLFONT_SIZE48).drawString(textVal, mid, mid, 48, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, (int)pdim.x, (int)pdim.y);
}
void GLTextPanel::setText(std::string text) {
@ -367,20 +343,20 @@ std::string GLTextPanel::getText() {
void GLTestPanel::drawPanelContents() {
glColor3f(1.0,1.0,1.0);
glBegin(GL_LINES);
glVertex2f(0, 0.5);
glVertex2f(1, 0.5);
glVertex2f(0.5, 0);
glVertex2f(0.5, 1);
glVertex2f(min, mid);
glVertex2f(max, mid);
glVertex2f(mid, min);
glVertex2f(mid, max);
glVertex2f(0.5, 1);
glVertex2f(0.48, 0.80);
glVertex2f(0.5, 1);
glVertex2f(0.52, 0.80);
glVertex2f(mid, max);
glVertex2f(mid - 0.02, max - 0.2);
glVertex2f(mid, 1);
glVertex2f(mid + 0.02, max - 0.2);
glVertex2f(1, 0.5);
glVertex2f(0.90, 0.25);
glVertex2f(1, 0.5);
glVertex2f(0.90, 0.75);
glVertex2f(max, mid);
glVertex2f(max - 0.1, mid + max * 0.25);
glVertex2f(max, mid);
glVertex2f(max - 0.1, mid - max * 0.25);
glEnd();
}

3
src/ui/GLPanel.h
View File

@ -40,7 +40,7 @@ public:
float view[2];
GLPanelFillType fillType;
GLPanelCoordinateSystem coord;
GLPanelEdges marginPx;
float marginPx;
GLPanelEdges borderPx;
RGB fill[2];
RGB borderColor;
@ -69,7 +69,6 @@ public:
void setFillColor(RGB color1);
void setFillColor(RGB color1, RGB color2);
void setMarginPx(float marg);
void setMarginPx(float margl, float margr, float margt, float margb);
void setBorderColor(RGB clr);
void setBorderPx(float bord);

21
src/ui/UITestContext.cpp
View File

@ -12,26 +12,35 @@ PrimaryGLContext(canvas, sharedContext) {
testPanel.setFillColor(RGB(0.0,0.0,1.0), RGB(0.0,1.0,0.0));
testChildPanel.setPosition(0.0, 0.0);
testChildPanel.setMarginPx(10,10,10,5);
testChildPanel.setSize(1.0, 0.5);
testChildPanel.setMarginPx(10);
testChildPanel.setSize(1.0, 0.33);
testChildPanel.setFill(GLPanel::GLPANEL_FILL_GRAD_BAR_X);
testChildPanel.setFillColor(RGB(0.0,0.0,1.0), RGB(0.0,1.0,0.0));
testChildPanel.setBorderPx(1);
testChildPanel2.setPosition(0.0, 0.5);
testChildPanel2.setSize(1.0, 0.5);
testChildPanel2.setMarginPx(10,10,5,10);
testChildPanel2.setPosition(0.0, -0.66);
testChildPanel2.setSize(1.0, 0.33);
testChildPanel2.setMarginPx(10);
testChildPanel2.setFill(GLPanel::GLPANEL_FILL_GRAD_X);
testChildPanel2.setFillColor(RGB(0.0,0.0,1.0), RGB(0.0,1.0,0.0));
testChildPanel2.setBorderColor(RGB(1.0,0.0,0.0));
testChildPanel2.setBorderPx(1);
testChildPanel3.setPosition(0.0, 0.66);
testChildPanel3.setSize(1.0, 0.33);
testChildPanel3.setMarginPx(10);
testChildPanel3.setFill(GLPanel::GLPANEL_FILL_GRAD_X);
testChildPanel3.setFillColor(RGB(0.0,0.0,1.0), RGB(0.0,1.0,0.0));
testChildPanel3.setBorderColor(RGB(1.0,0.0,0.0));
testChildPanel3.setBorderPx(1);
testText1.setText("Testing 123..");
testText1.setFill(GLPanel::GLPANEL_FILL_NONE);
testChildPanel2.addChild(&testText1);
testPanel.addChild(&testChildPanel);
testPanel.addChild(&testChildPanel2);
testPanel.addChild(&testChildPanel3);
}
void UITestContext::DrawBegin() {

1
src/ui/UITestContext.h
View File

@ -17,5 +17,6 @@ private:
GLPanel testPanel;
GLTestPanel testChildPanel;
GLPanel testChildPanel2;
GLPanel testChildPanel3;
GLTextPanel testText1;
};