git-svn-id: svn://db.shs.com.ru/libs@652 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -28,6 +28,7 @@
|
||||
#include "renderer.h"
|
||||
#include "mouse_controller.h"
|
||||
#include <QTime>
|
||||
#include <QMenu>
|
||||
|
||||
|
||||
class QGLView: public OpenGLWindow
|
||||
@@ -170,7 +171,7 @@ public:
|
||||
|
||||
QImage materialThumbnail(Material * m) {return renderer_.materialThumbnail(m);}
|
||||
void setCurrentAction(RendererService::HandleAction ha) {renderer_.rend_service.setCurrentAction(ha);}
|
||||
|
||||
void setContextActions(QList<QAction*> al) {context_menu.clear(); context_menu.addActions(al);}
|
||||
|
||||
GLfloat aspect, iaspect;
|
||||
Renderer renderer_;
|
||||
@@ -202,6 +203,7 @@ private:
|
||||
Scene * scene_;
|
||||
Camera * camera_;
|
||||
MouseController mouse;
|
||||
QMenu context_menu;
|
||||
// uint cid;
|
||||
QSet<int> keys_;
|
||||
QColor backColor_, fogColor_, ambientColor_, hoverHaloColor_, selectionHaloColor_;
|
||||
|
||||
Reference in New Issue
Block a user