SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Бычков Андрей
2018-10-05 10:37:47 +00:00
parent 7570f9ff4c
commit b2b01fcc5d
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
qglview/qglview.cpp
View File

@@ -1,19 +1,19 @@
/* /*
QGLView QGLView
Copyright (C) 2018 Ivan Pelipenko peri4ko@yandex.ru Copyright (C) 2018 Ivan Pelipenko peri4ko@yandex.ru
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "qglview.h" #include "qglview.h"
@@ -28,6 +28,7 @@ QGLView::QGLView(QWidget * parent): QGraphicsView(parent), fbo_selection(3) {
setScene(new QGraphicsScene()); setScene(new QGraphicsScene());
setInteractive(true); setInteractive(true);
_w = 0; _w = 0;
timer = 0;
need_init_ = is_first_draw = true; need_init_ = is_first_draw = true;
objects_.is_root = true; objects_.is_root = true;
objects_.view_ = this; objects_.view_ = this;
@@ -365,7 +366,7 @@ void QGLView::paintGL() {
glDrawQuad(); glDrawQuad();
} }
} }
if (selecting_ && painter_) { if (selecting_ && painter_) {
painter_->setPen(sel_pen); painter_->setPen(sel_pen);
painter_->setBrush(sel_brush); painter_->setBrush(sel_brush);
@@ -631,7 +632,7 @@ void QGLView::mouseMoveEvent(QMouseEvent * e) {
QGraphicsView::mouseMoveEvent(e); QGraphicsView::mouseMoveEvent(e);
//lastPos = e->pos(); //lastPos = e->pos();
if (selecting_) { if (selecting_) {
return; return;
} }
if (!mouseThis_) return; if (!mouseThis_) return;

28
qglview/qglview.h
View File

@@ -1,19 +1,19 @@
/* /*
QGLView QGLView
Copyright (C) 2018 Ivan Pelipenko peri4ko@yandex.ru Copyright (C) 2018 Ivan Pelipenko peri4ko@yandex.ru
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef QGLVIEW_H #ifndef QGLVIEW_H
@@ -109,13 +109,13 @@ public:
qglDepthOfFieldFocus, qglDepthOfFieldFocus,
qglDepthOfFieldDiaphragm qglDepthOfFieldDiaphragm
}; };
Q_ENUMS (FogMode) Q_ENUMS (FogMode)
Q_ENUMS (SelectionMode) Q_ENUMS (SelectionMode)
//enum LightingMode {Simple, PerPixel, DeferredShading}; //enum LightingMode {Simple, PerPixel, DeferredShading};
//Q_ENUMS (LightingMode) //Q_ENUMS (LightingMode)
void stop() {killTimer(timer);} void stop() {if (timer) killTimer(timer);}
void start(double freq = 40.) {timer = startTimer(freq <= 0. ? 0 : 1000. / freq);} void start(double freq = 40.) {timer = startTimer(freq <= 0. ? 0 : 1000. / freq);}
GLRendererBase * renderer() {return renderer_;} GLRendererBase * renderer() {return renderer_;}