git-svn-id: svn://db.shs.com.ru/libs@319 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2017-11-17 11:54:18 +00:00
parent e03e8e24c0
commit cdba136c66
9 changed files with 76 additions and 15 deletions

View File

@@ -267,7 +267,7 @@ void QGLView::paintGL() {
renderSelection();
if (shaders_supported) shader_select->release();
uchar cgid[4] = {0, 0, 0, 0};
uint iid;
uint iid = 0;
GLObjectBase * so = 0;
if (!rect().contains(lastPos)) {
if (hov_obj != 0) {
@@ -302,6 +302,7 @@ void QGLView::paintGL() {
camera().apply(aspect);
start_rp.cam_offset_matrix = camera().offsetMatrix();
cur_mvpm = start_rp.proj_matrix * start_rp.view_matrix * start_rp.cam_offset_matrix;
//objects_.preparePos(camera());
static GLRendererBase * prev_rend = 0;
@@ -640,7 +641,7 @@ void QGLView::mouseMoveEvent(QMouseEvent * e) {
emit glMouseMoveEvent(new QMouseEvent(QEvent::MouseMove, QPoint(dx, dy), e->button(), e->buttons(), e->modifiers()));
return;
}
//emit glMouseMoveEvent(e);
emit glMouseMoveEvent(e);
}