2.5
Fixes:
- HSV picker didn't work. Old option "No Hilite" for buttons made it not
being checked for input anymore. Needs to be on attention list!
- Node editor wasn't drawing buttons correctly. Two things to keep track
off:
- Use wmLoadIdentity(), not glLoadIdentity()
- I've added a wmPushMatrix() and wmPopMatrix() version for correct
wm-compatible push/pop. Only one level for now.
This commit is contained in:
@@ -68,6 +68,7 @@ typedef struct wmSubWindow {
|
||||
int swinid;
|
||||
|
||||
float viewmat[4][4], winmat[4][4];
|
||||
float viewmat1[4][4], winmat1[4][4];
|
||||
} wmSubWindow;
|
||||
|
||||
|
||||
@@ -306,6 +307,28 @@ void wmMultMatrix(float mat[][4])
|
||||
glGetFloatv(GL_MODELVIEW_MATRIX, (float *)_curswin->winmat);
|
||||
}
|
||||
|
||||
void wmPushMatrix(void)
|
||||
{
|
||||
if(_curswin==NULL) return;
|
||||
|
||||
Mat4CpyMat4(_curswin->viewmat1, _curswin->viewmat);
|
||||
Mat4CpyMat4(_curswin->winmat1, _curswin->winmat);
|
||||
}
|
||||
|
||||
void wmPopMatrix(void)
|
||||
{
|
||||
if(_curswin==NULL) return;
|
||||
|
||||
Mat4CpyMat4(_curswin->viewmat, _curswin->viewmat1);
|
||||
Mat4CpyMat4(_curswin->winmat, _curswin->winmat1);
|
||||
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadMatrixf(&_curswin->winmat[0][0]);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadMatrixf(&_curswin->viewmat[0][0]);
|
||||
|
||||
}
|
||||
|
||||
void wmGetSingleMatrix(float mat[][4])
|
||||
{
|
||||
if(_curswin)
|
||||
|
||||
Reference in New Issue
Block a user