Commit Graph

9 Commits

Author SHA1 Message Date
Paul Lemire bed54de011 deferred-renderer-cpp: show something on screen
Created subclass of QShaderData to hold all lights for the scene.
GL3 shader updated accordingly.

For GL2/ES2 to work, QShaderData uniform struct support needs to be
implemented

Change-Id: I5560eac23234e53feba18b607276159989700141
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2015-01-18 15:30:54 +01:00
Paul Lemire 80540edee6 Qt3D::Window simplified
The Qt3D::Window doesn't contain the QAspectEngine anymore. This will allow
to to pass any kind of surface to the QAspectEngine.

We could still have a wrapper like QQuickView around the QQmlAspectEngine if
needed but if it weren't for the camera controller that we need to keep a
little longer, a simple QWindow could be used in every example.

All examples were updated.

Change-Id: I4921df0df6f1066cd409ea886faf41d7e8834ef6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2014-11-14 17:44:32 +01:00
Sean Harmer a56aaeed5f QAspectEngine owns the root of the scene
The scene root is now also enforced to be a QEntity as that is what we
were checking for in the backend anyway as it is impossible to create
a plain QNode.

This is another step towards solving the shutdown crashing bug.

Change-Id: I8508afa80ec9e99954ab867be1ed28bc35405e79
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2014-11-02 19:17:49 +01:00
Paul Lemire 8e5345043d QCamera refactored
All examples updated to work with the modifications.

Change-Id: I51a3036fa750ca297a2180c488747d0878b940a4
Task-number: QTBUG-41543
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2014-10-30 17:22:13 +01:00
Sean Harmer c9f8f87403 Rename RendererAspect -> QRenderAspect
Change-Id: Ib16fe125e160764571775f3667cff082db921f7d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2014-10-26 10:17:26 +01:00
Paul Lemire 30d3beef0a QLayer: QString name property converted to QStringList names
Change-Id: I1f1c80231118240d5ae590166d00d0b53661ab33
Task-number: QTBUG-41540
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2014-10-22 10:45:41 +02:00
Paul Lemire 7b26f6a174 QNode refactoring
Move almost everything to private classes.
Assimp loading restored.
All examples working.
QNode hierachy is now handled through QObject::setParent, addChild,
removeChild are part of the private api.

Note: commented QChangeArbiter unit tests as they can no longer work with this
patch and will restore them when QChangeArbiter will have been made private.

Task-number: QTBUG-41470
Task-number: QTBUG-41523
Change-Id: I4430974b3aa7f3744c38714b451b122e0cb4d0c9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2014-10-03 21:18:41 +02:00
Paul Lemire 0d5b71f4df QParameter new overloaded ctors
Change-Id: Ia6e3c3285884265b303485176109a4d2c80ccabe
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2014-09-29 22:53:21 +02:00
Paul Lemire 2d833908e3 Renamed deferred-renderer example to deferred-renderer-qml
Change-Id: I7005c0a58b48e444f08a771684bde13072863db5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2014-09-28 14:24:30 +02:00