diff options
| author | Yoann Lopes <yoann.lopes@nokia.com> | 2010-07-19 10:44:14 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@nokia.com> | 2010-07-19 10:44:14 +0200 |
| commit | be0e11511e9d082c24ae95c6da184e22fd75a521 (patch) | |
| tree | 663ad715898a33ae31811fd57a52d532800874e7 | |
| parent | a3ab9c3c56888745df575b7640478c8547e0633a (diff) | |
Make it work with Ogre 1.6
| -rw-r--r-- | ogrewidget.cpp | 2 | ||||
| -rw-r--r-- | qmlogre.pro | 6 | ||||
| -rw-r--r-- | resources/data.zip | bin | 885163 -> 885156 bytes |
3 files changed, 6 insertions, 2 deletions
diff --git a/ogrewidget.cpp b/ogrewidget.cpp index c42bb62..f0d0bdf 100644 --- a/ogrewidget.cpp +++ b/ogrewidget.cpp @@ -211,7 +211,7 @@ void OgreWidget::initOgre() // setup some basic lighting for our scene m_sceneManager->setAmbientLight(Ogre::ColourValue(0.3, 0.3, 0.3)); - m_sceneManager->createLight()->setPosition(20, 80, 50); + m_sceneManager->createLight("myLight")->setPosition(20, 80, 50); // create an ogre head entity and place it at the origin m_sceneManager->getRootSceneNode()->attachObject(m_sceneManager->createEntity("Head", "ogrehead.mesh")); diff --git a/qmlogre.pro b/qmlogre.pro index 31b41a9..849f831 100644 --- a/qmlogre.pro +++ b/qmlogre.pro @@ -25,7 +25,11 @@ macx { CONFIG += link_pkgconfig PKGCONFIG += OGRE OGRELIBDIR = $$system(pkg-config --libs-only-L OGRE) - OGRELIBDIR = $$replace(OGRELIBDIR, -L,) + isEmpty(OGRELIBDIR) { + OGRELIBDIR = /usr/lib + } else { + OGRELIBDIR = $$replace(OGRELIBDIR, -L,) + } OGREPLUGINDIR = $$OGRELIBDIR/OGRE DEFINES += OGRE_PLUGIN_VAR=\"$$OGREPLUGINDIR\" } else:win32 { diff --git a/resources/data.zip b/resources/data.zip Binary files differindex 02ef61f..e04b621 100644 --- a/resources/data.zip +++ b/resources/data.zip |