diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-10-10 16:45:00 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-10-10 20:24:46 +0100 |
| commit | f82880c7b8cff8419873a936ced956d20ba88933 (patch) | |
| tree | b3802a20ca7c7abae4b53cbdf50b83d23dff733a /examples | |
| parent | d2cc3828a1da686f07c9e748b80b20fc007e37fe (diff) | |
| parent | 0826c7fbdfbc34280376ba165931f3a30c3d1e50 (diff) | |
Merge branch '5.7' into 5.8
Conflicts:
tests/auto/input/input.pro
Change-Id: I591202f144aeec915e18611dfce358d4f15faff6
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qt3d/audio-visualizer-qml/images/demotitle.png | bin | 20912 -> 7449 bytes | |||
| -rw-r--r-- | examples/qt3d/audio-visualizer-qml/images/songtitle.png | bin | 5764 -> 6181 bytes | |||
| -rw-r--r-- | examples/qt3d/basicshapes-cpp/main.cpp | 10 |
3 files changed, 10 insertions, 0 deletions
diff --git a/examples/qt3d/audio-visualizer-qml/images/demotitle.png b/examples/qt3d/audio-visualizer-qml/images/demotitle.png Binary files differindex 58816784e..75c6c42bd 100644 --- a/examples/qt3d/audio-visualizer-qml/images/demotitle.png +++ b/examples/qt3d/audio-visualizer-qml/images/demotitle.png diff --git a/examples/qt3d/audio-visualizer-qml/images/songtitle.png b/examples/qt3d/audio-visualizer-qml/images/songtitle.png Binary files differindex 2a9961093..84efe533a 100644 --- a/examples/qt3d/audio-visualizer-qml/images/songtitle.png +++ b/examples/qt3d/audio-visualizer-qml/images/songtitle.png diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp index b4b01ff30..fffb83a20 100644 --- a/examples/qt3d/basicshapes-cpp/main.cpp +++ b/examples/qt3d/basicshapes-cpp/main.cpp @@ -73,6 +73,7 @@ #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qrenderpass.h> #include <Qt3DRender/qsceneloader.h> +#include <Qt3DRender/qpointlight.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qaspectengine.h> @@ -116,6 +117,15 @@ int main(int argc, char **argv) cameraEntity->setUpVector(QVector3D(0, 1, 0)); cameraEntity->setViewCenter(QVector3D(0, 0, 0)); + Qt3DCore::QEntity *lightEntity = new Qt3DCore::QEntity(rootEntity); + Qt3DRender::QPointLight *light = new Qt3DRender::QPointLight(lightEntity); + light->setColor("white"); + light->setIntensity(1); + lightEntity->addComponent(light); + Qt3DCore::QTransform *lightTransform = new Qt3DCore::QTransform(lightEntity); + lightTransform->setTranslation(cameraEntity->position()); + lightEntity->addComponent(lightTransform); + // For camera controls Qt3DExtras::QFirstPersonCameraController *camController = new Qt3DExtras::QFirstPersonCameraController(rootEntity); camController->setCamera(cameraEntity); |
