add textureTransform to ObjectBase
before textures load refactoring
This commit is contained in:
@@ -31,6 +31,7 @@
|
||||
|
||||
class Effect1: public FramebufferEffectBase {
|
||||
public:
|
||||
QString name() const { return "Blur"; }
|
||||
void reloadShaders() { QGLEngineShaders::loadShadersMulti(mys, "test1.glsl"); }
|
||||
void draw() {
|
||||
auto planes = getFreePlanes(1);
|
||||
@@ -98,6 +99,7 @@ QGLViewWindow::QGLViewWindow(QWidget * parent): QMainWindow(parent), Ui::QGLView
|
||||
startTimer(1000 / 60);
|
||||
|
||||
connect(view->view(), SIGNAL(keyEvent(Qt::Key, Qt::KeyboardModifiers)), this, SLOT(view_keyEvent(Qt::Key, Qt::KeyboardModifiers)));
|
||||
connect(view->view(), &QGLView::glEndPaint, this, [this]() { labelTimings->setText(view->view()->renderer_.getTimings()); });
|
||||
// connect(matEditor, SIGNAL(changed()), this, SLOT(materialChanged()));
|
||||
sceneTree->assignQGLView(view->view());
|
||||
matEditor->assignQGLView(view->view());
|
||||
@@ -206,7 +208,7 @@ void QGLViewWindow::on_actionSaveSelected_triggered() {
|
||||
if (f.right(4).toLower() != ".qgl") f += ".qgl";
|
||||
prev_path = f;
|
||||
QApplication::setOverrideCursor(Qt::WaitCursor);
|
||||
/// saveToQGLFile(f, sel_obj);
|
||||
// saveToQGLFile(f, sel_obj);
|
||||
QApplication::restoreOverrideCursor();
|
||||
}
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>904</width>
|
||||
<width>881</width>
|
||||
<height>840</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -723,6 +723,13 @@
|
||||
<item>
|
||||
<widget class="SceneTree" name="sceneTree" native="true"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="labelTimings">
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
|
||||
Reference in New Issue
Block a user