Menu
▾
▴
ogreaddons-svnmail — Commit messages from subversion
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
(7) |
Jul
(24) |
Aug
(4) |
Sep
(6) |
Oct
(6) |
Nov
(23) |
Dec
(62) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(34) |
Feb
(33) |
Mar
(21) |
Apr
(13) |
May
(8) |
Jun
(15) |
Jul
(8) |
Aug
(10) |
Sep
(22) |
Oct
(3) |
Nov
(4) |
Dec
(15) |
| 2010 |
Jan
(7) |
Feb
(65) |
Mar
(30) |
Apr
(21) |
May
(15) |
Jun
(15) |
Jul
(25) |
Aug
(14) |
Sep
(11) |
Oct
|
Nov
(3) |
Dec
|
| 2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(1) |
|
From: <bel...@us...> - 2010-07-16 02:04:28
|
Revision: 2941
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2941&view=rev
Author: bellyfish
Date: 2010-07-16 02:04:19 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
* OgreBullet license changed to MIT.
Modified Paths:
--------------
trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugContact.h
trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugDrawer.h
trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugLines.h
trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugShape.h
trunk/ogrebullet/Collisions/include/OgreBulletCollisions.h
trunk/ogrebullet/Collisions/include/OgreBulletCollisionsObject.h
trunk/ogrebullet/Collisions/include/OgreBulletCollisionsObjectState.h
trunk/ogrebullet/Collisions/include/OgreBulletCollisionsPreRequisites.h
trunk/ogrebullet/Collisions/include/OgreBulletCollisionsRay.h
trunk/ogrebullet/Collisions/include/OgreBulletCollisionsShape.h
trunk/ogrebullet/Collisions/include/OgreBulletCollisionsWorld.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsBoxShape.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsCapsuleShape.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsCompoundShape.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsConeShape.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsConvexHullShape.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsCylinderShape.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsGImpactShape.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsMinkowskiSumShape.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsMultiSphereShape.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsSphereShape.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsStaticPlaneShape.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsTriangleShape.h
trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsTrimeshShape.h
trunk/ogrebullet/Collisions/include/Utils/OgreBulletCollisionsMeshToShapeConverter.h
trunk/ogrebullet/Collisions/include/Utils/OgreBulletConverter.h
trunk/ogrebullet/Collisions/scripts/VC8/OgreBulletCollisions_CVS_Eihort.vcproj
trunk/ogrebullet/Collisions/src/Debug/OgreBulletCollisionsDebugContact.cpp
trunk/ogrebullet/Collisions/src/Debug/OgreBulletCollisionsDebugDrawer.cpp
trunk/ogrebullet/Collisions/src/Debug/OgreBulletCollisionsDebugLines.cpp
trunk/ogrebullet/Collisions/src/Debug/OgreBulletCollisionsDebugShape.cpp
trunk/ogrebullet/Collisions/src/OgreBulletCollisionsObject.cpp
trunk/ogrebullet/Collisions/src/OgreBulletCollisionsObjectState.cpp
trunk/ogrebullet/Collisions/src/OgreBulletCollisionsPrecompiled.cpp
trunk/ogrebullet/Collisions/src/OgreBulletCollisionsRay.cpp
trunk/ogrebullet/Collisions/src/OgreBulletCollisionsShape.cpp
trunk/ogrebullet/Collisions/src/OgreBulletCollisionsWorld.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsBoxShape.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsCapsuleShape.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsCompoundShape.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsConeShape.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsConvexHullShape.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsCylinderShape.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsGImpactShape.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsMinkowskiSumShape.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsMultiSphereShape.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsSphereShape.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsStaticPlaneShape.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsTriangleShape.cpp
trunk/ogrebullet/Collisions/src/Shapes/OgreBulletCollisionsTrimeshShape.cpp
trunk/ogrebullet/Collisions/src/Utils/OgreBulletCollisionsMeshToShapeConverter.cpp
trunk/ogrebullet/Dynamics/include/Constraints/OgreBulletDynamics6DofConstraint.h
trunk/ogrebullet/Dynamics/include/Constraints/OgreBulletDynamicsConeTwistConstraint.h
trunk/ogrebullet/Dynamics/include/Constraints/OgreBulletDynamicsHingeConstraint.h
trunk/ogrebullet/Dynamics/include/Constraints/OgreBulletDynamicsPoint2pointConstraint.h
trunk/ogrebullet/Dynamics/include/Constraints/OgreBulletDynamicsRaycastVehicle.h
trunk/ogrebullet/Dynamics/include/OgreBulletDynamics.h
trunk/ogrebullet/Dynamics/include/OgreBulletDynamicsConstraint.h
trunk/ogrebullet/Dynamics/include/OgreBulletDynamicsObjectState.h
trunk/ogrebullet/Dynamics/include/OgreBulletDynamicsPreRequisites.h
trunk/ogrebullet/Dynamics/include/OgreBulletDynamicsRigidBody.h
trunk/ogrebullet/Dynamics/include/OgreBulletDynamicsWorld.h
trunk/ogrebullet/Dynamics/include/Prefab/OgreBulletDynamicsRagDoll.h
trunk/ogrebullet/Dynamics/src/Constraints/OgreBulletDynamics6DofConstraint.cpp
trunk/ogrebullet/Dynamics/src/Constraints/OgreBulletDynamicsConeTwistConstraint.cpp
trunk/ogrebullet/Dynamics/src/Constraints/OgreBulletDynamicsHingeConstraint.cpp
trunk/ogrebullet/Dynamics/src/Constraints/OgreBulletDynamicsPoint2pointConstraint.cpp
trunk/ogrebullet/Dynamics/src/Constraints/OgreBulletDynamicsRaycastVehicle.cpp
trunk/ogrebullet/Dynamics/src/OgreBulletDynamicsConstraint.cpp
trunk/ogrebullet/Dynamics/src/OgreBulletDynamicsObjectState.cpp
trunk/ogrebullet/Dynamics/src/OgreBulletDynamicsPrecompiled.cpp
trunk/ogrebullet/Dynamics/src/OgreBulletDynamicsRigidBody.cpp
trunk/ogrebullet/Dynamics/src/OgreBulletDynamicsWorld.cpp
trunk/ogrebullet/Dynamics/src/Prefab/OgreBulletDynamicsRagDoll.cpp
trunk/ogrebullet/OgreBullet_licence.txt
trunk/ogrebullet/nsis/license.txt
trunk/ogrebullet/srclistfileOgreBullet.txt
Removed Paths:
-------------
trunk/ogrebullet/OgreBullet_LGPL.txt
Modified: trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugContact.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugContact.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugContact.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugDrawer.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugDrawer.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugDrawer.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
#ifndef _OgreBulletCollisions_DebugDrawer_H_
Modified: trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugLines.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugLines.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugLines.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
#ifndef _OgreBulletCollisions_DEBUGLines_H_
Modified: trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Debug/OgreBulletCollisionsDebugShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
#ifndef _OgreBulletCollisions_DEBUGOBJECT_H_
Modified: trunk/ogrebullet/Collisions/include/OgreBulletCollisions.h
===================================================================
--- trunk/ogrebullet/Collisions/include/OgreBulletCollisions.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/OgreBulletCollisions.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/OgreBulletCollisionsObject.h
===================================================================
--- trunk/ogrebullet/Collisions/include/OgreBulletCollisionsObject.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/OgreBulletCollisionsObject.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/OgreBulletCollisionsObjectState.h
===================================================================
--- trunk/ogrebullet/Collisions/include/OgreBulletCollisionsObjectState.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/OgreBulletCollisionsObjectState.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/OgreBulletCollisionsPreRequisites.h
===================================================================
--- trunk/ogrebullet/Collisions/include/OgreBulletCollisionsPreRequisites.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/OgreBulletCollisionsPreRequisites.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/OgreBulletCollisionsRay.h
===================================================================
--- trunk/ogrebullet/Collisions/include/OgreBulletCollisionsRay.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/OgreBulletCollisionsRay.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/OgreBulletCollisionsShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/OgreBulletCollisionsShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/OgreBulletCollisionsShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/OgreBulletCollisionsWorld.h
===================================================================
--- trunk/ogrebullet/Collisions/include/OgreBulletCollisionsWorld.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/OgreBulletCollisionsWorld.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsBoxShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsBoxShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsBoxShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsCapsuleShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsCapsuleShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsCapsuleShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsCompoundShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsCompoundShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsCompoundShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsConeShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsConeShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsConeShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsConvexHullShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsConvexHullShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsConvexHullShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsCylinderShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsCylinderShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsCylinderShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsGImpactShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsGImpactShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsGImpactShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
#ifndef _OGREBULLETCOLLISIONS_GImpact_Shapes_H
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsMinkowskiSumShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsMinkowskiSumShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsMinkowskiSumShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsMultiSphereShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsMultiSphereShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsMultiSphereShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsSphereShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsSphereShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsSphereShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsStaticPlaneShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsStaticPlaneShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsStaticPlaneShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsTriangleShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsTriangleShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsTriangleShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GPL General Public License with runtime exception as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-You should have received a copy of the GPL General Public License with runtime exception along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-----------------------------------------------------------------------------
*/
Modified: trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsTrimeshShape.h
===================================================================
--- trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsTrimeshShape.h 2010-07-11 13:02:17 UTC (rev 2940)
+++ trunk/ogrebullet/Collisions/include/Shapes/OgreBulletCollisionsTrimeshShape.h 2010-07-16 02:04:19 UTC (rev 2941)
@@ -8,19 +8,23 @@
...
[truncated message content] |
|
From: <es...@us...> - 2010-07-11 13:02:23
|
Revision: 2940
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2940&view=rev
Author: esuvs
Date: 2010-07-11 13:02:17 +0000 (Sun, 11 Jul 2010)
Log Message:
-----------
Added ObjectStore.
Modified Paths:
--------------
trunk/QtOgreFramework/EngineTest/CMakeLists.txt
trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
trunk/QtOgreFramework/EngineTest/media/scripts/update.js
trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
Added Paths:
-----------
trunk/QtOgreFramework/EngineTest/include/ObjectStore.h
trunk/QtOgreFramework/EngineTest/source/ObjectStore.cpp
Modified: trunk/QtOgreFramework/EngineTest/CMakeLists.txt
===================================================================
--- trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-07-11 10:21:09 UTC (rev 2939)
+++ trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-07-11 13:02:17 UTC (rev 2940)
@@ -9,6 +9,7 @@
source/Mouse.cpp
source/EngineTestGameLogic.cpp
source/Keyboard.cpp
+ source/ObjectStore.cpp
source/ScriptEditorWidget.cpp
)
@@ -18,6 +19,7 @@
include/Keyboard.h
include/Light.h
include/Mouse.h
+ include/ObjectStore.h
include/ScriptEditorWidget.h
)
Modified: trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-07-11 10:21:09 UTC (rev 2939)
+++ trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-07-11 13:02:17 UTC (rev 2940)
@@ -3,10 +3,11 @@
#include "CameraWrapper.h"
#include "GameLogic.h"
+#include "Keyboard.h"
#include "Light.h"
#include "Log.h"
-#include "Keyboard.h"
#include "Mouse.h"
+#include "ObjectStore.h"
#include "ScriptEditorWidget.h"
#include <OgreCamera.h>
@@ -88,6 +89,8 @@
bool m_bRunScript;
QHash<QString, Light*> m_Lights;
+
+ ObjectStore mObjectStore;
};
#endif /*ENGINETESTGAMELOGIC_H_*/
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/include/ObjectStore.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/ObjectStore.h (rev 0)
+++ trunk/QtOgreFramework/EngineTest/include/ObjectStore.h 2010-07-11 13:02:17 UTC (rev 2940)
@@ -0,0 +1,18 @@
+#ifndef OBJECTSTORE_H_
+#define OBJECTSTORE_H_
+
+#include <QHash>
+#include <QObject>
+
+class ObjectStore : public QObject, public QHash<QString, QObject*>
+{
+ Q_OBJECT
+
+//public slots:
+public:
+ Q_INVOKABLE QObject* getObject(const QString& name);
+
+ Q_INVOKABLE void setObject(const QString& name, QObject* object);
+};
+
+#endif //OBJECTSTORE_H_
\ No newline at end of file
Modified: trunk/QtOgreFramework/EngineTest/media/scripts/update.js
===================================================================
--- trunk/QtOgreFramework/EngineTest/media/scripts/update.js 2010-07-11 10:21:09 UTC (rev 2939)
+++ trunk/QtOgreFramework/EngineTest/media/scripts/update.js 2010-07-11 13:02:17 UTC (rev 2940)
@@ -44,4 +44,6 @@
tempFOV = new OgreRadian(-wheelDelta * 0.001);
fov.valueRadians = fov.valueRadians + tempFOV.valueRadians;
//print('new fov = ', fov.valueRadians);
-camera.setFOVy(fov);
\ No newline at end of file
+camera.setFOVy(fov);
+
+print('Colour = ', objectStore.getObject('BlueLight').Colour);
\ No newline at end of file
Modified: trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-07-11 10:21:09 UTC (rev 2939)
+++ trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-07-11 13:02:17 UTC (rev 2940)
@@ -66,6 +66,9 @@
Qt.setProperty("App", scriptEngine->newQObject(qApp));
scriptEngine->globalObject().setProperty("Qt", Qt);
+ QScriptValue objectStoreScriptValue = scriptEngine->newQObject(&mObjectStore);
+ scriptEngine->globalObject().setProperty("objectStore", objectStoreScriptValue);
+
qScriptRegisterMetaType(scriptEngine, toScriptValueQPoint, fromScriptValueQPoint);
OgreVector3Class *vecClass = new OgreVector3Class(scriptEngine);
@@ -143,6 +146,12 @@
light->setColour(QColor(0, 255, 0));
m_Lights["GreenLight"] = light;
+ Light* blueLight = new Light();
+ blueLight->setPosition(QVector3D(0.0,0.0,0.0));
+ blueLight->setColour(QColor(0, 0, 255));
+ //m_Lights["GreenLight"] = blueLight;
+ mObjectStore.setObject("BlueLight", blueLight);
+
}
void EngineTestGameLogic::update(void)
@@ -182,28 +191,24 @@
mouse.resetDelta();
mouse.resetWheelDelta();
- //Update the lights
mSceneManager->destroyAllLights();
- /*foreach(Light* light, m_Lights)
- {
- Ogre::Light* ogreLight = mSceneManager->createLight("pointLight");
- pointLight->setType(Ogre::Light::LT_POINT);
- pointLight->setPosition(Ogre::Vector3(0, 0, 0));
- pointLight->setDiffuseColour(1.0, 0.0, 0.0);
- }*/
- QHashIterator<QString, Light*> lightIter(m_Lights);
+ QHashIterator<QString, QObject*> lightIter(mObjectStore);
while(lightIter.hasNext())
{
lightIter.next();
- Ogre::Light* ogreLight = mSceneManager->createLight(lightIter.key().toStdString());
- ogreLight->setType(Ogre::Light::LT_POINT);
+ Light* light = dynamic_cast<Light*>(lightIter.value());
+ if(light)
+ {
+ Ogre::Light* ogreLight = mSceneManager->createLight(lightIter.key().toStdString());
+ ogreLight->setType(Ogre::Light::LT_POINT);
- QVector3D pos = lightIter.value()->getPosition();
- ogreLight->setPosition(Ogre::Vector3(pos.x(), pos.y(), pos.z()));
+ QVector3D pos = light->getPosition();
+ ogreLight->setPosition(Ogre::Vector3(pos.x(), pos.y(), pos.z()));
- QColor col = lightIter.value()->getColour();
- ogreLight->setDiffuseColour(col.redF(), col.greenF(), col.blueF());
+ QColor col = light->getColour();
+ ogreLight->setDiffuseColour(col.redF(), col.greenF(), col.blueF());
+ }
}
}
Added: trunk/QtOgreFramework/EngineTest/source/ObjectStore.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/ObjectStore.cpp (rev 0)
+++ trunk/QtOgreFramework/EngineTest/source/ObjectStore.cpp 2010-07-11 13:02:17 UTC (rev 2940)
@@ -0,0 +1,11 @@
+#include "ObjectStore.h"
+
+Q_INVOKABLE QObject* ObjectStore::getObject(const QString& name)
+{
+ return value(name);
+}
+
+Q_INVOKABLE void ObjectStore::setObject(const QString& name, QObject* object)
+{
+ insert(name, object);
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-07-11 10:21:15
|
Revision: 2939
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2939&view=rev
Author: esuvs
Date: 2010-07-11 10:21:09 +0000 (Sun, 11 Jul 2010)
Log Message:
-----------
Added new light type as QObject.
Modified Paths:
--------------
trunk/QtOgreFramework/EngineTest/CMakeLists.txt
trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
trunk/QtOgreFramework/EngineTest/include/ScriptEditorWidget.h
trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp
trunk/QtOgreFramework/EngineTest/ui/ScriptEditorWidget.ui
Added Paths:
-----------
trunk/QtOgreFramework/EngineTest/include/Light.h
trunk/QtOgreFramework/EngineTest/source/Light.cpp
Modified: trunk/QtOgreFramework/EngineTest/CMakeLists.txt
===================================================================
--- trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-07-10 15:34:13 UTC (rev 2938)
+++ trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-07-11 10:21:09 UTC (rev 2939)
@@ -4,6 +4,7 @@
SET(SRC_FILES
source/CameraWrapper.cpp
+ source/Light.cpp
source/main.cpp
source/Mouse.cpp
source/EngineTestGameLogic.cpp
@@ -15,6 +16,7 @@
include/CameraWrapper.h
include/EngineTestGameLogic.h
include/Keyboard.h
+ include/Light.h
include/Mouse.h
include/ScriptEditorWidget.h
)
Modified: trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-07-10 15:34:13 UTC (rev 2938)
+++ trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-07-11 10:21:09 UTC (rev 2939)
@@ -3,6 +3,7 @@
#include "CameraWrapper.h"
#include "GameLogic.h"
+#include "Light.h"
#include "Log.h"
#include "Keyboard.h"
#include "Mouse.h"
@@ -85,6 +86,8 @@
ScriptEditorWidget* m_pScriptEditorWidget;
bool m_bRunScript;
+
+ QHash<QString, Light*> m_Lights;
};
#endif /*ENGINETESTGAMELOGIC_H_*/
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/include/Light.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/Light.h (rev 0)
+++ trunk/QtOgreFramework/EngineTest/include/Light.h 2010-07-11 10:21:09 UTC (rev 2939)
@@ -0,0 +1,29 @@
+#ifndef LIGHT_H_
+#define LIGHT_H_
+
+#include <QColor>
+#include <QObject>
+#include <QVector3D>
+
+class Light : public QObject
+{
+ Q_OBJECT
+
+public:
+ Light(QObject * parent = 0);
+
+ Q_PROPERTY(QVector3D position READ getPosition WRITE setPosition)
+ Q_PROPERTY(QColor colour READ getColour WRITE setColour)
+
+public slots:
+ QVector3D getPosition(void) const;
+ void setPosition(const QVector3D& pos);
+
+ QColor getColour(void) const;
+ void setColour(const QColor& col);
+private:
+ QVector3D m_vecPosition;
+ QColor m_colColour;
+};
+
+#endif //LIGHT_H_
\ No newline at end of file
Modified: trunk/QtOgreFramework/EngineTest/include/ScriptEditorWidget.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/ScriptEditorWidget.h 2010-07-10 15:34:13 UTC (rev 2938)
+++ trunk/QtOgreFramework/EngineTest/include/ScriptEditorWidget.h 2010-07-11 10:21:09 UTC (rev 2939)
@@ -13,12 +13,9 @@
QString getScriptCode(void);
signals:
- void play(void);
+ void start(void);
void stop(void);
-private slots:
- //void on_m_pPlayButton_Clicked(void);
-
};
#endif /*ENGINETEST_SCRIPTEDITORWIDGET_H_*/
Modified: trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-07-10 15:34:13 UTC (rev 2938)
+++ trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-07-11 10:21:09 UTC (rev 2939)
@@ -101,7 +101,7 @@
//mApplication->ogreRenderWindow()->addViewport(mCamera)->setBackgroundColour(Ogre::ColourValue::Black);
- mSceneManager->setAmbientLight( Ogre::ColourValue( 1, 1, 1 ) );
+ mSceneManager->setAmbientLight( Ogre::ColourValue( 0.3, 0.3, 0.3 ) );
mTime = new QTime;
mTime->start();
@@ -130,17 +130,19 @@
m_pScriptEditorWidget = new ScriptEditorWidget(qApp->mainWidget());
m_pScriptEditorWidget->show();
- connect(m_pScriptEditorWidget, SIGNAL(play(void)), this, SLOT(startScriptingEngine(void)));
+ connect(m_pScriptEditorWidget, SIGNAL(start(void)), this, SLOT(startScriptingEngine(void)));
connect(m_pScriptEditorWidget, SIGNAL(stop(void)), this, SLOT(stopScriptingEngine(void)));
+ /*Ogre::Light* pointLight = mSceneManager->createLight("pointLight");
+ pointLight->setType(Ogre::Light::LT_POINT);
+ pointLight->setPosition(Ogre::Vector3(0, 0, 0));
+ pointLight->setDiffuseColour(1.0, 0.0, 0.0);*/
- /*cameraPositionScriptValue = scriptEngine->toScriptValue(mCamera->getPosition());
- cameraDirectionScriptValue = scriptEngine->toScriptValue(mCamera->getDirection());
- cameraRightScriptValue = scriptEngine->toScriptValue(mCamera->getRight());
+ Light* light = new Light();
+ light->setPosition(QVector3D(0.0,0.0,0.0));
+ light->setColour(QColor(0, 255, 0));
+ m_Lights["GreenLight"] = light;
- scriptEngine->globalObject().setProperty("cameraPosition", cameraPositionScriptValue);
- scriptEngine->globalObject().setProperty("cameraDirection", cameraDirectionScriptValue);
- scriptEngine->globalObject().setProperty("cameraRight", cameraRightScriptValue);*/
}
void EngineTestGameLogic::update(void)
@@ -179,6 +181,30 @@
mouse.resetDelta();
mouse.resetWheelDelta();
+
+ //Update the lights
+ mSceneManager->destroyAllLights();
+ /*foreach(Light* light, m_Lights)
+ {
+ Ogre::Light* ogreLight = mSceneManager->createLight("pointLight");
+ pointLight->setType(Ogre::Light::LT_POINT);
+ pointLight->setPosition(Ogre::Vector3(0, 0, 0));
+ pointLight->setDiffuseColour(1.0, 0.0, 0.0);
+ }*/
+ QHashIterator<QString, Light*> lightIter(m_Lights);
+ while(lightIter.hasNext())
+ {
+ lightIter.next();
+
+ Ogre::Light* ogreLight = mSceneManager->createLight(lightIter.key().toStdString());
+ ogreLight->setType(Ogre::Light::LT_POINT);
+
+ QVector3D pos = lightIter.value()->getPosition();
+ ogreLight->setPosition(Ogre::Vector3(pos.x(), pos.y(), pos.z()));
+
+ QColor col = lightIter.value()->getColour();
+ ogreLight->setDiffuseColour(col.redF(), col.greenF(), col.blueF());
+ }
}
void EngineTestGameLogic::shutdown(void)
Added: trunk/QtOgreFramework/EngineTest/source/Light.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/Light.cpp (rev 0)
+++ trunk/QtOgreFramework/EngineTest/source/Light.cpp 2010-07-11 10:21:09 UTC (rev 2939)
@@ -0,0 +1,26 @@
+#include "Light.h"
+
+Light::Light(QObject * parent)
+ :QObject(parent)
+{
+}
+
+QVector3D Light::getPosition(void) const
+{
+ return m_vecPosition;
+}
+
+void Light::setPosition(const QVector3D& pos)
+{
+ m_vecPosition = pos;
+}
+
+QColor Light::getColour(void) const
+{
+ return m_colColour;
+}
+
+void Light::setColour(const QColor& col)
+{
+ m_colColour = col;
+}
\ No newline at end of file
Modified: trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp 2010-07-10 15:34:13 UTC (rev 2938)
+++ trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp 2010-07-11 10:21:09 UTC (rev 2939)
@@ -8,79 +8,23 @@
{
setupUi(this);
- connect(m_pPlayButton, SIGNAL(clicked(void)), this, SIGNAL(play(void)));
+ connect(m_pStartButton, SIGNAL(clicked(void)), this, SIGNAL(start(void)));
connect(m_pStopButton, SIGNAL(clicked(void)), this, SIGNAL(stop(void)));
- /*QString updateScript =
- "var pos = camera.position;\n"
- "var dir = camera.direction;\n"
- "var right = camera.right;\n"
- "if(keyboard.isPressed(Qt.Key_W))"
- "{"
- //" pos += dir;"
- " pos.setX(pos.x() + dir.x());"
- " pos.setY(pos.y() + dir.y());"
- " pos.setZ(pos.z() + dir.z());"
- "}"
- "if(keyboard.isPressed(Qt.Key_S))"
- "{"
- " pos.setX(pos.x() - dir.x());"
- " pos.setY(pos.y() - dir.y());"
- " pos.setZ(pos.z() - dir.z());"
- "}"
- "if(keyboard.isPressed(Qt.Key_A))"
- "{"
- " pos.setX(pos.x() - right.x());"
- " pos.setY(pos.y() - right.y());"
- " pos.setZ(pos.z() - right.z());"
- "}"
- "if(keyboard.isPressed(Qt.Key_D))"
- "{"
- " pos.setX(pos.x() + right.x());"
- " pos.setY(pos.y() + right.y());"
- " pos.setZ(pos.z() + right.z());"
- "}"
- "camera.position = pos;"
- "if(mouse.isPressed(Qt.RightButton))"
- "{"
- " mouseDelta = mouse.computeDelta();"
- " camera.yaw(new OgreRadian(-mouseDelta.x * 0.01));"
- "}"
- "if(mouse.isPressed(Qt.RightButton))"
- "{"
- " mouseDelta = mouse.computeDelta();"
- " camera.pitch(new OgreRadian(-mouseDelta.y * 0.01));"
- "}"
- "wheelDelta = mouse.getWheelDelta();"
- //"print('wheelDelta = ', wheelDelta);"
- "fov = camera.getFOVy();"
- //"print('old fov = ', fov.valueRadians);"
- "tempFOV = new OgreRadian(-wheelDelta * 0.001);"
- "fov.valueRadians = fov.valueRadians + tempFOV.valueRadians;"
- //"print('new fov = ', fov.valueRadians);"
- "camera.setFOVy(fov);"
- ;*/
-
QFile updateScriptFile("media\\scripts\\update.js");
- if (updateScriptFile.open(QFile::ReadOnly))
- {
- QTextStream stream(&updateScriptFile);
- m_pTextEdit->setPlainText(stream.readAll());
+ if (updateScriptFile.open(QFile::ReadOnly))
+ {
+ QTextStream stream(&updateScriptFile);
+ m_pTextEdit->setPlainText(stream.readAll());
updateScriptFile.close();
}
else
{
m_pTextEdit->setPlainText("////Failed to open file");
}
-
- //m_pTextEdit->setPlainText(updateScript);
}
-/*void ScriptEditorWidget::on_m_pPlayButton_Clicked(void)
-{
-}*/
-
QString ScriptEditorWidget::getScriptCode(void)
{
return m_pTextEdit->toPlainText();
Modified: trunk/QtOgreFramework/EngineTest/ui/ScriptEditorWidget.ui
===================================================================
--- trunk/QtOgreFramework/EngineTest/ui/ScriptEditorWidget.ui 2010-07-10 15:34:13 UTC (rev 2938)
+++ trunk/QtOgreFramework/EngineTest/ui/ScriptEditorWidget.ui 2010-07-11 10:21:09 UTC (rev 2939)
@@ -15,9 +15,9 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <widget class="QPushButton" name="m_pPlayButton">
+ <widget class="QPushButton" name="m_pStartButton">
<property name="text">
- <string>Play</string>
+ <string>Start</string>
</property>
</widget>
</item>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kal...@us...> - 2010-07-10 15:34:20
|
Revision: 2938
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2938&view=rev
Author: kallaspriit
Date: 2010-07-10 15:34:13 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
- Updated VS9 project files to work properly with Ogre 1.7
- Added third optional parameter "name" to OgreNewt::World contructor that is the name of the created world that defaults to "main". You can use this name to statically get the world instance using OgreNewt::World::get(name) where name defaults to "main" also, so you don't have to set the name if you are using the default one in your constructor, just OgreNewt::World::get() will return the default-named instance. This is added for comfort, so you don't have to carry the world instance around to call OgreNewt methods that require pointer to the world.
Modified Paths:
--------------
branches/ogrenewt/newton20/OgreNewt.vcproj
branches/ogrenewt/newton20/OgreNewt_VS9.suo
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.suo
branches/ogrenewt/newton20/inc/OgreNewt_World.h
branches/ogrenewt/newton20/src/OgreNewt_World.cpp
Removed Paths:
-------------
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.sdf
Property Changed:
----------------
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/
Modified: branches/ogrenewt/newton20/OgreNewt.vcproj
===================================================================
--- branches/ogrenewt/newton20/OgreNewt.vcproj 2010-07-10 10:24:08 UTC (rev 2937)
+++ branches/ogrenewt/newton20/OgreNewt.vcproj 2010-07-10 15:34:13 UTC (rev 2938)
@@ -215,7 +215,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy $(OutDir)\OgreNewt.dll demos\bin\Release\OgreNewt.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreGUIRenderer.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIBase.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIExpatParser.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" "demos\bin\Release\cg.dll"

if exist "$(OGRE_HOME)\bin\release\OgreMain.dll" copy "$(OGRE_HOME)\bin\release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_HOME)\bin\release\OIS.dll" copy "$(OGRE_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\bin\release\OgreGUIRenderer.dll" copy "$(OGRE_HOME)\bin\release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_HOME)\bin\release\CEGUIBase.dll" copy "$(OGRE_HOME)\bin\release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_HOME)\bin\release\CEGUIExpatParser.dll" copy "$(OGRE_HOME)\bin\release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_HOME)\bin\release\cg.dll" copy "$(OGRE_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Release\newton.dll
copy $(NEWTON_HOME)\sdk\x32\JointLibrary.dll demos\bin\Release\JointLibrary.dll
"
+ CommandLine="copy $(OutDir)\OgreNewt.dll demos\bin\Release\OgreNewt.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreGUIRenderer.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIBase.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIExpatParser.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" "demos\bin\Release\cg.dll"

if exist "$(OGRE_HOME)\bin\release\OgreMain.dll" copy "$(OGRE_HOME)\bin\release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_HOME)\bin\release\OIS.dll" copy "$(OGRE_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\bin\release\OgreGUIRenderer.dll" copy "$(OGRE_HOME)\bin\release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_HOME)\bin\release\CEGUIBase.dll" copy "$(OGRE_HOME)\bin\release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_HOME)\bin\release\CEGUIExpatParser.dll" copy "$(OGRE_HOME)\bin\release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_HOME)\bin\release\cg.dll" copy "$(OGRE_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

if exist "$(OGRE_BUILD_HOME)\bin\release\OgreMain.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager.dll" copy "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OgreGUIRenderer.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\CEGUIBase.dll" copy "$(OGRE_BUILD_HOME)\bin\release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\CEGUIExpatParser.dll" copy "$(OGRE_BUILD_HOME)\bin\release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Release\newton.dll
copy $(NEWTON_HOME)\sdk\x32\JointLibrary.dll demos\bin\Release\JointLibrary.dll"
/>
</Configuration>
</Configurations>
Modified: branches/ogrenewt/newton20/OgreNewt_VS9.suo
===================================================================
(Binary files differ)
Property changes on: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication
___________________________________________________________________
Modified: svn:ignore
- *.dll
*.exe
*.ilk
*.ncb
*.opensdf
*.pdb
*.user
obj
ogre.cfg
ogre.log
+ *.dll
*.exe
*.ilk
*.ncb
*.opensdf
*.pdb
*.sdf
*.user
obj
ogre.cfg
ogre.log
Deleted: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.sdf
===================================================================
(Binary files differ)
Modified: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.suo
===================================================================
(Binary files differ)
Modified: branches/ogrenewt/newton20/inc/OgreNewt_World.h
===================================================================
--- branches/ogrenewt/newton20/inc/OgreNewt_World.h 2010-07-10 10:24:08 UTC (rev 2937)
+++ branches/ogrenewt/newton20/inc/OgreNewt_World.h 2010-07-10 15:34:13 UTC (rev 2938)
@@ -19,6 +19,8 @@
#include "OgreNewt_BodyInAABBIterator.h"
#include "OgreNewt_Debugger.h"
+#include <map>
+
//! main namespace.
/*!
This is the main namespace for the OgreNewt library. all classes are included in this namespace.
@@ -86,12 +88,22 @@
typedef boost::function<void(OgreNewt::Body*, int threadIndex)> LeaveWorldCallback;
public:
- //! Standard Constructor, creates the world.
- World(Ogre::Real desiredFps = 100.0f, int maxUpdatesPerFrames = 5);
+ //! Constructor, creates the world and gives it a name
+ /*!
+ The name can later be used to get world reference using OgreNewt::World::get(name)
+ */
+ World(Ogre::Real desiredFps = 100.0f, int maxUpdatesPerFrames = 5, Ogre::String name = "main");
//! Standard Destructor, destroys the world.
- ~World();
+ ~World();
+ //! Returns world instance by name given in constructor
+ /*!
+ Returns null if no world with given name has been created. Default world name for both
+ constructor and this method is "main"
+ */
+ static World* get(Ogre::String name = "main");
+
//! Set the newton world allocators,
/*!
Is is no necessary to call this function allocations default to malloc and free but if an application
@@ -339,6 +351,8 @@
typedef std::vector< BodyVector > BodyVectorVector;
//mutable BodyVectorVector m_bodyUpdateNodeRequests;
+ static std::map<Ogre::String, World*> worlds;
+
mutable Debugger* m_debugger;
#ifndef WIN32
Modified: branches/ogrenewt/newton20/src/OgreNewt_World.cpp
===================================================================
--- branches/ogrenewt/newton20/src/OgreNewt_World.cpp 2010-07-10 10:24:08 UTC (rev 2937)
+++ branches/ogrenewt/newton20/src/OgreNewt_World.cpp 2010-07-10 15:34:13 UTC (rev 2938)
@@ -10,9 +10,10 @@
namespace OgreNewt
{
+std::map<Ogre::String, World*> World::worlds = std::map<Ogre::String, World*>();
// Constructor
-World::World(Ogre::Real desiredFps, int maxUpdatesPerFrames) :
+World::World(Ogre::Real desiredFps, int maxUpdatesPerFrames, Ogre::String name) :
m_bodyInAABBIterator(this)
{
#ifndef WIN32
@@ -54,6 +55,8 @@
// set one tread by default
setThreadCount(1);
+ // store the world by name in a static map
+ worlds[name] = this;
}
// Destructor
@@ -78,7 +81,18 @@
}
}
+World* World::get(Ogre::String name)
+{
+ std::map<Ogre::String, World*>::const_iterator search = worlds.find(name);
+ if (search != worlds.end())
+ {
+ return search->second;
+ }
+
+ return NULL;
+}
+
void World::setUpdateFPS(Ogre::Real desiredFps, int maxUpdatesPerFrames)
{
if (maxUpdatesPerFrames < 1) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-07-10 10:24:14
|
Revision: 2937
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2937&view=rev
Author: esuvs
Date: 2010-07-10 10:24:08 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Working start and stop buttons for scripts.
Modified Paths:
--------------
trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp
Modified: trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-07-10 10:06:50 UTC (rev 2936)
+++ trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-07-10 10:24:08 UTC (rev 2937)
@@ -21,8 +21,9 @@
class StyleSettingsWidget;
-class EngineTestGameLogic : public QtOgre::GameLogic
+class EngineTestGameLogic : public QObject, public QtOgre::GameLogic
{
+ Q_OBJECT
public:
EngineTestGameLogic(void);
@@ -43,6 +44,10 @@
void loadScene(QString filename);
+private slots:
+ void startScriptingEngine(void);
+ void stopScriptingEngine(void);
+
private:
void initScriptEngine(void);
@@ -78,6 +83,8 @@
QScriptEngineDebugger debugger;
ScriptEditorWidget* m_pScriptEditorWidget;
+
+ bool m_bRunScript;
};
#endif /*ENGINETESTGAMELOGIC_H_*/
\ No newline at end of file
Modified: trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-07-10 10:06:50 UTC (rev 2936)
+++ trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-07-10 10:24:08 UTC (rev 2937)
@@ -44,7 +44,9 @@
EngineTestGameLogic::EngineTestGameLogic(void)
:GameLogic()
+ ,m_bRunScript(true)
{
+
}
void EngineTestGameLogic::initialise(void)
@@ -127,6 +129,9 @@
m_pScriptEditorWidget = new ScriptEditorWidget(qApp->mainWidget());
m_pScriptEditorWidget->show();
+
+ connect(m_pScriptEditorWidget, SIGNAL(play(void)), this, SLOT(startScriptingEngine(void)));
+ connect(m_pScriptEditorWidget, SIGNAL(stop(void)), this, SLOT(stopScriptingEngine(void)));
/*cameraPositionScriptValue = scriptEngine->toScriptValue(mCamera->getPosition());
@@ -161,11 +166,15 @@
mIsFirstFrame = false;
- QScriptValue result = scriptEngine->evaluate(m_pScriptEditorWidget->getScriptCode());
- if (scriptEngine->hasUncaughtException())
+
+ if(m_bRunScript)
{
- int line = scriptEngine->uncaughtExceptionLineNumber();
- qCritical() << "uncaught exception at line" << line << ":" << result.toString();
+ QScriptValue result = scriptEngine->evaluate(m_pScriptEditorWidget->getScriptCode());
+ if (scriptEngine->hasUncaughtException())
+ {
+ int line = scriptEngine->uncaughtExceptionLineNumber();
+ qCritical() << "uncaught exception at line" << line << ":" << result.toString();
+ }
}
mouse.resetDelta();
@@ -298,3 +307,13 @@
}
}
}
+
+void EngineTestGameLogic::startScriptingEngine(void)
+{
+ m_bRunScript = true;
+}
+
+void EngineTestGameLogic::stopScriptingEngine(void)
+{
+ m_bRunScript = false;
+}
\ No newline at end of file
Modified: trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp 2010-07-10 10:06:50 UTC (rev 2936)
+++ trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp 2010-07-10 10:24:08 UTC (rev 2937)
@@ -9,6 +9,7 @@
setupUi(this);
connect(m_pPlayButton, SIGNAL(clicked(void)), this, SIGNAL(play(void)));
+ connect(m_pStopButton, SIGNAL(clicked(void)), this, SIGNAL(stop(void)));
/*QString updateScript =
"var pos = camera.position;\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-07-10 10:06:57
|
Revision: 2936
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2936&view=rev
Author: esuvs
Date: 2010-07-10 10:06:50 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Work on script editor.
Modified Paths:
--------------
trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
trunk/QtOgreFramework/EngineTest/include/ScriptEditorWidget.h
trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp
trunk/QtOgreFramework/EngineTest/ui/ScriptEditorWidget.ui
Added Paths:
-----------
trunk/QtOgreFramework/EngineTest/media/scripts/
trunk/QtOgreFramework/EngineTest/media/scripts/update.js
Modified: trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-07-10 08:18:11 UTC (rev 2935)
+++ trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-07-10 10:06:50 UTC (rev 2936)
@@ -70,7 +70,6 @@
//Scripting
QScriptEngine* scriptEngine;
- QString updateScript;
CameraWrapper cameraWrapper;
QScriptValue cameraPositionScriptValue;
QScriptValue cameraDirectionScriptValue;
Modified: trunk/QtOgreFramework/EngineTest/include/ScriptEditorWidget.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/ScriptEditorWidget.h 2010-07-10 08:18:11 UTC (rev 2935)
+++ trunk/QtOgreFramework/EngineTest/include/ScriptEditorWidget.h 2010-07-10 10:06:50 UTC (rev 2936)
@@ -9,6 +9,16 @@
public:
ScriptEditorWidget(QWidget *parent = 0);
+
+ QString getScriptCode(void);
+
+signals:
+ void play(void);
+ void stop(void);
+
+private slots:
+ //void on_m_pPlayButton_Clicked(void);
+
};
#endif /*ENGINETEST_SCRIPTEDITORWIDGET_H_*/
Added: trunk/QtOgreFramework/EngineTest/media/scripts/update.js
===================================================================
--- trunk/QtOgreFramework/EngineTest/media/scripts/update.js (rev 0)
+++ trunk/QtOgreFramework/EngineTest/media/scripts/update.js 2010-07-10 10:06:50 UTC (rev 2936)
@@ -0,0 +1,47 @@
+var pos = camera.position;
+var dir = camera.direction;
+var right = camera.right;
+if(keyboard.isPressed(Qt.Key_W))
+{
+// pos += dir;
+ pos.setX(pos.x() + dir.x());
+ pos.setY(pos.y() + dir.y());
+ pos.setZ(pos.z() + dir.z());
+}
+if(keyboard.isPressed(Qt.Key_S))
+{
+ pos.setX(pos.x() - dir.x());
+ pos.setY(pos.y() - dir.y());
+ pos.setZ(pos.z() - dir.z());
+}
+if(keyboard.isPressed(Qt.Key_A))
+{
+ pos.setX(pos.x() - right.x());
+ pos.setY(pos.y() - right.y());
+ pos.setZ(pos.z() - right.z());
+}
+if(keyboard.isPressed(Qt.Key_D))
+{
+ pos.setX(pos.x() + right.x());
+ pos.setY(pos.y() + right.y());
+ pos.setZ(pos.z() + right.z());
+}
+camera.position = pos;
+if(mouse.isPressed(Qt.RightButton))
+{
+ mouseDelta = mouse.computeDelta();
+ camera.yaw(new OgreRadian(-mouseDelta.x * 0.01));
+}
+if(mouse.isPressed(Qt.RightButton))
+{
+ mouseDelta = mouse.computeDelta();
+ camera.pitch(new OgreRadian(-mouseDelta.y * 0.01));
+}
+wheelDelta = mouse.getWheelDelta();
+//print('wheelDelta = ', wheelDelta);
+fov = camera.getFOVy();
+//print('old fov = ', fov.valueRadians);
+tempFOV = new OgreRadian(-wheelDelta * 0.001);
+fov.valueRadians = fov.valueRadians + tempFOV.valueRadians;
+//print('new fov = ', fov.valueRadians);
+camera.setFOVy(fov);
\ No newline at end of file
Modified: trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-07-10 08:18:11 UTC (rev 2935)
+++ trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-07-10 10:06:50 UTC (rev 2936)
@@ -72,56 +72,6 @@
OgreRadianClass *radianClass = new OgreRadianClass(scriptEngine);
scriptEngine->globalObject().setProperty("OgreRadian", radianClass->constructor());
- updateScript =
- "var pos = camera.position;"
- "var dir = camera.direction;"
- "var right = camera.right;"
- "if(keyboard.isPressed(Qt.Key_W))"
- "{"
- //" pos += dir;"
- " pos.setX(pos.x() + dir.x());"
- " pos.setY(pos.y() + dir.y());"
- " pos.setZ(pos.z() + dir.z());"
- "}"
- "if(keyboard.isPressed(Qt.Key_S))"
- "{"
- " pos.setX(pos.x() - dir.x());"
- " pos.setY(pos.y() - dir.y());"
- " pos.setZ(pos.z() - dir.z());"
- "}"
- "if(keyboard.isPressed(Qt.Key_A))"
- "{"
- " pos.setX(pos.x() - right.x());"
- " pos.setY(pos.y() - right.y());"
- " pos.setZ(pos.z() - right.z());"
- "}"
- "if(keyboard.isPressed(Qt.Key_D))"
- "{"
- " pos.setX(pos.x() + right.x());"
- " pos.setY(pos.y() + right.y());"
- " pos.setZ(pos.z() + right.z());"
- "}"
- "camera.position = pos;"
- "if(mouse.isPressed(Qt.RightButton))"
- "{"
- " mouseDelta = mouse.computeDelta();"
- " camera.yaw(new OgreRadian(-mouseDelta.x * 0.01));"
- "}"
- "if(mouse.isPressed(Qt.RightButton))"
- "{"
- " mouseDelta = mouse.computeDelta();"
- " camera.pitch(new OgreRadian(-mouseDelta.y * 0.01));"
- "}"
- "wheelDelta = mouse.getWheelDelta();"
- //"print('wheelDelta = ', wheelDelta);"
- "fov = camera.getFOVy();"
- //"print('old fov = ', fov.valueRadians);"
- "tempFOV = new OgreRadian(-wheelDelta * 0.001);"
- "fov.valueRadians = fov.valueRadians + tempFOV.valueRadians;"
- //"print('new fov = ', fov.valueRadians);"
- "camera.setFOVy(fov);"
- ;
-
//debugger.attachTo(scriptEngine);
//debugger.action(QScriptEngineDebugger::InterruptAction)->trigger();
@@ -211,7 +161,7 @@
mIsFirstFrame = false;
- QScriptValue result = scriptEngine->evaluate(updateScript);
+ QScriptValue result = scriptEngine->evaluate(m_pScriptEditorWidget->getScriptCode());
if (scriptEngine->hasUncaughtException())
{
int line = scriptEngine->uncaughtExceptionLineNumber();
Modified: trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp 2010-07-10 08:18:11 UTC (rev 2935)
+++ trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp 2010-07-10 10:06:50 UTC (rev 2936)
@@ -1,7 +1,86 @@
#include "ScriptEditorWidget.h"
+#include <QFile>
+#include <QTextStream>
+
ScriptEditorWidget::ScriptEditorWidget(QWidget *parent)
:QWidget(parent, Qt::Tool)
{
- setupUi(this);
+ setupUi(this);
+
+ connect(m_pPlayButton, SIGNAL(clicked(void)), this, SIGNAL(play(void)));
+
+ /*QString updateScript =
+ "var pos = camera.position;\n"
+ "var dir = camera.direction;\n"
+ "var right = camera.right;\n"
+ "if(keyboard.isPressed(Qt.Key_W))"
+ "{"
+ //" pos += dir;"
+ " pos.setX(pos.x() + dir.x());"
+ " pos.setY(pos.y() + dir.y());"
+ " pos.setZ(pos.z() + dir.z());"
+ "}"
+ "if(keyboard.isPressed(Qt.Key_S))"
+ "{"
+ " pos.setX(pos.x() - dir.x());"
+ " pos.setY(pos.y() - dir.y());"
+ " pos.setZ(pos.z() - dir.z());"
+ "}"
+ "if(keyboard.isPressed(Qt.Key_A))"
+ "{"
+ " pos.setX(pos.x() - right.x());"
+ " pos.setY(pos.y() - right.y());"
+ " pos.setZ(pos.z() - right.z());"
+ "}"
+ "if(keyboard.isPressed(Qt.Key_D))"
+ "{"
+ " pos.setX(pos.x() + right.x());"
+ " pos.setY(pos.y() + right.y());"
+ " pos.setZ(pos.z() + right.z());"
+ "}"
+ "camera.position = pos;"
+ "if(mouse.isPressed(Qt.RightButton))"
+ "{"
+ " mouseDelta = mouse.computeDelta();"
+ " camera.yaw(new OgreRadian(-mouseDelta.x * 0.01));"
+ "}"
+ "if(mouse.isPressed(Qt.RightButton))"
+ "{"
+ " mouseDelta = mouse.computeDelta();"
+ " camera.pitch(new OgreRadian(-mouseDelta.y * 0.01));"
+ "}"
+ "wheelDelta = mouse.getWheelDelta();"
+ //"print('wheelDelta = ', wheelDelta);"
+ "fov = camera.getFOVy();"
+ //"print('old fov = ', fov.valueRadians);"
+ "tempFOV = new OgreRadian(-wheelDelta * 0.001);"
+ "fov.valueRadians = fov.valueRadians + tempFOV.valueRadians;"
+ //"print('new fov = ', fov.valueRadians);"
+ "camera.setFOVy(fov);"
+ ;*/
+
+ QFile updateScriptFile("media\\scripts\\update.js");
+
+ if (updateScriptFile.open(QFile::ReadOnly))
+ {
+ QTextStream stream(&updateScriptFile);
+ m_pTextEdit->setPlainText(stream.readAll());
+ updateScriptFile.close();
+ }
+ else
+ {
+ m_pTextEdit->setPlainText("////Failed to open file");
+ }
+
+ //m_pTextEdit->setPlainText(updateScript);
+}
+
+/*void ScriptEditorWidget::on_m_pPlayButton_Clicked(void)
+{
+}*/
+
+QString ScriptEditorWidget::getScriptCode(void)
+{
+ return m_pTextEdit->toPlainText();
}
\ No newline at end of file
Modified: trunk/QtOgreFramework/EngineTest/ui/ScriptEditorWidget.ui
===================================================================
--- trunk/QtOgreFramework/EngineTest/ui/ScriptEditorWidget.ui 2010-07-10 08:18:11 UTC (rev 2935)
+++ trunk/QtOgreFramework/EngineTest/ui/ScriptEditorWidget.ui 2010-07-10 10:06:50 UTC (rev 2936)
@@ -50,7 +50,7 @@
</widget>
</item>
<item row="1" column="0" colspan="5">
- <widget class="QPlainTextEdit" name="plainTextEdit"/>
+ <widget class="QPlainTextEdit" name="m_pTextEdit"/>
</item>
</layout>
</widget>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-07-10 08:18:17
|
Revision: 2935
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2935&view=rev
Author: esuvs
Date: 2010-07-10 08:18:11 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Work on scripting and initial version of script editor.
Modified Paths:
--------------
trunk/QtOgreFramework/EngineTest/CMakeLists.txt
trunk/QtOgreFramework/EngineTest/include/CameraWrapper.h
trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
trunk/QtOgreFramework/EngineTest/source/CameraWrapper.cpp
trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
Added Paths:
-----------
trunk/QtOgreFramework/EngineTest/include/ScriptEditorWidget.h
trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp
trunk/QtOgreFramework/EngineTest/ui/ScriptEditorWidget.ui
Modified: trunk/QtOgreFramework/EngineTest/CMakeLists.txt
===================================================================
--- trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-07-07 17:06:22 UTC (rev 2934)
+++ trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-07-10 08:18:11 UTC (rev 2935)
@@ -8,6 +8,7 @@
source/Mouse.cpp
source/EngineTestGameLogic.cpp
source/Keyboard.cpp
+ source/ScriptEditorWidget.cpp
)
SET(INC_FILES
@@ -15,9 +16,11 @@
include/EngineTestGameLogic.h
include/Keyboard.h
include/Mouse.h
+ include/ScriptEditorWidget.h
)
SET(UI_FILES
+ ui/ScriptEditorWidget.ui
)
SET(RESOURCE_FILES
Modified: trunk/QtOgreFramework/EngineTest/include/CameraWrapper.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/CameraWrapper.h 2010-07-07 17:06:22 UTC (rev 2934)
+++ trunk/QtOgreFramework/EngineTest/include/CameraWrapper.h 2010-07-10 08:18:11 UTC (rev 2935)
@@ -14,6 +14,12 @@
public:
void setOgreCamera(Ogre::Camera* pOgreCamera);
+ Q_PROPERTY(QVector3D position READ getPosition WRITE setPosition)
+ Q_PROPERTY(QVector3D direction READ getDirection WRITE setDirection)
+ Q_PROPERTY(QVector3D right READ getRight)
+ Q_PROPERTY(QVector3D up READ getUp)
+
+
public slots:
void moveRelative(const Ogre::Vector3 &vec);
@@ -25,12 +31,16 @@
void setFOVy (const Ogre::Radian& fovy);
- QVector3D getPosition(void);
+ QVector3D getPosition(void) const;
void setPosition(const QVector3D& pos);
- QVector3D getDirection(void);
- void setDirection(const QVector3D& pos);
+ QVector3D getDirection(void) const;
+ void setDirection(const QVector3D& dir);
+ QVector3D getRight(void) const;
+
+ QVector3D getUp(void) const;
+
private:
Ogre::Camera* m_pOgreCamera;
};
Modified: trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-07-07 17:06:22 UTC (rev 2934)
+++ trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-07-10 08:18:11 UTC (rev 2935)
@@ -6,6 +6,7 @@
#include "Log.h"
#include "Keyboard.h"
#include "Mouse.h"
+#include "ScriptEditorWidget.h"
#include <OgreCamera.h>
#include <OgrePrerequisites.h>
@@ -76,6 +77,8 @@
QScriptValue cameraRightScriptValue;
QScriptEngineDebugger debugger;
+
+ ScriptEditorWidget* m_pScriptEditorWidget;
};
#endif /*ENGINETESTGAMELOGIC_H_*/
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/include/ScriptEditorWidget.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/ScriptEditorWidget.h (rev 0)
+++ trunk/QtOgreFramework/EngineTest/include/ScriptEditorWidget.h 2010-07-10 08:18:11 UTC (rev 2935)
@@ -0,0 +1,14 @@
+#ifndef ENGINETEST_SCRIPTEDITORWIDGET_H_
+#define ENGINETEST_SCRIPTEDITORWIDGET_H_
+
+#include "ui_ScriptEditorWidget.h"
+
+class ScriptEditorWidget : public QWidget, private Ui::ScriptEditorWidget
+{
+ Q_OBJECT
+
+public:
+ ScriptEditorWidget(QWidget *parent = 0);
+};
+
+#endif /*ENGINETEST_SCRIPTEDITORWIDGET_H_*/
Modified: trunk/QtOgreFramework/EngineTest/source/CameraWrapper.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/CameraWrapper.cpp 2010-07-07 17:06:22 UTC (rev 2934)
+++ trunk/QtOgreFramework/EngineTest/source/CameraWrapper.cpp 2010-07-10 08:18:11 UTC (rev 2935)
@@ -33,7 +33,7 @@
m_pOgreCamera->setFOVy(fovy);
}
-QVector3D CameraWrapper::getPosition(void)
+QVector3D CameraWrapper::getPosition(void) const
{
Ogre::Vector3 pos = m_pOgreCamera->getPosition();
return QVector3D(pos.x, pos.y, pos.z);
@@ -44,7 +44,7 @@
m_pOgreCamera->setPosition(pos.x(), pos.y(), pos.z());
}
-QVector3D CameraWrapper::getDirection(void)
+QVector3D CameraWrapper::getDirection(void) const
{
Ogre::Vector3 dir = m_pOgreCamera->getDirection();
return QVector3D(dir.x, dir.y, dir.z);
@@ -53,4 +53,16 @@
void CameraWrapper::setDirection(const QVector3D& dir)
{
m_pOgreCamera->setDirection(dir.x(), dir.y(), dir.z());
-}
\ No newline at end of file
+}
+
+QVector3D CameraWrapper::getRight(void) const
+{
+ Ogre::Vector3 right = m_pOgreCamera->getRight();
+ return QVector3D(right.x, right.y, right.z);
+}
+
+QVector3D CameraWrapper::getUp(void) const
+{
+ Ogre::Vector3 up = m_pOgreCamera->getUp();
+ return QVector3D(up.x, up.y, up.z);
+}
Modified: trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-07-07 17:06:22 UTC (rev 2934)
+++ trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-07-10 08:18:11 UTC (rev 2935)
@@ -73,31 +73,35 @@
scriptEngine->globalObject().setProperty("OgreRadian", radianClass->constructor());
updateScript =
- "var pos = camera.getPosition();"
- "var dir = camera.getDirection();"
+ "var pos = camera.position;"
+ "var dir = camera.direction;"
+ "var right = camera.right;"
"if(keyboard.isPressed(Qt.Key_W))"
"{"
- //" pos.setZ(pos.z() - 1.0);"
- " print('pos before = ', pos);"
//" pos += dir;"
" pos.setX(pos.x() + dir.x());"
" pos.setY(pos.y() + dir.y());"
" pos.setZ(pos.z() + dir.z());"
- " print('pos after = ', pos);"
"}"
"if(keyboard.isPressed(Qt.Key_S))"
"{"
- " pos.setZ(pos.z() + 1.0);"
+ " pos.setX(pos.x() - dir.x());"
+ " pos.setY(pos.y() - dir.y());"
+ " pos.setZ(pos.z() - dir.z());"
"}"
"if(keyboard.isPressed(Qt.Key_A))"
"{"
- " pos.setX(pos.x() - 1.0);"
+ " pos.setX(pos.x() - right.x());"
+ " pos.setY(pos.y() - right.y());"
+ " pos.setZ(pos.z() - right.z());"
"}"
"if(keyboard.isPressed(Qt.Key_D))"
"{"
- " pos.setX(pos.x() + 1.0);"
+ " pos.setX(pos.x() + right.x());"
+ " pos.setY(pos.y() + right.y());"
+ " pos.setZ(pos.z() + right.z());"
"}"
- "camera.setPosition(pos);"
+ "camera.position = pos;"
"if(mouse.isPressed(Qt.RightButton))"
"{"
" mouseDelta = mouse.computeDelta();"
@@ -170,6 +174,9 @@
}
mApplication->showFPSCounter();
+
+ m_pScriptEditorWidget = new ScriptEditorWidget(qApp->mainWidget());
+ m_pScriptEditorWidget->show();
/*cameraPositionScriptValue = scriptEngine->toScriptValue(mCamera->getPosition());
Added: trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp (rev 0)
+++ trunk/QtOgreFramework/EngineTest/source/ScriptEditorWidget.cpp 2010-07-10 08:18:11 UTC (rev 2935)
@@ -0,0 +1,7 @@
+#include "ScriptEditorWidget.h"
+
+ScriptEditorWidget::ScriptEditorWidget(QWidget *parent)
+:QWidget(parent, Qt::Tool)
+{
+ setupUi(this);
+}
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/ui/ScriptEditorWidget.ui
===================================================================
--- trunk/QtOgreFramework/EngineTest/ui/ScriptEditorWidget.ui (rev 0)
+++ trunk/QtOgreFramework/EngineTest/ui/ScriptEditorWidget.ui 2010-07-10 08:18:11 UTC (rev 2935)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ScriptEditorWidget</class>
+ <widget class="QWidget" name="ScriptEditorWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>508</width>
+ <height>425</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QPushButton" name="m_pPlayButton">
+ <property name="text">
+ <string>Play</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="m_pStopButton">
+ <property name="text">
+ <string>Stop</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QPushButton" name="m_pOpenButton">
+ <property name="text">
+ <string>Open...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QPushButton" name="m_pSaveButton">
+ <property name="text">
+ <string>Save</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="4">
+ <widget class="QPushButton" name="m_pSaveAsButton">
+ <property name="text">
+ <string>Save As...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="5">
+ <widget class="QPlainTextEdit" name="plainTextEdit"/>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kal...@us...> - 2010-07-07 17:06:29
|
Revision: 2934
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2934&view=rev
Author: kallaspriit
Date: 2010-07-07 17:06:22 +0000 (Wed, 07 Jul 2010)
Log Message:
-----------
Added some changes that allows MinimalOgreNewtApplication to be compiled on Linux.
Modified Paths:
--------------
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.sdf
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/source/Application.cpp
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/source/PrimitiveFactory.cpp
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/source/main.cpp
Property Changed:
----------------
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/
Property changes on: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication
___________________________________________________________________
Modified: svn:ignore
- *.dll
*.exe
*.ilk
*.ncb
*.pdb
*.user
obj
ogre.cfg
ogre.log
+ *.dll
*.exe
*.ilk
*.ncb
*.opensdf
*.pdb
*.user
obj
ogre.cfg
ogre.log
Modified: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.sdf
===================================================================
(Binary files differ)
Modified: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/source/Application.cpp
===================================================================
--- branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/source/Application.cpp 2010-07-07 16:17:11 UTC (rev 2933)
+++ branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/source/Application.cpp 2010-07-07 17:06:22 UTC (rev 2934)
@@ -118,12 +118,20 @@
ogre = new Ogre::Root("", "ogre.cfg", "ogre.log");
#ifdef _DEBUG
+#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
ogre->loadPlugin("RenderSystem_Direct3D9_d");
+#else
ogre->loadPlugin("RenderSystem_GL_d");
+#endif
+ ogre->loadPlugin("Plugin_CgProgramManager_d");
#else
+#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
ogre->loadPlugin("RenderSystem_Direct3D9");
- ogre->loadPlugin("RenderSystem_GL");
-#endif;
+#else
+ ogre->loadPlugin("./RenderSystem_GL");
+#endif
+ ogre->loadPlugin("./Plugin_CgProgramManager");
+#endif
// Show the configuration dialog, exit if user cancels
if (!ogre->showConfigDialog())
Modified: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/source/PrimitiveFactory.cpp
===================================================================
--- branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/source/PrimitiveFactory.cpp 2010-07-07 16:17:11 UTC (rev 2933)
+++ branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/source/PrimitiveFactory.cpp 2010-07-07 17:06:22 UTC (rev 2934)
@@ -258,7 +258,7 @@
centerOffset = boundingBox.getMinimum() + ((boundingBox.getMaximum() - boundingBox.getMinimum()) / 2.0f);
dimensions = sourceNode->_getDerivedScale() * size;
- float radius = std::max(size.x, size.z) / 2.0f;
+ float radius = ((size.x > size.z) ? size.x : size.z) / 2.0f;
float height = size.y;
OgreNewt::ConvexCollisionPtr collision = OgreNewt::ConvexCollisionPtr(new OgreNewt::CollisionPrimitives::Cylinder(world, radius, height, objectId));
@@ -345,7 +345,7 @@
centerOffset = boundingBox.getMinimum() + padding + (size / 2.0f);
dimensions = sourceNode->_getDerivedScale() * size;
- float radius = std::max(size.x, size.z) / 2.0f;
+ float radius = ((size.x > size.z) ? size.x : size.z) / 2.0f;
float height = size.y;
OgreNewt::ConvexCollisionPtr collision = OgreNewt::ConvexCollisionPtr(new OgreNewt::CollisionPrimitives::ChamferCylinder(world, radius, height, objectId));
@@ -432,7 +432,7 @@
centerOffset = boundingBox.getMinimum() + padding + (size / 2.0f);
dimensions = sourceNode->_getDerivedScale() * size;
- float radius = std::max(size.x, size.z) / 2.0f;
+ float radius = ((size.x > size.z) ? size.x : size.z) / 2.0f;
float height = size.y;
OgreNewt::ConvexCollisionPtr collision = OgreNewt::ConvexCollisionPtr(new OgreNewt::CollisionPrimitives::Cone(world, radius, height, objectId));
Modified: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/source/main.cpp
===================================================================
--- branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/source/main.cpp 2010-07-07 16:17:11 UTC (rev 2933)
+++ branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/source/main.cpp 2010-07-07 17:06:22 UTC (rev 2934)
@@ -2,32 +2,43 @@
#include <OgreException.h>
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
#define WIN32_LEAN_AND_MEAN
#include "windows.h"
-#ifdef __cplusplus
-extern "C" {
+ INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
+#else
+ int main(int argc, char **argv)
#endif
+ {
+#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+ _CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF|_CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF));
+#endif
+ try
+ {
+ Application application;
-INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT )
-{
- try
- {
- Application application;
-
- if (application.initialise() && application.setup())
+ if (application.initialise() && application.setup())
+ {
+ application.run();
+ }
+ }
+ catch (Ogre::Exception& e)
{
- application.run();
+#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+ MessageBoxA(NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+#else
+ fprintf(stderr, "An exception has occurred: %s\n", e.getFullDescription().c_str());
+#endif
}
+
+ return 0;
}
- catch(Ogre::Exception &e)
- {
- MessageBox(NULL, e.getFullDescription().c_str(), "Well, this is embarrassing.. an Ogre exception has occured.", MB_OK | MB_ICONERROR | MB_TASKMODAL);
- }
-
- return 0;
-}
-
#ifdef __cplusplus
}
#endif
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kal...@us...> - 2010-07-07 16:17:18
|
Revision: 2933
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2933&view=rev
Author: kallaspriit
Date: 2010-07-07 16:17:11 +0000 (Wed, 07 Jul 2010)
Log Message:
-----------
Minor fixes, see http://www.ogre3d.org/addonforums/viewtopic.php?f=4&t=12993#p73033
Modified Paths:
--------------
branches/ogrenewt/newton20/inc/OgreNewt_Collision.h
branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h
branches/ogrenewt/newton20/src/OgreNewt_Body.cpp
branches/ogrenewt/newton20/src/OgreNewt_RayCast.cpp
Modified: branches/ogrenewt/newton20/inc/OgreNewt_Collision.h
===================================================================
--- branches/ogrenewt/newton20/inc/OgreNewt_Collision.h 2010-07-04 17:57:12 UTC (rev 2932)
+++ branches/ogrenewt/newton20/inc/OgreNewt_Collision.h 2010-07-07 16:17:11 UTC (rev 2933)
@@ -21,7 +21,7 @@
{
-enum _OgreNewtExport CollisionPrimitiveType
+enum CollisionPrimitiveType
{
BoxPrimitiveType = SERIALIZE_ID_BOX,
ConePrimitiveType = SERIALIZE_ID_CONE,
@@ -103,10 +103,10 @@
static CollisionPrimitiveType getCollisionPrimitiveType(const NewtonCollision *col);
//! Returns collision info record for this collision
- NewtonCollisionInfoRecord* Collision::getInfo() { return getInfo( m_col ); }
+ NewtonCollisionInfoRecord* getInfo() { return getInfo( m_col ); }
//! Returns collision info record for given collision
- static NewtonCollisionInfoRecord* Collision::getInfo(const NewtonCollision *col);
+ static NewtonCollisionInfoRecord* getInfo(const NewtonCollision *col);
//! friend functions for the Serializer
friend class OgreNewt::CollisionSerializer;
Modified: branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h
===================================================================
--- branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h 2010-07-04 17:57:12 UTC (rev 2932)
+++ branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h 2010-07-07 16:17:11 UTC (rev 2933)
@@ -26,7 +26,7 @@
namespace CollisionPrimitives
{
//! face-winding enum.
- enum _OgreNewtExport FaceWinding { FW_DEFAULT, FW_REVERSE };
+ enum FaceWinding { FW_DEFAULT, FW_REVERSE };
//! null collision (results in no collision)
class _OgreNewtExport Null : public OgreNewt::Collision
Modified: branches/ogrenewt/newton20/src/OgreNewt_Body.cpp
===================================================================
--- branches/ogrenewt/newton20/src/OgreNewt_Body.cpp 2010-07-04 17:57:12 UTC (rev 2932)
+++ branches/ogrenewt/newton20/src/OgreNewt_Body.cpp 2010-07-07 16:17:11 UTC (rev 2933)
@@ -18,7 +18,7 @@
m_node = NULL;
m_matid = NULL;
- m_userdata = NULL;
+ m_userdata = 0;
m_forcecallback = NULL;
// m_transformcallback = NULL;
@@ -90,10 +90,13 @@
NewtonBodyGetRotation (body, &me->m_curRotation.w);
dot = me->m_prevRotation.Dot(me->m_curRotation);
+
if (dot < 0.0f) {
me->m_prevRotation = -1.0f * me->m_prevRotation;
}
+ me->m_accumulatedGlobalForces.clear();
+
/*
// if (me->m_node) {
// if (m_nodeupdateneeded && !forceNodeUpdate )
@@ -122,17 +125,18 @@
Ogre::Vector3 inertia;
me->getMassMatrix(mass, inertia);
- Ogre::Vector3 force(0,-9.8,0);
- force *= mass;
+ Ogre::Vector3 gravityAcceleration(0.0f, -9.8f, 0.0f);
+ Ogre::Vector3 gravityForce = gravityAcceleration * mass;
- me->addForce( force );
+ me->addForce( gravityForce );
- while (me->m_accumulatedGlobalForces.size() > 0)
+ int nth = 0;
+
+ for (std::vector<std::pair<Ogre::Vector3, Ogre::Vector3> >::const_iterator it = me->m_accumulatedGlobalForces.begin(); it != me->m_accumulatedGlobalForces.end(); it++)
{
- std::pair<Ogre::Vector3, Ogre::Vector3> forceInfo = me->m_accumulatedGlobalForces.back();
- me->m_accumulatedGlobalForces.pop_back();
+ Ogre::LogManager::getSingleton().getDefaultLog()->logMessage("# [" + Ogre::StringConverter::toString(++nth) + "] force " + Ogre::StringConverter::toString(it->first) + " at " + Ogre::StringConverter::toString(it->second) + " to " + me->getOgreNode()->getName());
- me->addGlobalForce(forceInfo.first, forceInfo.second);
+ me->addGlobalForce(it->first, it->second);
}
}
Modified: branches/ogrenewt/newton20/src/OgreNewt_RayCast.cpp
===================================================================
--- branches/ogrenewt/newton20/src/OgreNewt_RayCast.cpp 2010-07-04 17:57:12 UTC (rev 2932)
+++ branches/ogrenewt/newton20/src/OgreNewt_RayCast.cpp 2010-07-07 16:17:11 UTC (rev 2933)
@@ -147,14 +147,16 @@
BasicRaycast::BasicRaycastInfo BasicRaycast::getInfoAt( unsigned int hitnum ) const
{
- BasicRaycast::BasicRaycastInfo ret;
+ if (hitnum < mRayList.size())
+ {
+ return mRayList.at(hitnum);
+ }
+ else
+ {
+ BasicRaycast::BasicRaycastInfo emptyInfo;
- if ((hitnum < 0) || (hitnum >= mRayList.size()))
- return ret;
-
- ret = mRayList.at(hitnum);
-
- return ret;
+ return emptyInfo;
+ }
}
bool BasicRaycast::userCallback( OgreNewt::Body* body, Ogre::Real distance, const Ogre::Vector3& normal, int collisionID )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-07-04 17:57:18
|
Revision: 2932
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2932&view=rev
Author: esuvs
Date: 2010-07-04 17:57:12 +0000 (Sun, 04 Jul 2010)
Log Message:
-----------
New plugins method copied from EngineTest to Demo.
Modified Paths:
--------------
trunk/QtOgreFramework/Demo/CMakeLists.txt
trunk/QtOgreFramework/Demo/plugins.cfg.in
trunk/QtOgreFramework/Demo/plugins_d.cfg.in
Modified: trunk/QtOgreFramework/Demo/CMakeLists.txt
===================================================================
--- trunk/QtOgreFramework/Demo/CMakeLists.txt 2010-07-04 09:29:25 UTC (rev 2931)
+++ trunk/QtOgreFramework/Demo/CMakeLists.txt 2010-07-04 17:57:12 UTC (rev 2932)
@@ -49,6 +49,13 @@
ADD_CUSTOM_TARGET(copydemomedia ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/media ${CMAKE_CURRENT_BINARY_DIR}/media COMMENT "Copying media files to build directory" VERBATIM)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/settings.ini ${CMAKE_CURRENT_BINARY_DIR}/settings.ini COPYONLY)
+IF(WIN32)
+ SET(OGRE_RELEASE_PLUGIN_FOLDER ${OGRESDK}/bin/release)
+ SET(OGRE_DEBUG_PLUGIN_FOLDER ${OGRESDK}/bin/debug)
+ELSE()
+ SET(OGRE_RELEASE_PLUGIN_FOLDER ${OGRE_LIBRARY_DIRS}/OGRE)
+ SET(OGRE_DEBUG_PLUGIN_FOLDER ${OGRE_LIBRARY_DIRS}/OGRE)
+ENDIF()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/plugins.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/plugins.cfg)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/plugins_d.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/plugins_d.cfg)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/resources.cfg ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg COPYONLY)
Modified: trunk/QtOgreFramework/Demo/plugins.cfg.in
===================================================================
--- trunk/QtOgreFramework/Demo/plugins.cfg.in 2010-07-04 09:29:25 UTC (rev 2931)
+++ trunk/QtOgreFramework/Demo/plugins.cfg.in 2010-07-04 17:57:12 UTC (rev 2932)
@@ -1,7 +1,7 @@
# Defines plugins to load
# Define plugin folder
-PluginFolder=${OGRESDK}/bin/release
+PluginFolder=${OGRE_RELEASE_PLUGIN_FOLDER}
# Define plugins
Plugin=RenderSystem_GL
Modified: trunk/QtOgreFramework/Demo/plugins_d.cfg.in
===================================================================
--- trunk/QtOgreFramework/Demo/plugins_d.cfg.in 2010-07-04 09:29:25 UTC (rev 2931)
+++ trunk/QtOgreFramework/Demo/plugins_d.cfg.in 2010-07-04 17:57:12 UTC (rev 2932)
@@ -1,7 +1,7 @@
# Defines plugins to load
# Define plugin folder
-PluginFolder=${OGRESDK}/bin/debug
+PluginFolder=${OGRE_DEBUG_PLUGIN_FOLDER}
# Define plugins
Plugin=RenderSystem_GL_d
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kal...@us...> - 2010-07-04 09:29:31
|
Revision: 2931
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2931&view=rev
Author: kallaspriit
Date: 2010-07-04 09:29:25 +0000 (Sun, 04 Jul 2010)
Log Message:
-----------
Added NewtonCollisionInfoRecord* Collision::getInfo() that returns collision info record.
Modified Paths:
--------------
branches/ogrenewt/newton20/inc/OgreNewt_Collision.h
branches/ogrenewt/newton20/src/OgreNewt_Collision.cpp
Modified: branches/ogrenewt/newton20/inc/OgreNewt_Collision.h
===================================================================
--- branches/ogrenewt/newton20/inc/OgreNewt_Collision.h 2010-07-03 10:40:36 UTC (rev 2930)
+++ branches/ogrenewt/newton20/inc/OgreNewt_Collision.h 2010-07-04 09:29:25 UTC (rev 2931)
@@ -102,6 +102,12 @@
//! Returns the Collisiontype for the given Newton-Collision
static CollisionPrimitiveType getCollisionPrimitiveType(const NewtonCollision *col);
+ //! Returns collision info record for this collision
+ NewtonCollisionInfoRecord* Collision::getInfo() { return getInfo( m_col ); }
+
+ //! Returns collision info record for given collision
+ static NewtonCollisionInfoRecord* Collision::getInfo(const NewtonCollision *col);
+
//! friend functions for the Serializer
friend class OgreNewt::CollisionSerializer;
//friend void CollisionSerializer::exportCollision(const CollisionPtr& collision, const Ogre::String& filename);
Modified: branches/ogrenewt/newton20/src/OgreNewt_Collision.cpp
===================================================================
--- branches/ogrenewt/newton20/src/OgreNewt_Collision.cpp 2010-07-03 10:40:36 UTC (rev 2930)
+++ branches/ogrenewt/newton20/src/OgreNewt_Collision.cpp 2010-07-04 09:29:25 UTC (rev 2931)
@@ -70,8 +70,15 @@
return static_cast<CollisionPrimitiveType>(info->m_collisionType);
}
+NewtonCollisionInfoRecord* Collision::getInfo(const NewtonCollision *col)
+{
+ NewtonCollisionInfoRecord *info = new NewtonCollisionInfoRecord();
+ NewtonCollisionGetInfo( col, info );
+ return info;
+}
+
ConvexCollision::ConvexCollision( const OgreNewt::World* world ) : Collision( world )
{
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kal...@us...> - 2010-07-03 10:40:44
|
Revision: 2930
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2930&view=rev
Author: kallaspriit
Date: 2010-07-03 10:40:36 +0000 (Sat, 03 Jul 2010)
Log Message:
-----------
Fixed some issues with MingW compiler.
Modified Paths:
--------------
branches/ogrenewt/newton20/OgreNewt_VS10.suo
branches/ogrenewt/newton20/OgreNewt_VS9.suo
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcxproj
branches/ogrenewt/newton20/inc/OgreNewt_Body.h
branches/ogrenewt/newton20/inc/OgreNewt_Prerequisites.h
branches/ogrenewt/newton20/src/OgreNewt_Debugger.cpp
Added Paths:
-----------
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.sdf
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.sln
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.suo
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS9.sln
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS9.suo
Removed Paths:
-------------
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.sln
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.suo
Modified: branches/ogrenewt/newton20/OgreNewt_VS10.suo
===================================================================
(Binary files differ)
Modified: branches/ogrenewt/newton20/OgreNewt_VS9.suo
===================================================================
(Binary files differ)
Deleted: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.sln
===================================================================
--- branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.sln 2010-07-01 12:58:38 UTC (rev 2929)
+++ branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.sln 2010-07-03 10:40:36 UTC (rev 2930)
@@ -1,29 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MinimalOgreNewt", "MinimalOgreNewt.vcproj", "{44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}"
- ProjectSection(ProjectDependencies) = postProject
- {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64} = {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OgreNewt", "..\..\OgreNewt.vcproj", "{C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}.Debug|Win32.ActiveCfg = Debug|Win32
- {44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}.Debug|Win32.Build.0 = Debug|Win32
- {44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}.Release|Win32.ActiveCfg = Release|Win32
- {44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}.Release|Win32.Build.0 = Release|Win32
- {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Debug|Win32.ActiveCfg = Debug|Win32
- {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Debug|Win32.Build.0 = Debug|Win32
- {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Release|Win32.ActiveCfg = Release|Win32
- {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Deleted: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.suo
===================================================================
(Binary files differ)
Modified: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj 2010-07-01 12:58:38 UTC (rev 2929)
+++ branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj 2010-07-03 10:40:36 UTC (rev 2930)
@@ -42,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\Dependencies\include";C:\OgreSDK\include\OIS;"$(OGRE_HOME)\Dependencies\include\ois";..\..\inc;.\include"
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\Dependencies\include";C:\OgreSDK\include\OIS;"$(OGRE_HOME)\Dependencies\include\ois";..\..\inc;"$(OGRENEWT_HOME)\inc";.\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;OIS_DYNAMIC_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -65,7 +65,7 @@
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib"
OutputFile="$(OutDir)\debug.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Debug";"$(OGRE_HOME)\Dependencies\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRENEWT_HOME)\lib";"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Debug";"$(OGRE_HOME)\Dependencies\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -120,7 +120,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\Dependencies\include";C:\OgreSDK\include\OIS;"$(OGRE_HOME)\Dependencies\include\ois";..\..\inc;.\include"
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\Dependencies\include";C:\OgreSDK\include\OIS;"$(OGRE_HOME)\Dependencies\include\ois";..\..\inc;"$(OGRENEWT_HOME)\inc";.\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;OIS_DYNAMIC_LIB;"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -142,7 +142,7 @@
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib"
OutputFile="$(OutDir)\release.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Release";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRENEWT_HOME)\lib";"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Release";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcxproj
===================================================================
--- branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcxproj 2010-07-01 12:58:38 UTC (rev 2929)
+++ branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcxproj 2010-07-03 10:40:36 UTC (rev 2930)
@@ -84,7 +84,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(NEWTON_HOME)\sdk;$(BOOST_HOME)\;$(OGRE_HOME)\include;$(OGRE_BUILD_HOME)\include;$(OGRE_HOME)\OgreMain\include;$(OGRE_HOME)\Dependencies\include;$(OGRE_HOME)\Dependencies\include\ois;..\..\inc;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(NEWTON_HOME)\sdk;$(BOOST_HOME)\;$(OGRE_HOME)\include;$(OGRE_BUILD_HOME)\include;$(OGRE_HOME)\OgreMain\include;$(OGRE_HOME)\Dependencies\include;$(OGRE_HOME)\Dependencies\include\ois;..\..\inc;$(OGRENEWT_HOME)\inc;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;OIS_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -97,7 +97,7 @@
<Link>
<AdditionalDependencies>newton.lib;OgreMain_d.lib;OIS_d.lib;OgreNewt_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)debug.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\lib;$(OGRE_HOME)\lib;$(OGRE_BUILD_HOME)\lib\Debug;$(OGRE_HOME)\Dependencies\lib\Debug;$(NEWTON_HOME)\sdk\x32\dll_vs9;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\lib;$(OGRENEWT_HOME)\lib;$(OGRE_HOME)\lib;$(OGRE_BUILD_HOME)\lib\Debug;$(OGRE_HOME)\Dependencies\lib\Debug;$(NEWTON_HOME)\sdk\x32\dll_vs9;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -136,7 +136,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(NEWTON_HOME)\sdk;$(BOOST_HOME)\;$(OGRE_HOME)\include;$(OGRE_BUILD_HOME)\include;$(OGRE_HOME)\OgreMain\include;$(OGRE_HOME)\Dependencies\include;$(OGRE_HOME)\Dependencies\include\ois;..\..\inc;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(NEWTON_HOME)\sdk;$(BOOST_HOME)\;$(OGRE_HOME)\include;$(OGRE_BUILD_HOME)\include;$(OGRE_HOME)\OgreMain\include;$(OGRE_HOME)\Dependencies\include;$(OGRE_HOME)\Dependencies\include\ois;..\..\inc;$(OGRENEWT_HOME)\inc;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;OIS_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -148,7 +148,7 @@
<Link>
<AdditionalDependencies>newton.lib;OgreMain.lib;OIS.lib;OgreNewt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)release.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\lib;$(OGRE_HOME)\lib;$(OGRE_BUILD_HOME)\lib\Release;$(OGRE_HOME)\Dependencies\lib\Release;$(NEWTON_HOME)\sdk\x32\dll_vs9;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\lib;$(OGRENEWT_HOME)\lib;$(OGRE_HOME)\lib;$(OGRE_BUILD_HOME)\lib\Release;$(OGRE_HOME)\Dependencies\lib\Release;$(NEWTON_HOME)\sdk\x32\dll_vs9;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Added: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.sdf
===================================================================
(Binary files differ)
Property changes on: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.sdf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.sln
===================================================================
--- branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.sln (rev 0)
+++ branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.sln 2010-07-03 10:40:36 UTC (rev 2930)
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MinimalOgreNewt", "MinimalOgreNewt.vcxproj", "{44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OgreNewt", "..\..\OgreNewt.vcxproj", "{C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}.Debug|Win32.Build.0 = Debug|Win32
+ {44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}.Release|Win32.ActiveCfg = Release|Win32
+ {44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}.Release|Win32.Build.0 = Release|Win32
+ {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Debug|Win32.Build.0 = Debug|Win32
+ {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Release|Win32.ActiveCfg = Release|Win32
+ {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.suo
===================================================================
(Binary files differ)
Property changes on: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS10.suo
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS9.sln
===================================================================
--- branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS9.sln (rev 0)
+++ branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS9.sln 2010-07-03 10:40:36 UTC (rev 2930)
@@ -0,0 +1,29 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MinimalOgreNewt", "MinimalOgreNewt.vcproj", "{44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64} = {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OgreNewt", "..\..\OgreNewt.vcproj", "{C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}.Debug|Win32.Build.0 = Debug|Win32
+ {44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}.Release|Win32.ActiveCfg = Release|Win32
+ {44F65D14-7093-4B8F-BE0F-95D5D31CFBBC}.Release|Win32.Build.0 = Release|Win32
+ {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Debug|Win32.Build.0 = Debug|Win32
+ {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Release|Win32.ActiveCfg = Release|Win32
+ {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS9.suo
===================================================================
(Binary files differ)
Property changes on: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS9.suo
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/ogrenewt/newton20/inc/OgreNewt_Body.h
===================================================================
--- branches/ogrenewt/newton20/inc/OgreNewt_Body.h 2010-07-01 12:58:38 UTC (rev 2929)
+++ branches/ogrenewt/newton20/inc/OgreNewt_Body.h 2010-07-03 10:40:36 UTC (rev 2930)
@@ -496,7 +496,7 @@
const MaterialID* m_matid;
const World* m_world;
- std::vector<std::pair<Ogre::Vector3, Ogre::Vector3>> m_accumulatedGlobalForces;
+ std::vector<std::pair<Ogre::Vector3, Ogre::Vector3> > m_accumulatedGlobalForces;
Ogre::Vector3 m_nodePosit;
Ogre::Vector3 m_curPosit;
Modified: branches/ogrenewt/newton20/inc/OgreNewt_Prerequisites.h
===================================================================
--- branches/ogrenewt/newton20/inc/OgreNewt_Prerequisites.h 2010-07-01 12:58:38 UTC (rev 2929)
+++ branches/ogrenewt/newton20/inc/OgreNewt_Prerequisites.h 2010-07-03 10:40:36 UTC (rev 2930)
@@ -22,6 +22,9 @@
# include <Ogre/OgreRenderable.h>
# include <Ogre/OgreNode.h>
# include <Ogre/OgreFrameListener.h>
+# include <Ogre/OgreSceneNode.h>
+# include <Ogre/OgreSceneManager.h>
+# include <Ogre/OgreManualObject.h>
//# include <OgreTerrain.h>
# ifndef OGRENEWT_NO_OGRE_ANY
# include <Ogre/OgreAny.h>
@@ -33,6 +36,9 @@
#include <OgreRenderable.h>
#include <OgreNode.h>
#include <OgreFrameListener.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreManualObject.h>
//#include <OgreTerrain.h>
# ifndef OGRENEWT_NO_OGRE_ANY
# include <OgreAny.h>
Modified: branches/ogrenewt/newton20/src/OgreNewt_Debugger.cpp
===================================================================
--- branches/ogrenewt/newton20/src/OgreNewt_Debugger.cpp 2010-07-01 12:58:38 UTC (rev 2929)
+++ branches/ogrenewt/newton20/src/OgreNewt_Debugger.cpp 2010-07-03 10:40:36 UTC (rev 2930)
@@ -5,6 +5,8 @@
#include "OgreNewt_Joint.h"
#include "OgreNewt_Collision.h"
+#include <NewtonCustomJoint.h>
+
#include <sstream>
#ifdef __APPLE__
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bel...@us...> - 2010-07-01 12:58:45
|
Revision: 2929
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2929&view=rev
Author: bellyfish
Date: 2010-07-01 12:58:38 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
* Added a test to DebugLines::DebugLines() that creates the OgreBulletCollisions resource group if it does not exist.
Modified Paths:
--------------
trunk/ogrebullet/Collisions/src/Debug/OgreBulletCollisionsDebugLines.cpp
Modified: trunk/ogrebullet/Collisions/src/Debug/OgreBulletCollisionsDebugLines.cpp
===================================================================
--- trunk/ogrebullet/Collisions/src/Debug/OgreBulletCollisionsDebugLines.cpp 2010-06-30 21:11:01 UTC (rev 2928)
+++ trunk/ogrebullet/Collisions/src/Debug/OgreBulletCollisionsDebugLines.cpp 2010-07-01 12:58:38 UTC (rev 2929)
@@ -47,6 +47,13 @@
if (!_materials_created)
{
+ StringVector resourceGroups = ResourceGroupManager::getSingletonPtr()->getResourceGroups();
+
+ if(std::find(resourceGroups.begin(), resourceGroups.end(), "OgreBulletCollisions") == resourceGroups.end())
+ {
+ ResourceGroupManager::getSingletonPtr()->createResourceGroup("OgreBulletCollisions");
+ }
+
MaterialPtr red = MaterialManager::getSingleton().create("OgreBulletCollisionsDebugLines/Disabled","OgreBulletCollisions");
MaterialPtr green = MaterialManager::getSingleton().create("OgreBulletCollisionsDebugLines/Enabled","OgreBulletCollisions");
MaterialPtr blue = MaterialManager::getSingleton().create("OgreBulletCollisionsDebugLines/Static","OgreBulletCollisions");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-06-30 21:11:08
|
Revision: 2928
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2928&view=rev
Author: esuvs
Date: 2010-06-30 21:11:01 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
More work on scripting.
Linux fixes.
Modified Paths:
--------------
trunk/QtOgreFramework/EngineTest/include/CameraWrapper.h
trunk/QtOgreFramework/EngineTest/source/CameraWrapper.cpp
trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
trunk/QtOgreFramework/QtOgre/include/LogModel.h
Modified: trunk/QtOgreFramework/EngineTest/include/CameraWrapper.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/CameraWrapper.h 2010-06-29 20:41:09 UTC (rev 2927)
+++ trunk/QtOgreFramework/EngineTest/include/CameraWrapper.h 2010-06-30 21:11:01 UTC (rev 2928)
@@ -5,6 +5,7 @@
#include <OgreMath.h>
#include <QObject>
+#include <QVector3D>
class CameraWrapper : public QObject
{
@@ -24,6 +25,12 @@
void setFOVy (const Ogre::Radian& fovy);
+ QVector3D getPosition(void);
+ void setPosition(const QVector3D& pos);
+
+ QVector3D getDirection(void);
+ void setDirection(const QVector3D& pos);
+
private:
Ogre::Camera* m_pOgreCamera;
};
Modified: trunk/QtOgreFramework/EngineTest/source/CameraWrapper.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/CameraWrapper.cpp 2010-06-29 20:41:09 UTC (rev 2927)
+++ trunk/QtOgreFramework/EngineTest/source/CameraWrapper.cpp 2010-06-30 21:11:01 UTC (rev 2928)
@@ -31,4 +31,26 @@
void CameraWrapper::setFOVy (const Ogre::Radian& fovy)
{
m_pOgreCamera->setFOVy(fovy);
+}
+
+QVector3D CameraWrapper::getPosition(void)
+{
+ Ogre::Vector3 pos = m_pOgreCamera->getPosition();
+ return QVector3D(pos.x, pos.y, pos.z);
+}
+
+void CameraWrapper::setPosition(const QVector3D& pos)
+{
+ m_pOgreCamera->setPosition(pos.x(), pos.y(), pos.z());
+}
+
+QVector3D CameraWrapper::getDirection(void)
+{
+ Ogre::Vector3 dir = m_pOgreCamera->getDirection();
+ return QVector3D(dir.x, dir.y, dir.z);
+}
+
+void CameraWrapper::setDirection(const QVector3D& dir)
+{
+ m_pOgreCamera->setDirection(dir.x(), dir.y(), dir.z());
}
\ No newline at end of file
Modified: trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-06-29 20:41:09 UTC (rev 2927)
+++ trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-06-30 21:11:01 UTC (rev 2928)
@@ -16,7 +16,7 @@
#include <QKeyEvent>
#include <QMouseEvent>
#include <QSettings>
-#include <QStringList.h>
+#include <QStringList>
#include <QMetaObject>
using namespace QtOgre;
@@ -72,31 +72,32 @@
OgreRadianClass *radianClass = new OgreRadianClass(scriptEngine);
scriptEngine->globalObject().setProperty("OgreRadian", radianClass->constructor());
- updateScript =
- "vec = new OgreVector3;"
- "vec.x = 0.0;"
- "vec.y = 0.0;"
- "vec.z = 0.0;"
- "var vector = new QVector3D();"
- "vector.setX(-1.0);"
- "print('vector = ', vector);"
+ updateScript =
+ "var pos = camera.getPosition();"
+ "var dir = camera.getDirection();"
"if(keyboard.isPressed(Qt.Key_W))"
"{"
- " vec.z = vector.x();"
+ //" pos.setZ(pos.z() - 1.0);"
+ " print('pos before = ', pos);"
+ //" pos += dir;"
+ " pos.setX(pos.x() + dir.x());"
+ " pos.setY(pos.y() + dir.y());"
+ " pos.setZ(pos.z() + dir.z());"
+ " print('pos after = ', pos);"
"}"
"if(keyboard.isPressed(Qt.Key_S))"
"{"
- " vec.z = 1.0;"
+ " pos.setZ(pos.z() + 1.0);"
"}"
"if(keyboard.isPressed(Qt.Key_A))"
"{"
- " vec.x = -1.0;"
+ " pos.setX(pos.x() - 1.0);"
"}"
"if(keyboard.isPressed(Qt.Key_D))"
"{"
- " vec.x = 1.0;"
- "}"
- "camera.moveRelative(vec);"
+ " pos.setX(pos.x() + 1.0);"
+ "}"
+ "camera.setPosition(pos);"
"if(mouse.isPressed(Qt.RightButton))"
"{"
" mouseDelta = mouse.computeDelta();"
@@ -108,12 +109,12 @@
" camera.pitch(new OgreRadian(-mouseDelta.y * 0.01));"
"}"
"wheelDelta = mouse.getWheelDelta();"
- "print('wheelDelta = ', wheelDelta);"
+ //"print('wheelDelta = ', wheelDelta);"
"fov = camera.getFOVy();"
- "print('old fov = ', fov.valueRadians);"
+ //"print('old fov = ', fov.valueRadians);"
"tempFOV = new OgreRadian(-wheelDelta * 0.001);"
"fov.valueRadians = fov.valueRadians + tempFOV.valueRadians;"
- "print('new fov = ', fov.valueRadians);"
+ //"print('new fov = ', fov.valueRadians);"
"camera.setFOVy(fov);"
;
@@ -339,4 +340,4 @@
qPrintable(failExtensions.join(", ")), qPrintable(qApp->libraryPaths().join(", ")));
}
}
-}
\ No newline at end of file
+}
Modified: trunk/QtOgreFramework/QtOgre/include/LogModel.h
===================================================================
--- trunk/QtOgreFramework/QtOgre/include/LogModel.h 2010-06-29 20:41:09 UTC (rev 2927)
+++ trunk/QtOgreFramework/QtOgre/include/LogModel.h 2010-06-30 21:11:01 UTC (rev 2928)
@@ -2,6 +2,7 @@
#define QTOGRE_LOGMODEL_H_
#include "LogLevel.h"
+#include "LogEntry.h"
#include <QAbstractTableModel>
@@ -37,4 +38,4 @@
Log *mLog;
};
}
-#endif
\ No newline at end of file
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-06-29 20:41:16
|
Revision: 2927
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2927&view=rev
Author: esuvs
Date: 2010-06-29 20:41:09 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
Removed some redundant stuff from EngineTest
Modified Paths:
--------------
trunk/QtOgreFramework/EngineTest/CMakeLists.txt
trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
Added Paths:
-----------
trunk/QtOgreFramework/EngineTest/resources/EngineTestResources.qrc
Removed Paths:
-------------
trunk/QtOgreFramework/EngineTest/include/ChooseMeshWidget.h
trunk/QtOgreFramework/EngineTest/include/MainMenu.h
trunk/QtOgreFramework/EngineTest/include/StyleSettingsWidget.h
trunk/QtOgreFramework/EngineTest/resources/DemoResources.qrc
trunk/QtOgreFramework/EngineTest/resources/icons/application-exit.svg
trunk/QtOgreFramework/EngineTest/resources/icons/go-previous.svg
trunk/QtOgreFramework/EngineTest/resources/icons/preferences-system.svg
trunk/QtOgreFramework/EngineTest/resources/icons/utilities-log-viewer.svg
trunk/QtOgreFramework/EngineTest/resources/images/QtOgreLogo.png
trunk/QtOgreFramework/EngineTest/source/ChooseMeshWidget.cpp
trunk/QtOgreFramework/EngineTest/source/MainMenu.cpp
trunk/QtOgreFramework/EngineTest/source/StyleSettingsWidget.cpp
trunk/QtOgreFramework/EngineTest/ui/ChooseMeshWidget.ui
trunk/QtOgreFramework/EngineTest/ui/MainMenu.ui
trunk/QtOgreFramework/EngineTest/ui/StyleSettingsWidget.ui
trunk/QtOgreFramework/EngineTest/ui/coffee.qss
trunk/QtOgreFramework/EngineTest/ui/test.qss
Modified: trunk/QtOgreFramework/EngineTest/CMakeLists.txt
===================================================================
--- trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-06-29 19:48:44 UTC (rev 2926)
+++ trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-06-29 20:41:09 UTC (rev 2927)
@@ -6,31 +6,22 @@
source/CameraWrapper.cpp
source/main.cpp
source/Mouse.cpp
- source/ChooseMeshWidget.cpp
source/EngineTestGameLogic.cpp
source/Keyboard.cpp
- source/MainMenu.cpp
- source/StyleSettingsWidget.cpp
)
SET(INC_FILES
include/CameraWrapper.h
- include/ChooseMeshWidget.h
include/EngineTestGameLogic.h
include/Keyboard.h
- include/MainMenu.h
include/Mouse.h
- include/StyleSettingsWidget.h
)
SET(UI_FILES
- ui/ChooseMeshWidget.ui
- ui/MainMenu.ui
- ui/StyleSettingsWidget.ui
)
SET(RESOURCE_FILES
- resources/DemoResources.qrc
+ resources/EngineTestResources.qrc
)
#"Sources" and "Headers" are the group names in Visual Studio.
Deleted: trunk/QtOgreFramework/EngineTest/include/ChooseMeshWidget.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/ChooseMeshWidget.h 2010-06-29 19:48:44 UTC (rev 2926)
+++ trunk/QtOgreFramework/EngineTest/include/ChooseMeshWidget.h 2010-06-29 20:41:09 UTC (rev 2927)
@@ -1,26 +0,0 @@
-#ifndef CHOOSEMESHWIDGET_H_
-#define CHOOSEMESHWIDGET_H_
-
-#include "ui_ChooseMeshWidget.h"
-
-#include "OgrePrerequisites.h"
-
-class DemoGameLogic;
-
-class ChooseMeshWidget : public QWidget, private Ui::ChooseMeshWidget
-{
- Q_OBJECT
-
-public:
- ChooseMeshWidget(Ogre::Entity* jaiquaEntity, Ogre::Entity* robotEntity, QWidget *parent = 0);
-
-public slots:
- void on_mJaiquaRadioButton_toggled(bool checked);
- void on_mRobotRadioButton_toggled(bool checked);
-
-private:
- Ogre::Entity* mJaiquaEntity;
- Ogre::Entity* mRobotEntity;
-};
-
-#endif /*CHOOSEMESHWIDGET_H_*/
\ No newline at end of file
Modified: trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-06-29 19:48:44 UTC (rev 2926)
+++ trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-06-29 20:41:09 UTC (rev 2927)
@@ -2,11 +2,10 @@
#define ENGINETESTGAMELOGIC_H_
#include "CameraWrapper.h"
-#include "ChooseMeshWidget.h"
#include "GameLogic.h"
+#include "Log.h"
#include "Keyboard.h"
#include "Mouse.h"
-#include "MainMenu.h"
#include <OgreCamera.h>
#include <OgrePrerequisites.h>
@@ -61,10 +60,6 @@
bool mIsFirstFrame;
float mCameraSpeed;
-
- ChooseMeshWidget* mChooseMeshWidget;
-
- MainMenu* mMainMenu;
StyleSettingsWidget* mStyleSettingsWidget;
Deleted: trunk/QtOgreFramework/EngineTest/include/MainMenu.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/MainMenu.h 2010-06-29 19:48:44 UTC (rev 2926)
+++ trunk/QtOgreFramework/EngineTest/include/MainMenu.h 2010-06-29 20:41:09 UTC (rev 2927)
@@ -1,27 +0,0 @@
-#ifndef MAINMENU_H_
-#define MAINMENU_H_
-
-#include "ui_MainMenu.h"
-
-#include "Application.h"
-
-class MainMenu : public QDialog, private Ui::MainMenu
-{
- Q_OBJECT
-
-public:
- MainMenu(QtOgre::Application* application, QWidget* mainWidget, QWidget *parent = 0);
-
-public slots:
- void on_mQuitButton_clicked(void);
- void on_mResumeButton_clicked(void);
- void on_mSettingsButton_clicked(void);
- void on_mViewLogsButton_clicked(void);
-
-private:
- QtOgre::Application *mApplication;
- QWidget* mMainWidget;
-
-};
-
-#endif /*MAINMENU_H_*/
\ No newline at end of file
Deleted: trunk/QtOgreFramework/EngineTest/include/StyleSettingsWidget.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/StyleSettingsWidget.h 2010-06-29 19:48:44 UTC (rev 2926)
+++ trunk/QtOgreFramework/EngineTest/include/StyleSettingsWidget.h 2010-06-29 20:41:09 UTC (rev 2927)
@@ -1,25 +0,0 @@
-#ifndef QTOGRE_STYLESETTINGSWIDGET_H_
-#define QTOGRE_STYLESETTINGSWIDGET_H_
-
-#include "ui_StyleSettingsWidget.h"
-
-#include <AbstractSettingsWidget.h>
-
-class StyleSettingsWidget : public QtOgre::AbstractSettingsWidget, private Ui::StyleSettingsWidget
-{
- Q_OBJECT
-
-public:
- StyleSettingsWidget(QWidget *parent = 0);
-
- void disableFirstTimeOnlySettings(void);
-
-public slots:
- void readFromSettings(void);
- void writeToSettings(void);
-
-private slots:
- void chooseStyleFile(bool);
-};
-
-#endif /*QTOGRE_STYLESETTINGSWIDGET_H_*/
Deleted: trunk/QtOgreFramework/EngineTest/resources/DemoResources.qrc
===================================================================
--- trunk/QtOgreFramework/EngineTest/resources/DemoResources.qrc 2010-06-29 19:48:44 UTC (rev 2926)
+++ trunk/QtOgreFramework/EngineTest/resources/DemoResources.qrc 2010-06-29 20:41:09 UTC (rev 2927)
@@ -1,9 +0,0 @@
-<RCC>
- <qresource>
- <file>images/QtOgreLogo.png</file>
- <file>icons/application-exit.svg</file>
- <file>icons/go-previous.svg</file>
- <file>icons/preferences-system.svg</file>
- <file>icons/utilities-log-viewer.svg</file>
- </qresource>
-</RCC>
Copied: trunk/QtOgreFramework/EngineTest/resources/EngineTestResources.qrc (from rev 2922, trunk/QtOgreFramework/EngineTest/resources/DemoResources.qrc)
===================================================================
--- trunk/QtOgreFramework/EngineTest/resources/EngineTestResources.qrc (rev 0)
+++ trunk/QtOgreFramework/EngineTest/resources/EngineTestResources.qrc 2010-06-29 20:41:09 UTC (rev 2927)
@@ -0,0 +1,4 @@
+<RCC>
+ <qresource>
+ </qresource>
+</RCC>
Deleted: trunk/QtOgreFramework/EngineTest/resources/icons/application-exit.svg
===================================================================
--- trunk/QtOgreFramework/EngineTest/resources/icons/application-exit.svg 2010-06-29 19:48:44 UTC (rev 2926)
+++ trunk/QtOgreFramework/EngineTest/resources/icons/application-exit.svg 2010-06-29 20:41:09 UTC (rev 2927)
@@ -1,787 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="128"
- height="128"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.45+devel"
- version="1.0"
- sodipodi:docbase="/home/david/Oxygen/kdelibs/scalable/actions"
- sodipodi:docname="application-exit.svgz"
- inkscape:output_extension="org.inkscape.output.svgz.inkscape"
- inkscape:export-filename="/home/david/Oxygen/kdelibs/scalable/actions/rss.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs4">
- <linearGradient
- id="linearGradient3021">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop3023" />
- <stop
- id="stop3029"
- offset="0.5"
- style="stop-color:#000000;stop-opacity:0.15636364;" />
- <stop
- style="stop-color:#000000;stop-opacity:0.68727273;"
- offset="0.62264121"
- id="stop3031" />
- <stop
- style="stop-color:#000000;stop-opacity:0.36363637;"
- offset="1"
- id="stop3025" />
- </linearGradient>
- <linearGradient
- id="linearGradient2990">
- <stop
- style="stop-color:#cccccc;stop-opacity:1;"
- offset="0"
- id="stop2992" />
- <stop
- style="stop-color:#f1f1f1;stop-opacity:1;"
- offset="1"
- id="stop2994" />
- </linearGradient>
- <linearGradient
- id="linearGradient3237">
- <stop
- style="stop-color:#ffeb8b;stop-opacity:1;"
- offset="0"
- id="stop3239" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop3241" />
- </linearGradient>
- <linearGradient
- id="linearGradient6674">
- <stop
- style="stop-color:#bf0000;stop-opacity:1;"
- offset="0"
- id="stop6676" />
- <stop
- style="stop-color:#ff1111;stop-opacity:0;"
- offset="1"
- id="stop6678" />
- </linearGradient>
- <linearGradient
- id="linearGradient6666">
- <stop
- id="stop6668"
- offset="0"
- style="stop-color:#ff5900;stop-opacity:1;" />
- <stop
- id="stop6670"
- offset="1"
- style="stop-color:#8d0000;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- id="linearGradient6643">
- <stop
- style="stop-color:#ff6565;stop-opacity:1;"
- offset="0"
- id="stop6645" />
- <stop
- style="stop-color:#ffdfbf;stop-opacity:0;"
- offset="1"
- id="stop6647" />
- </linearGradient>
- <linearGradient
- id="linearGradient6631">
- <stop
- style="stop-color:#703700;stop-opacity:1;"
- offset="0"
- id="stop6633" />
- <stop
- style="stop-color:#bf5e00;stop-opacity:0;"
- offset="1"
- id="stop6635" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient6610">
- <stop
- style="stop-color:#ffbf80;stop-opacity:1;"
- offset="0"
- id="stop6612" />
- <stop
- style="stop-color:#ffbf80;stop-opacity:0;"
- offset="1"
- id="stop6614" />
- </linearGradient>
- <linearGradient
- id="linearGradient6446">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop6448" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop6450" />
- </linearGradient>
- <linearGradient
- id="linearGradient6404">
- <stop
- style="stop-color:#770000;stop-opacity:1;"
- offset="0"
- id="stop6406" />
- <stop
- style="stop-color:#c10000;stop-opacity:1;"
- offset="1"
- id="stop6408" />
- </linearGradient>
- <linearGradient
- id="linearGradient9643">
- <stop
- style="stop-color:#ff0000;stop-opacity:1;"
- offset="0"
- id="stop9645" />
- <stop
- style="stop-color:#620000;stop-opacity:1;"
- offset="1"
- id="stop9647" />
- </linearGradient>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient9643"
- id="radialGradient9651"
- cx="12.040753"
- cy="118.14538"
- fx="12.040753"
- fy="118.14538"
- r="42.559486"
- gradientUnits="userSpaceOnUse"
- spreadMethod="reflect"
- gradientTransform="matrix(1.7951011,0,0,1.7951011,-9.5736166,-93.937523)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6666"
- id="radialGradient9692"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1890799,0,0,1.1890799,-114.77413,-31.375729)"
- spreadMethod="pad"
- cx="42.700352"
- cy="103.5803"
- fx="42.700352"
- fy="103.5803"
- r="42.559486" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6404"
- id="linearGradient6410"
- x1="39.741936"
- y1="113.54839"
- x2="11.458064"
- y2="13.006452"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6446"
- id="linearGradient6452"
- x1="21.094994"
- y1="21.101994"
- x2="15.189133"
- y2="27.007854"
- gradientUnits="userSpaceOnUse"
- spreadMethod="reflect"
- gradientTransform="translate(-7.5870968,-7.3806452)" />
- <filter
- inkscape:collect="always"
- id="filter6458">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.28444187"
- id="feGaussianBlur6460" />
- </filter>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6446"
- id="linearGradient6464"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(0.4129032,0.6193548)"
- spreadMethod="reflect"
- x1="21.094994"
- y1="21.101994"
- x2="15.126888"
- y2="27.070099" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6446"
- id="linearGradient6470"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(0.4129032,0.6193548)"
- spreadMethod="reflect"
- x1="21.094994"
- y1="21.101994"
- x2="13.96104"
- y2="28.235947" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6446"
- id="linearGradient6472"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(0.4129032,0.6193548)"
- spreadMethod="reflect"
- x1="21.094994"
- y1="21.101994"
- x2="13.96104"
- y2="28.235947" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6631"
- id="linearGradient6637"
- x1="55.329033"
- y1="112"
- x2="55.329033"
- y2="74.913147"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6643"
- id="linearGradient6649"
- x1="62.038712"
- y1="15.91371"
- x2="62.038712"
- y2="50.728985"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6610"
- id="linearGradient6655"
- gradientUnits="userSpaceOnUse"
- x1="59.225807"
- y1="20.283871"
- x2="59.225807"
- y2="117.32368"
- gradientTransform="translate(0,1.6516129)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6610"
- id="linearGradient6657"
- gradientUnits="userSpaceOnUse"
- x1="59.225807"
- y1="20.283871"
- x2="59.225807"
- y2="117.32368" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6674"
- id="linearGradient6680"
- x1="19.096775"
- y1="50.580647"
- x2="80.047699"
- y2="66.897575"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6446"
- id="linearGradient2816"
- gradientUnits="userSpaceOnUse"
- x1="59.225807"
- y1="-31.712746"
- x2="59.225807"
- y2="98.167175" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6446"
- id="linearGradient3209"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(0.2623629,1)"
- x1="59.225807"
- y1="7.8973217"
- x2="59.225807"
- y2="46.228859" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6446"
- id="linearGradient3225"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(0.2332229,1.9150941)"
- x1="92.848534"
- y1="60.664852"
- x2="31.376678"
- y2="21.03125" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6446"
- id="linearGradient3231"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(0.2623629,1)"
- x1="59.225807"
- y1="7.8973217"
- x2="59.225807"
- y2="46.228859" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6446"
- id="linearGradient3233"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(0.2332229,1.9150941)"
- x1="115.76678"
- y1="71.084908"
- x2="31.376678"
- y2="21.03125" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3237"
- id="linearGradient3243"
- x1="-60.945251"
- y1="105.83054"
- x2="-59.415245"
- y2="45.631207"
- gradientUnits="userSpaceOnUse" />
- <filter
- inkscape:collect="always"
- id="filter3281">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.32872878"
- id="feGaussianBlur3283" />
- </filter>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6674"
- id="linearGradient3289"
- gradientUnits="userSpaceOnUse"
- x1="60.402065"
- y1="64.076149"
- x2="60.402065"
- y2="-20.962214" />
- <filter
- inkscape:collect="always"
- id="filter3319">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="1.6179775"
- id="feGaussianBlur3321" />
- </filter>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient3000"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.712348,-0.1260581,0.1345724,0.7604617,-100.53448,20.174132)"
- spreadMethod="reflect"
- cx="64"
- cy="81.325775"
- fx="66.881805"
- fy="105.27442"
- r="43.474762" />
- <filter
- inkscape:collect="always"
- id="filter3035">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.60200945"
- id="feGaussianBlur3037" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter3104">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.4217763"
- id="feGaussianBlur3106" />
- </filter>
- <clipPath
- clipPathUnits="userSpaceOnUse"
- id="clipPath3108">
- <path
- style="fill:url(#radialGradient3112);fill-opacity:1;stroke:none;stroke-width:16.49500084;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4.15;stroke-opacity:1"
- d="M -166.22608,25.639042 C -168.37082,25.690988 -170.41095,26.576535 -171.91358,28.107792 C -188.83826,45.032475 -188.83826,72.745609 -171.91358,89.670296 C -154.9889,106.59499 -127.27576,106.59498 -110.35108,89.670296 C -93.426397,72.745608 -93.426407,45.032476 -110.35108,28.107792 C -113.57849,24.889007 -118.78854,24.911628 -122.00733,28.139042 C -125.22611,31.366456 -125.23474,36.576507 -122.00733,39.795292 C -111.39346,50.409165 -111.39346,67.400168 -122.00733,78.014046 C -132.62121,88.627926 -149.64346,88.627916 -160.25733,78.014046 C -170.8712,67.400167 -170.8712,50.409167 -160.25733,39.795292 C -157.82392,37.426791 -157.09428,33.799307 -158.41358,30.670292 C -159.73287,27.541276 -162.83146,25.550254 -166.22608,25.639042 z M -141.25733,26.357792 C -145.38715,26.426713 -148.68411,29.821465 -148.63233,33.951542 L -148.63233,65.951542 C -148.67058,68.656311 -147.24981,71.181744 -144.91358,72.545292 C -142.57735,73.908838 -139.68731,73.90884 -137.35108,72.545292 C -135.01484,71.181742 -133.59407,68.656311 -133.63233,65.951542 L -133.63233,33.951542 C -133.60691,31.924427 -134.41464,29.975845 -135.85108,28.545292 C -137.28752,27.114738 -139.23033,26.324051 -141.25733,26.357792 z"
- id="path3110" />
- </clipPath>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient3112"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.712348,-0.1260581,0.1345724,0.7604617,-197.66681,20.174132)"
- spreadMethod="reflect"
- cx="64"
- cy="81.325775"
- fx="66.881805"
- fy="105.27442"
- r="43.474762" />
- <clipPath
- clipPathUnits="userSpaceOnUse"
- id="clipPath3114">
- <path
- id="path3116"
- d="M -69.09375,25.639042 C -71.238499,25.690988 -73.27862,26.576535 -74.78125,28.107792 C -91.705938,45.032475 -91.705939,72.745609 -74.78125,89.670296 C -57.856572,106.59499 -30.143439,106.59498 -13.21875,89.670296 C 3.70593,72.745608 3.70592,45.032476 -13.21875,28.107792 C -16.446164,24.889007 -21.656215,24.911628 -24.875,28.139042 C -28.093785,31.366456 -28.102414,36.576507 -24.875,39.795292 C -14.261134,50.409165 -14.261131,67.400168 -24.875,78.014046 C -35.488884,88.627926 -52.51113,88.627916 -63.125,78.014046 C -73.738879,67.400167 -73.738878,50.409167 -63.125,39.795292 C -60.691591,37.426791 -59.961952,33.799307 -61.28125,30.670292 C -62.600548,27.541276 -65.699137,25.550254 -69.09375,25.639042 z M -44.125,26.357792 C -48.254827,26.426713 -51.551787,29.821465 -51.5,33.951542 L -51.5,65.951542 C -51.538252,68.656311 -50.117481,71.181744 -47.78125,72.545292 C -45.44502,73.908838 -42.554982,73.90884 -40.21875,72.545292 C -37.882517,71.181742 -36.461748,68.656311 -36.5,65.951542 L -36.5,33.951542 C -36.474583,31.924427 -37.28231,29.975845 -38.71875,28.545292 C -40.155192,27.114738 -42.098006,26.324051 -44.125,26.357792 z"
- style="fill:url(#radialGradient3118);fill-opacity:1;stroke:none;stroke-width:16.49500084;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4.15;stroke-opacity:1" />
- </clipPath>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient3118"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.712348,-0.1260581,0.1345724,0.7604617,-100.53448,20.174132)"
- spreadMethod="reflect"
- cx="64"
- cy="81.325775"
- fx="66.881805"
- fy="105.27442"
- r="43.474762" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient2394"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.712348,-0.1260581,0.1345724,0.7604617,7.4655205,20.174132)"
- spreadMethod="reflect"
- cx="64"
- cy="81.325775"
- fx="66.881805"
- fy="105.27442"
- r="43.474762" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient2984"
- cx="-20"
- cy="64"
- fx="-9.1320477"
- fy="76.905693"
- r="35.412899"
- gradientTransform="translate(-40.754823,-2.5852934e-6)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient2988"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-129.05694,-2.5852934e-6)"
- cx="-20"
- cy="64"
- fx="-9.1320477"
- fy="76.905693"
- r="35.412899" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient2992"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-221.43454,-2.5852934e-6)"
- cx="-20"
- cy="64"
- fx="-9.1320477"
- fy="76.905693"
- r="35.412899" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient2998"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-129.05694,91.019102)"
- cx="-20"
- cy="64"
- fx="-9.1320477"
- fy="76.905693"
- r="35.412899" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient3001"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-221.43454,85.019102)"
- cx="-20"
- cy="64"
- fx="-9.1320477"
- fy="76.905693"
- r="35.412899" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient3007"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-129.05694,94.019102)"
- cx="-20"
- cy="64"
- fx="-9.1320477"
- fy="76.905693"
- r="35.412899" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient3009"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-221.43454,88.019102)"
- cx="-20"
- cy="64"
- fx="-9.1320477"
- fy="76.905693"
- r="35.412899" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient3016"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-129.05694,88.019102)"
- cx="-20"
- cy="64"
- fx="-9.1320477"
- fy="76.905693"
- r="35.412899" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient3018"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-129.05694,91.019102)"
- cx="-20"
- cy="64"
- fx="-9.1320477"
- fy="76.905693"
- r="35.412899" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3021"
- id="linearGradient3027"
- x1="-236"
- y1="104"
- x2="-236"
- y2="176"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(0,-86.232834)" />
- <filter
- inkscape:collect="always"
- id="filter3033">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.33295155"
- id="feGaussianBlur3035" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter3045">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.46608189"
- id="feGaussianBlur3047" />
- </filter>
- <clipPath
- clipPathUnits="userSpaceOnUse"
- id="clipPath3049">
- <path
- style="opacity:1;fill:url(#radialGradient3053);fill-opacity:1;stroke:none;stroke-width:0.13749999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4.15;stroke-opacity:1"
- d="M -213.6585,29.550642 C -214.94322,28.26592 -217.01417,28.26592 -218.29889,29.550642 L -241.43454,52.686292 L -264.57019,29.550642 C -265.85491,28.26592 -267.92586,28.26592 -269.21058,29.550642 L -275.8839,36.223962 C -277.16862,37.508683 -277.16862,39.579629 -275.8839,40.86435 L -252.74825,64 L -275.8839,87.13565 C -277.16862,88.420371 -277.16862,90.491317 -275.8839,91.776038 L -269.21058,98.449358 C -267.92586,99.73408 -265.85491,99.73408 -264.57019,98.449358 L -241.43454,75.313708 L -218.29889,98.449358 C -217.01417,99.73408 -214.94322,99.73408 -213.6585,98.449358 L -206.98518,91.776038 C -205.70046,90.491317 -205.70046,88.420371 -206.98518,87.13565 L -230.12083,64 L -206.98518,40.86435 C -205.70046,39.579629 -205.70046,37.508683 -206.98518,36.223962 L -213.6585,29.550642 z"
- id="path3051" />
- </clipPath>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient3053"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-221.43454,-2.5852934e-6)"
- cx="-20"
- cy="64"
- fx="-9.1320477"
- fy="76.905693"
- r="35.412899" />
- <clipPath
- clipPathUnits="userSpaceOnUse"
- id="clipPath3055">
- <path
- id="path3057"
- d="M -121.2809,29.550642 C -122.56562,28.26592 -124.63657,28.26592 -125.92129,29.550642 L -149.05694,52.686292 L -172.19259,29.550642 C -173.47731,28.26592 -175.54826,28.26592 -176.83298,29.550642 L -183.5063,36.223962 C -184.79102,37.508683 -184.79102,39.579629 -183.5063,40.86435 L -160.37065,64 L -183.5063,87.13565 C -184.79102,88.420371 -184.79102,90.491317 -183.5063,91.776038 L -176.83298,98.449358 C -175.54826,99.73408 -173.47731,99.73408 -172.19259,98.449358 L -149.05694,75.313708 L -125.92129,98.449358 C -124.63657,99.73408 -122.56562,99.73408 -121.2809,98.449358 L -114.60758,91.776038 C -113.32286,90.491317 -113.32286,88.420371 -114.60758,87.13565 L -137.74323,64 L -114.60758,40.86435 C -113.32286,39.579629 -113.32286,37.508683 -114.60758,36.223962 L -121.2809,29.550642 z"
- style="opacity:1;fill:url(#radialGradient3059);fill-opacity:1;stroke:none;stroke-width:0.13749999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4.15;stroke-opacity:1" />
- </clipPath>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient3059"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-129.05694,-2.5852934e-6)"
- cx="-20"
- cy="64"
- fx="-9.1320477"
- fy="76.905693"
- r="35.412899" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2990"
- id="radialGradient3066"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-40.754823,-2.5852934e-6)"
- cx="-20"
- cy="64"
- fx="-9.1320477"
- fy="76.905693"
- r="35.412899" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3021"
- id="linearGradient3068"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(0,-86.232834)"
- x1="-236"
- y1="104"
- x2="-236"
- y2="176" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4722184"
- inkscape:cx="60.046488"
- inkscape:cy="50.921544"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- width="128px"
- height="128px"
- gridempspacing="2"
- gridspacingx="4px"
- gridspacingy="4px"
- showgrid="false"
- borderlayer="true"
- inkscape:showpageshadow="false"
- showborder="true"
- inkscape:window-width="986"
- inkscape:window-height="750"
- inkscape:window-x="766"
- inkscape:window-y="271">
- <inkscape:grid
- type="xygrid"
- id="grid3285"
- spacingx="4px"
- spacingy="4px"
- empspacing="2" />
- </sodipodi:namedview>
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <path
- style="fill:url(#linearGradient3289);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter3319)"
- d="M 18.083601,8 L 109.9164,8 C 115.50271,8 120,12.497286 120,18.083601 L 120,109.9164 C 120,115.50271 115.50271,120 109.9164,120 L 18.083601,120 C 12.497286,120 8,115.50271 8,109.9164 L 8,18.083601 C 8,12.497286 12.497286,8 18.083601,8 z"
- id="rect3287"
- sodipodi:nodetypes="ccccccccc" />
- <path
- style="fill:url(#linearGradient6410);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M 18.083601,8 L 109.9164,8 C 115.50271,8 120,12.497286 120,18.083601 L 120,109.9164 C 120,115.50271 115.50271,120 109.9164,120 L 18.083601,120 C 12.497286,120 8,115.50271 8,109.9164 L 8,18.083601 C 8,12.497286 12.497286,8 18.083601,8 z"
- id="rect8666"
- sodipodi:nodetypes="ccccccccc" />
- <path
- style="opacity:0.08290154;fill:url(#linearGradient6680);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M 18.083601,8 L 109.9164,8 C 115.50271,8 120,12.497286 120,18.083601 L 120,109.9164 C 120,115.50271 115.50271,120 109.9164,120 L 18.083601,120 C 12.497286,120 8,115.50271 8,109.9164 L 8,18.083601 C 8,12.497286 12.497286,8 18.083601,8 z"
- id="rect6672"
- sodipodi:nodetypes="ccccccccc" />
- <path
- transform="scale(-1,1)"
- style="fill:url(#radialGradient9692);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M -109.38386,12.614708 L -19.616139,12.614708 C -15.737346,12.614708 -12.614708,15.737346 -12.614708,19.616139 L -12.614708,108.38386 C -12.614708,112.26265 -15.737346,115.38529 -19.616139,115.38529 L -109.38386,115.38529 C -113.26265,115.38529 -116.38529,112.26265 -116.38529,108.38386 L -116.38529,19.616139 C -116.38529,15.737346 -113.26265,12.614708 -109.38386,12.614708 z"
- id="rect9641"
- sodipodi:nodetypes="ccccccccc" />
- <path
- style="opacity:0.8876405;fill:url(#linearGradient6452);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter6458)"
- d="M 17.906944,8.299378 C 13.216769,8.299378 8.509435,11.867379 8.509435,17.698118 L 12.77674,17.639205 C 13.229113,15.50937 15.628704,13.368243 17.303345,13.03582 L 17.906944,8.299378 z"
- id="rect6433"
- sodipodi:nodetypes="ccccc" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path6462"
- d="M 25.397509,16.46919 C 20.707334,16.46919 16.429601,20.123899 16.429601,25.954638 L 20.77674,25.639205 C 21.229113,23.50937 23.628704,21.368243 25.303345,21.03582 L 25.397509,16.46919 z"
- style="opacity:0.8689139;fill:url(#linearGradient6464);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter6458)"
- transform="matrix(-1,0,0,1,135.86741,-8)" />
- <path
- style="opacity:0.08290155;fill:url(#linearGradient6637);fill-opacity:1.0;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 8,105.875 L 8,109.90625 C 8,115.49256 12.507435,120 18.09375,120 L 109.90625,120 C 115.49256,120 120,115.49257 120,109.90625 L 120,105.875 C 120,111.46131 115.49256,115.96875 109.90625,115.96875 L 18.09375,115.96875 C 12.507435,115.96875 8,111.46131 8,105.875 z"
- id="rect6626"
- sodipodi:nodetypes="ccccccccc" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path6466"
- d="M 26.246568,16.978625 C 21.556393,16.978625 16.769225,20.633334 16.769225,26.464073 L 20.77674,25.639205 C 21.229113,23.50937 23.628704,21.368243 25.303345,21.03582 L 26.246568,16.978625 z"
- style="opacity:0.32642487;fill:url(#linearGradient6470);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter6458)"
- transform="matrix(1,0,0,-1,-8,136.08786)" />
- <path
- transform="matrix(-1,0,0,-1,135.86741,136.08786)"
- style="opacity:0.17616583;fill:url(#linearGradient6472);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter6458)"
- d="M 26.246568,16.978625 C 21.556393,16.978625 16.769225,20.633334 16.769225,26.464073 L 20.77674,25.639205 C 21.229113,23.50937 23.628704,21.368243 25.303345,21.03582 L 26.246568,16.978625 z"
- id="path6468"
- sodipodi:nodetypes="ccccc" />
- <path
- id="path6639"
- d="M 8,22.03871 L 8,18.00746 C 8,12.42115 12.507435,7.91371 18.09375,7.91371 L 109.90625,7.91371 C 115.49256,7.91371 120,12.42114 120,18.00746 L 120,22.03871 C 120,16.4524 115.49256,11.94496 109.90625,11.94496 L 18.09375,11.94496 C 12.507435,11.94496 8,16.4524 8,22.03871 z"
- style="opacity:0.38860103;fill:url(#linearGradient6649);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:nodetypes="ccccccccc" />
- <g
- id="g3227"
- transform="translate(0,-1)">
- <path
- id="path3207"
- d="M 19.441303,13.28125 C 15.451078,13.28125 12.253803,16.478525 12.253803,20.46875 L 12.253803,21.46875 C 12.253803,17.478525 15.451078,14.28125 19.441303,14.28125 L 109.0663,14.28125 C 113.05653,14.28125 116.2538,17.478525 116.2538,21.46875 L 116.2538,20.46875 C 116.2538,16.478525 113.05653,13.28125 109.0663,13.28125 L 19.441303,13.28125 z"
- style="opacity:1;fill:url(#linearGradient3231);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:nodetypes="ccccccccc" />
- <path
- id="path3215"
- d="M 112.21077,14.946344 C 113.80613,16.261139 114.83577,18.233092 114.83577,20.477594 L 114.83577,54.977594 C 114.6424,55.305632 114.39903,55.644913 114.11702,55.977594 C 86.869243,66.464121 40.804813,69.465921 12.242023,62.602594 L 12.242023,63.165094 C 41.223093,70.471727 87.827513,67.54278 115.52327,56.883844 C 115.80529,56.551161 116.04865,56.211882 116.24202,55.883844 L 116.24202,21.383844 C 116.24202,18.530833 114.60098,16.10976 112.21077,14.946344 z"
- style="opacity:1;fill:url(#linearGradient3233);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:nodetypes="cccccccccc" />
- </g>
- <path
- transform="scale(-1,1)"
- style="fill:none;fill-opacity:1;stroke:url(#linearGradient3243);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter3281)"
- d="M -109.38386,13.614708 L -19.616139,13.614708 C -15.737346,13.614708 -12.614708,16.737346 -12.614708,20.616139 L -12.614708,108.38386 C -12.614708,112.26265 -15.737346,115.38529 -19.616139,115.38529 L -109.38386,115.38529 C -113.26265,115.38529 -116.38529,112.26265 -116.38529,108.38386 L -116.38529,20.616139 C -116.38529,16.737346 -113.26265,13.614708 -109.38386,13.614708 z"
- id="rect3235"
- sodipodi:nodetypes="ccccccccc" />
- <path
- style="opacity:1;fill:url(#linearGradient2816);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 19.1875,12.28125 C 15.197275,12.28125 12,15.478525 12,19.46875 L 12,61.25 C 40.981077,68.556633 87.585499,65.627686 115.28125,54.96875 C 115.56327,54.636067 115.80663,54.296788 116,53.96875 L 116,19.46875 C 116,15.478525 112.80273,12.28125 108.8125,12.28125 L 19.1875,12.28125 z"
- id="rect9679"
- sodipodi:nodetypes="cccccccc" />
- <g
- id="g3061"
- transform="matrix(1.129772,0,0,1.129772,132.6354,-8.3054093)">
- <path
- id="rect2396"
- d="M -32.978785,29.550642 C -34.263506,28.26592 -36.334452,28.26592 -37.619173,29.550642 L -60.754823,52.686292 L -83.890473,29.550642 C -85.175194,28.26592 -87.24614,28.26592 -88.530861,29.550642 L -95.204181,36.223962 C -96.488903,37.508683 -96.488903,39.579629 -95.204181,40.86435 L -72.068531,64 L -95.204181,87.13565 C -96.488903,88.420371 -96.488903,90.491317 -95.204181,91.776038 L -88.530861,98.449358 C -87.24614,99.73408 -85.175194,99.73408 -83.890473,98.449358 L -60.754823,75.313708 L -37.619173,98.449358 C -36.334452,99.73408 -34.263506,99.73408 -32.978785,98.449358 L -26.305465,91.776038 C -25.020743,90.491317 -25.020743,88.420371 -26.305465,87.13565 L -49.441114,64 L -26.305465,40.86435 C -25.020743,39.579629 -25.020743,37.508683 -26.305465,36.223962 L -32.978785,29.550642 z"
- style="opacity:1;fill:url(#radialGradient3066);fill-opacity:1;stroke:none;stroke-width:0.13749999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4.15;stroke-opacity:1" />
- <path
- transform="translate(88.315386,0)"
- clip-path="url(#clipPath3055)"
- sodipodi:nodetypes="ccccccccccccccccccccccccccccc"
- id="path2994"
- d="M -183.09375,39.246364 C -183.73474,40.481924 -183.53875,42.020114 -182.5,43.058864 L -160.875,64.715114 L -159.375,63.215114 L -182.5,40.058864 C -182.74981,39.809054 -182.94109,39.544064 -183.09375,39.246364 z M -115.03125,39.246364 C -115.18344,39.541254 -115.34605,39.811164 -115.59375,40.058864 L -138.75,63.215114 L -137.25,64.715114 L -115.59375,43.058864 C -114.55322,42.018334 -114.38628,40.482954 -115.03125,39.246364 z M -149.0625,73.527614 L -172.1875,96.652614 C -173.47222,97.937334 -175.55903,97.937334 -176.84375,96.652614 L -183.5,89.965114 C -183.74981,89.715304 -183.94109,89.450314 -184.09375,89.152614 C -184.73474,90.388174 -184.53875,91.926364 -183.5,92.965114 L -176.84375,99.652614 C -175.55903,100.93733 -173.47222,100.93733 -172.1875,99.652614 L -149.0625,76.527614 L -125.90625,99.652614 C -124.62153,100.93733 -122.56597,100.93733 -121.28125,99.652614 L -114.59375,92.965114 C -113.55322,91.924594 -113.38628,90.389204 -114.03125,89.152614 C -114.18344,89.447504 -114.34605,89.717414 -114.59375,89.965114 L -121.28125,96.652614 C -122.56597,97.937334 -124.62153,97.937334 -125.90625,96.652614 L -149.0625,73.527614 z"
- style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.13749999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4.15;stroke-opacity:1;filter:url(#filter3033)" />
- <path
- transform="translate(180.67317,0)"
- clip-path="url(#clipPath3049)"
- sodipodi:nodetypes="cccccccccccccccccccccccccccccc"
- id="path2996"
- d="M -266.875,27.360916 C -267.71392,27.360916 -268.57639,27.687306 -269.21875,28.329666 L -275.875,35.017166 C -276.9099,36.052076 -277.1012,37.596346 -276.46875,38.829666 C -276.31697,38.537086 -276.12097,38.263136 -275.875,38.017166 L -269.21875,31.329666 C -267.93403,30.044936 -265.84722,30.044936 -264.5625,31.329666 L -241.4375,54.485916 L -218.3125,31.329666 C -217.02778,30.044936 -214.94098,30.044936 -213.65625,31.329666 L -207,38.017166 C -206.75581,38.261356 -206.55761,38.539456 -206.40625,38.829666 C -205.76912,37.595106 -205.96298,36.054186 -207,35.017166 L -213.65625,28.329666 C -214.94098,27.044936 -217.02778,27.044936 -218.3125,28.329666 L -241.4375,51.485916 L -264.5625,28.329666 C -265.20486,27.687306 -266.03608,27.360916 -266.875,27.360916 z M -253.65,63.898416 L -275.275,85.523416 C -276.3099,86.558336 -276.5012,88.102596 -275.86875,89.335916 C -275.71697,89.043336 -275.52097,88.769386 -275.275,88.523416 L -252.15,65.398416 L -253.65,63.898416 z M -228.725,63.798416 L -230.225,65.298416 L -207.1,88.423416 C -206.85581,88.667616 -206.65761,88.945706 -206.50625,89.235916 C -205.86912,88.001366 -206.06298,86.460446 -207.1,85.423416 L -228.725,63.798416 z"
- style="opacity:1;fill:url(#linearGradient3068);fill-opacity:1;stroke:none;stroke-width:0.13749999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4.15;stroke-opacity:1;filter:url(#filter3045)" />
- </g>
- </g>
-</svg>
Deleted: trunk/QtOgreFramework/EngineTest/resources/icons/go-previous.svg
===================================================================
--- trunk/QtOgreFramework/EngineTest/resources/icons/go-previous.svg 2010-06-29 19:48:44 UTC (rev 2926)
+++ trunk/QtOgreFramework/EngineTest/resources/icons/go-previous.svg 2010-06-29 20:41:09 UTC (rev 2927)
@@ -1,961 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="128"
- height="128"
- id="svg2606"
- sodipodi:version="0.32"
- inkscape:version="0.45+devel"
- version="1.0"
- sodipodi:docname="go-previous.svgz"
- inkscape:output_extension="org.inkscape.output.svgz.inkscape"
- sodipodi:docbase="/home/pinheiro/artwork/Oxygen/scribus/scalable"
- inkscape:export-filename="/home/pinheiro/pics/oxygen/scalable/actions/go-next.png"
- inkscape:export-xdpi="180"
- inkscape:export-ydpi="180">
- <defs
- id="defs2608">
- <linearGradient
- inkscape:collect="always"
- id="linearGradient3449">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop3451" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop3453" />
- </linearGradient>
- <linearGradient
- id="linearGradient3295">
- <stop
- style="stop-color:#63e9ff;stop-opacity:1;"
- offset="0"
- id="stop3297" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop3299" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient3260">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop3262" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop3264" />
- </linearGradient>
- <linearGradient
- id="linearGradient3202">
- <stop
- style="stop-color:#cdeeff;stop-opacity:1;"
- offset="0"
- id="stop3204" />
- <stop
- style="stop-color:#d2e8ed;stop-opacity:0;"
- offset="1"
- id="stop3206" />
- </linearGradient>
- <radialGradient
- id="XMLID_4_"
- cx="48"
- cy="-0.2148"
- r="55.148"
- gradientTransform="matrix(0.9792,0,0,0.9725,133.0002,20.8762)"
- gradientUnits="userSpaceOnUse">
- <stop
- offset="0"
- style="stop-color:#72D13D"
- id="stop3082" />
- <stop
- offset="0.3553"
- style="stop-color:#35AC1C"
- id="stop3084" />
- <stop
- offset="0.6194"
- style="stop-color:#0F9508"
- id="stop3086" />
- <stop
- offset="0.7574"
- style="stop-color:#008C00"
- id="stop3088" />
- <stop
- offset="1"
- style="stop-color:#007A00"
- id="stop3090" />
- </radialGradient>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#XMLID_4_"
- id="radialGradient3629"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)"
- cx="172"
- cy="76"
- fx="172"
- fy="76"
- r="56" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6666"
- id="radialGradient3213"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)"
- cx="172"
- cy="76"
- fx="188.88173"
- fy="121.44213"
- r="56" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3260"
- id="linearGradient3301"
- x1="73.742638"
- y1="15.336544"
- x2="78.939339"
- y2="16.750759"
- gradientUnits="userSpaceOnUse"
- spreadMethod="reflect"
- gradientTransform="translate(4,0)" />
- <filter
- inkscape:collect="always"
- x="-0.10207015"
- width="1.2041403"
- y="-0.12495601"
- height="1.249912"
- id="filter3387">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.44655691"
- id="feGaussianBlur3389" />
- </filter>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3295"
- id="linearGradient3393"
- gradientUnits="userSpaceOnUse"
- spreadMethod="reflect"
- x1="74.75"
- y1="14.275884"
- x2="78.939339"
- y2="16.750759" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6404"
- id="linearGradient3409"
- gradientUnits="userSpaceOnUse"
- x1="194.5"
- y1="123.90683"
- x2="104.25"
- y2="5.1559582"
- gradientTransform="matrix(1,0,0,0.8610463,-108,-1.4361867)" />
- <filter
- inkscape:collect="always"
- x="-0.11573034"
- width="1.2314607"
- y="-0.12753956"
- height="1.2550791"
- id="filter3443">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.32549158"
- id="feGaussianBlur3445" />
- </filter>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3449"
- id="radialGradient3455"
- cx="72.020813"
- cy="66.344505"
- fx="72.020813"
- fy="66.344505"
- r="60"
- gradientTransform="matrix(0.5816285,1.767767e-2,-2.6986249e-2,0.8878982,31.921846,5.9419094)"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3202"
- id="linearGradient3521"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1,0,0,0.8610463,-108.16138,-1.4361867)"
- spreadMethod="reflect"
- x1="223.32712"
- y1="53.784153"
- x2="226.659"
- y2="57.279232" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3295"
- id="linearGradient2226"
- gradientUnits="userSpaceOnUse"
- x1="179.17224"
- y1="123.75864"
- x2="180.40749"
- y2="62.959969" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3295"
- id="linearGradient2228"
- gradientUnits="userSpaceOnUse"
- x1="179.17224"
- y1="123.75864"
- x2="173.98071"
- y2="65.448112"
- gradientTransform="translate(97,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3202"
- id="linearGradient3253"
- x1="47.968472"
- y1="16.138517"
- x2="49.218472"
- y2="85.427559"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-0.5,-87.681242)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3260"
- id="linearGradient3530"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1,0,0,0.8610463,-108.16138,-1.4361867)"
- spreadMethod="reflect"
- x1="223.32712"
- y1="53.784153"
- x2="226.659"
- y2="57.279232" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3449"
- id="radialGradient3534"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2586607,-0.5212474,0.8274344,0.4106011,-35.53945,50.055595)"
- cx="-16.668488"
- cy="86.826965"
- fx="-16.668488"
- fy="86.826965"
- r="60" />
- <radialGradient
- r="43.474762"
- fy="51.592991"
- fx="88.042809"
- cy="74.979416"
- cx="77.533371"
- spreadMethod="reflect"
- gradientTransform="matrix(-0.4961056,0.4409829,-0.7360594,-0.8280666,-11.726835,87.897058)"
- gradientUnits="userSpaceOnUse"
- id="radialGradient3139"
- xlink:href="#linearGradient2990"
- inkscape:collect="always" />
- <clipPath
- id="clipPath3135"
- clipPathUnits="userSpaceOnUse">
- <path
- style="fill:url(#radialGradient3139);fill-opacity:1;stroke:none;stroke-width:16.49500084;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4.15;stroke-opacity:1"
- d="M -97.32181,27.94375 C -107.56112,27.943751 -117.79103,31.818176 -125.55562,39.582762 C -133.56284,47.589993 -137.44486,58.222613 -137.19463,68.779409 L -137.19463,96.822041 C -137.19463,100.87378 -133.94013,104.12828 -129.88839,104.12828 L -64.755235,104.12828 C -60.703495,104.12828 -57.448995,100.87378 -57.448995,96.822041 L -57.448995,68.779409 C -57.198765,58.222612 -61.080775,47.589993 -69.088001,39.582762 C -76.852581,31.818171 -87.082497,27.943749 -97.32181,27.94375 z M -97.32181,43.481014 C -90.982458,43.481015 -84.633535,45.9179 -79.764176,50.787256 C -74.95275,55.59868 -72.515179,61.833382 -72.457934,68.090021 L -122.15737,68.090021 C -122.10012,61.833381 -119.69086,55.598679 -114.87944,50.787256 C -110.01008,45.917895 -103.66116,43.481013 -97.32181,43.481014 z"
- id="path3137"
- sodipodi:nodetypes="csccccccsccsccsc" />
- </clipPath>
- <radialGradient
- r="43.474762"
- fy="51.592991"
- fx="88.042809"
- cy="74.979416"
- cx="77.533371"
- spreadMethod="reflect"
- gradientTransform="matrix(-0.4961056,0.4409829,-0.7360594,-0.8280666,-99.14147,87.897058)"
- gradientUnits="userSpaceOnUse"
- id="radialGradient3133"
- xlink:href="#linearGradient2990"
- inkscape:collect="always" />
- <clipPath
- id="clipPath3129"
- clipPathUnits="userSpaceOnUse">
- <path
- sodipodi:nodetypes="csccccccsccsccsc"
- id="path3131"
- d="M -184.73645,27.94375 C -194.97576,27.943751 -205.20567,31.818176 -212.97026,39.582762 C -220.97748,47.589993 -224.8595,58.222613 -224.60927,68.779409 L -224.60927,96.822041 C -224.60927,100.87378 -221.35477,104.12828 -217.30303,104.12828 L -152.16987,104.12828 C -148.11813,104.12828 -144.86363,100.87378 -144.86363,96.822041 L -144.86363,68.779409 C -144.6134,58.222612 -148.49541,47.589993 -156.50264,39.582762 C -164.26722,31.818171 -174.49713,27.943749 -184.73645,27.94375 z M -184.73645,43.481014 C -178.39709,43.481015 -172.04817,45.9179 -167.17881,50.787256 C -162.36739,55.59868 -159.92981,61.833382 -159.87257,68.090021 L -209.57201,68.090021 C -209.51476,61.833381 -207.1055,55.598679 -202.29408,50.787256 C -197.42472,45.917895 -191.0758,43.481013 -184.73645,43.481014 z"
- style="fill:url(#radialGradient3133);fill-opacity:1;stroke:none;stroke-width:16.49500084;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4.15;stroke-opacity:1" />
- </clipPath>
- <radialGradient
- r="43.474762"
- fy="51.592991"
- fx="73.551216"
- cy="74.979408"
- cx="63.041775"
- spreadMethod="reflect"
- gradientTransform="matrix(-1.1040885,0.8280667,-0.6647496,-0.8863327,191.44623,62.253906)"
- gradientUnits="userSpaceOnUse"
- id="radialGradient2409"
- xlink:href="#linearGradient2990"
- inkscape:collect="always" />
- <linearGradient
- y2="-20.962214"
- x2="60.402065"
- y1="64.076149"
- x1="60.402065"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3289"
- xlink:href="#linearGradient6674"
- inkscape:collect="always" />
- <linearGradient
- gradientUnits="userSpaceOnUse"
- y2="8"
- x2="-60"
- y1="105.83054"
- x1="-60.945251"
- id="linearGradient3243"
- xlink:href="#linearGradient3237"
- inkscape:collect="always" />
- <linearGradient
- y2="21.03125"
- x2="31.376678"
- y1="71.084908"
- x1="115.76678"
- gradientTransform="translate(0.2332229,1.9150941)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3233"
- xlink:href="#linearGradient6446"
- inkscape:collect="always" />
- <linearGradient
- y2="46.228859"
- x2="59.225807"
- y1="7.8973217"
- x1="59.225807"
- gradientTransform="translate(0.2623629,1)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3231"
- xlink:href="#linearGradient6446"
- inkscape:collect="always" />
- <linearGradient
- y2="82.029854"
- x2="74.447762"
- y1="-26.936626"
- x1="64"
- gradientUnits="userSpaceOnUse"
- id="linearGradient2816"
- xlink:href="#linearGradient6446"
- inkscape:collect="always" />
- <linearGradient
- gradientUnits="userSpaceOnUse"
- y2="88.633484"
- x2="19.934336"
- y1="50.580647"
- x1="19.096775"
- id="linearGradient6680"
- xlink:href="#linearGradient6674"
- inkscape:collect="always" />
- <linearGradient
- gradientTransform="translate(0,3)"
- gradientUnits="userSpaceOnUse"
- y2="50.728985"
- x2="62.038712"
- y1="15.91371"
- x1="62.038712"
- id="linearGradient6649"
- xlink:href="#linearGradient6643"
- inkscape:collect="always" />
- <linearGradient
- gradientUnits="userSpaceOnUse"
- y2="74.913147"
- x2="55.329033"
- y1="112"
- x1="55.329033"
- id="linearGradient6637"
- xlink:href="#linearGradient6631"
- inkscape:collect="always" />
- <linearGradient
- y2="28.235947"
- x2="13.96104"
- y1="21.101994"
- x1="21.094994"
- spreadMethod="reflect"
- gradientTransform="translate(0.4129032,0.6193548)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient6472"
- xlink:href="#linearGradient6446"
- inkscape:collect="always" />
- <linearGradient
- y2="28.235947"
- x2="13.96104"
- y1="21.101994"
- x1="21.094994"
- spreadMethod="reflect"
- gradientTransform="translate(0.4129032,0.6193548)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient6470"
- xlink:href="#linearGradient6446"
- inkscape:collect="always" />
- <linearGradient
- y2="27.070099"
- x2="15.126888"
- y1="21.101994"
- x1="21.094994"
- spreadMethod="reflect"
- gradientTransform="translate(0.4129032,0.6193548)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient6464"
- xlink:href="#linearGradient6446"
- inkscape:collect="always" />
- <linearGradient
- gradientTransform="translate(-7.5870968,-7.3806452)"
- spreadMethod="reflect"
- gradientUnits="userSpaceOnUse"
- y2="27.007854"
- x2="15.189133"
- y1="21.101994"
- x1="21.094994"
- id="linearGradient6452"
- xlink:href="#linearGradient6446"
- inkscape:collect="always" />
- <linearGradient
- gradientUni...
[truncated message content] |
|
From: <es...@us...> - 2010-06-29 19:48:51
|
Revision: 2926
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2926&view=rev
Author: esuvs
Date: 2010-06-29 19:48:44 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
Improved extension loading.
Modified Paths:
--------------
trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
Modified: trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-06-28 22:03:31 UTC (rev 2925)
+++ trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-06-29 19:48:44 UTC (rev 2926)
@@ -44,6 +44,8 @@
void loadScene(QString filename);
private:
+ void initScriptEngine(void);
+
Keyboard keyboard;
Mouse mouse;
/*QPoint mLastFrameMousePos;
Modified: trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-06-28 22:03:31 UTC (rev 2925)
+++ trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-06-29 19:48:44 UTC (rev 2926)
@@ -17,321 +17,344 @@
#include <QKeyEvent>
#include <QMouseEvent>
#include <QSettings>
-
+#include <QStringList.h>
#include <QMetaObject>
using namespace QtOgre;
- QScriptValue toScriptValueQPoint(QScriptEngine *engine, const QPoint &s)
- {
- QScriptValue obj = engine->newObject();
- obj.setProperty("x", s.x());
- obj.setProperty("y", s.y());
- return obj;
- }
+QScriptValue toScriptValueQPoint(QScriptEngine *engine, const QPoint &s)
+{
+ QScriptValue obj = engine->newObject();
+ obj.setProperty("x", s.x());
+ obj.setProperty("y", s.y());
+ return obj;
+}
- void fromScriptValueQPoint(const QScriptValue &obj, QPoint &s)
- {
- s.setX(obj.property("x").toInt32());
- s.setY(obj.property("y").toInt32());
- }
+void fromScriptValueQPoint(const QScriptValue &obj, QPoint &s)
+{
+ s.setX(obj.property("x").toInt32());
+ s.setY(obj.property("y").toInt32());
+}
- struct QtMetaObject : private QObject
- {
- public:
- static const QMetaObject *get()
- { return &static_cast<QtMetaObject*>(0)->staticQtMetaObject; }
- };
+struct QtMetaObject : private QObject
+{
+public:
+ static const QMetaObject *get()
+ { return &static_cast<QtMetaObject*>(0)->staticQtMetaObject; }
+};
- EngineTestGameLogic::EngineTestGameLogic(void)
- :GameLogic()
- {
- }
+EngineTestGameLogic::EngineTestGameLogic(void)
+ :GameLogic()
+{
+}
- void EngineTestGameLogic::initialise(void)
- {
- scriptEngine = new QScriptEngine;
+void EngineTestGameLogic::initialise(void)
+{
+ initScriptEngine();
- QDir dir("C:\\qt\\qt-labs-qtscriptgenerator\\plugins");
- QStringList paths = qApp->libraryPaths();
- paths << dir.absolutePath();
- qApp->setLibraryPaths(paths);
+ QScriptValue keyboardScriptValue = scriptEngine->newQObject(&keyboard);
+ scriptEngine->globalObject().setProperty("keyboard", keyboardScriptValue);
- QString temp;
- foreach(temp, paths)
- {
- qCritical() << temp;
- }
+ QScriptValue mouseScriptValue = scriptEngine->newQObject(&mouse);
+ scriptEngine->globalObject().setProperty("mouse", mouseScriptValue);
- QScriptValue retCore = scriptEngine->importExtension("qt.core");
- QScriptValue retGui = scriptEngine->importExtension("qt.gui");
- if(retCore.isError())
- {
- qCritical() << "Failed to load core plugin";
- }
- if(retGui.isError())
- {
- qCritical() << "Failed to load gui plugin";
- }
+ QScriptValue cameraScriptValue = scriptEngine->newQObject(&cameraWrapper);
+ scriptEngine->globalObject().setProperty("camera", cameraScriptValue);
+ QScriptValue Qt = scriptEngine->newQMetaObject(QtMetaObject::get());
+ Qt.setProperty("App", scriptEngine->newQObject(qApp));
+ scriptEngine->globalObject().setProperty("Qt", Qt);
- QScriptValue keyboardScriptValue = scriptEngine->newQObject(&keyboard);
- scriptEngine->globalObject().setProperty("keyboard", keyboardScriptValue);
+ qScriptRegisterMetaType(scriptEngine, toScriptValueQPoint, fromScriptValueQPoint);
- QScriptValue mouseScriptValue = scriptEngine->newQObject(&mouse);
- scriptEngine->globalObject().setProperty("mouse", mouseScriptValue);
+ OgreVector3Class *vecClass = new OgreVector3Class(scriptEngine);
+ scriptEngine->globalObject().setProperty("OgreVector3", vecClass->constructor());
- QScriptValue cameraScriptValue = scriptEngine->newQObject(&cameraWrapper);
- scriptEngine->globalObject().setProperty("camera", cameraScriptValue);
+ OgreRadianClass *radianClass = new OgreRadianClass(scriptEngine);
+ scriptEngine->globalObject().setProperty("OgreRadian", radianClass->constructor());
- QScriptValue Qt = scriptEngine->newQMetaObject(QtMetaObject::get());
- Qt.setProperty("App", scriptEngine->newQObject(qApp));
- scriptEngine->globalObject().setProperty("Qt", Qt);
+ updateScript =
+ "vec = new OgreVector3;"
+ "vec.x = 0.0;"
+ "vec.y = 0.0;"
+ "vec.z = 0.0;"
+ "var vector = new QVector3D();"
+ "vector.setX(-1.0);"
+ "print('vector = ', vector);"
+ "if(keyboard.isPressed(Qt.Key_W))"
+ "{"
+ " vec.z = vector.x();"
+ "}"
+ "if(keyboard.isPressed(Qt.Key_S))"
+ "{"
+ " vec.z = 1.0;"
+ "}"
+ "if(keyboard.isPressed(Qt.Key_A))"
+ "{"
+ " vec.x = -1.0;"
+ "}"
+ "if(keyboard.isPressed(Qt.Key_D))"
+ "{"
+ " vec.x = 1.0;"
+ "}"
+ "camera.moveRelative(vec);"
+ "if(mouse.isPressed(Qt.RightButton))"
+ "{"
+ " mouseDelta = mouse.computeDelta();"
+ " camera.yaw(new OgreRadian(-mouseDelta.x * 0.01));"
+ "}"
+ "if(mouse.isPressed(Qt.RightButton))"
+ "{"
+ " mouseDelta = mouse.computeDelta();"
+ " camera.pitch(new OgreRadian(-mouseDelta.y * 0.01));"
+ "}"
+ "wheelDelta = mouse.getWheelDelta();"
+ "print('wheelDelta = ', wheelDelta);"
+ "fov = camera.getFOVy();"
+ "print('old fov = ', fov.valueRadians);"
+ "tempFOV = new OgreRadian(-wheelDelta * 0.001);"
+ "fov.valueRadians = fov.valueRadians + tempFOV.valueRadians;"
+ "print('new fov = ', fov.valueRadians);"
+ "camera.setFOVy(fov);"
+ ;
- qScriptRegisterMetaType(scriptEngine, toScriptValueQPoint, fromScriptValueQPoint);
+ //debugger.attachTo(scriptEngine);
+ //debugger.action(QScriptEngineDebugger::InterruptAction)->trigger();
- OgreVector3Class *vecClass = new OgreVector3Class(scriptEngine);
- scriptEngine->globalObject().setProperty("OgreVector3", vecClass->constructor());
- OgreRadianClass *radianClass = new OgreRadianClass(scriptEngine);
- scriptEngine->globalObject().setProperty("OgreRadian", radianClass->constructor());
- updateScript =
- "vec = new OgreVector3;"
- "vec.x = 0.0;"
- "vec.y = 0.0;"
- "vec.z = 0.0;"
- "var vector = new QVector3D();"
- "vector.setX(-1.0);"
- "print('vector = ', vector);"
- "if(keyboard.isPressed(Qt.Key_W))"
- "{"
- " vec.z = vector.x();"
- "}"
- "if(keyboard.isPressed(Qt.Key_S))"
- "{"
- " vec.z = 1.0;"
- "}"
- "if(keyboard.isPressed(Qt.Key_A))"
- "{"
- " vec.x = -1.0;"
- "}"
- "if(keyboard.isPressed(Qt.Key_D))"
- "{"
- " vec.x = 1.0;"
- "}"
- "camera.moveRelative(vec);"
- "if(mouse.isPressed(Qt.RightButton))"
- "{"
- " mouseDelta = mouse.computeDelta();"
- " camera.yaw(new OgreRadian(-mouseDelta.x * 0.01));"
- "}"
- "if(mouse.isPressed(Qt.RightButton))"
- "{"
- " mouseDelta = mouse.computeDelta();"
- " camera.pitch(new OgreRadian(-mouseDelta.y * 0.01));"
- "}"
- "wheelDelta = mouse.getWheelDelta();"
- "print('wheelDelta = ', wheelDelta);"
- "fov = camera.getFOVy();"
- "print('old fov = ', fov.valueRadians);"
- "tempFOV = new OgreRadian(-wheelDelta * 0.001);"
- "fov.valueRadians = fov.valueRadians + tempFOV.valueRadians;"
- "print('new fov = ', fov.valueRadians);"
- "camera.setFOVy(fov);"
- ;
- //debugger.attachTo(scriptEngine);
- //debugger.action(QScriptEngineDebugger::InterruptAction)->trigger();
-
-
-
-
- //qApp->setStyleSheet(qApp->settings()->value("UI/StyleFile").toString());
+ //qApp->setStyleSheet(qApp->settings()->value("UI/StyleFile").toString());
- mDemoLog = mApplication->createLog("EngineTest");
+ mDemoLog = mApplication->createLog("EngineTest");
- mApplication->showLogManager();
+ mApplication->showLogManager();
- mDemoLog->logMessage("A demonstration debug message", LL_DEBUG);
- mDemoLog->logMessage("A demonstration info message", LL_INFO);
- mDemoLog->logMessage("A demonstration warning message", LL_WARNING);
- mDemoLog->logMessage("A demonstration error message", LL_ERROR);
+ mDemoLog->logMessage("A demonstration debug message", LL_DEBUG);
+ mDemoLog->logMessage("A demonstration info message", LL_INFO);
+ mDemoLog->logMessage("A demonstration warning message", LL_WARNING);
+ mDemoLog->logMessage("A demonstration error message", LL_ERROR);
- //Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+ //Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
- // Create the generic scene manager
- mSceneManager = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC, "GenericSceneManager");
+ // Create the generic scene manager
+ mSceneManager = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC, "GenericSceneManager");
- //Set up scene
- loadScene("media/scenes/test.scene");
+ //Set up scene
+ loadScene("media/scenes/test.scene");
- //mApplication->ogreRenderWindow()->addViewport(mCamera)->setBackgroundColour(Ogre::ColourValue::Black);
+ //mApplication->ogreRenderWindow()->addViewport(mCamera)->setBackgroundColour(Ogre::ColourValue::Black);
- mSceneManager->setAmbientLight( Ogre::ColourValue( 1, 1, 1 ) );
+ mSceneManager->setAmbientLight( Ogre::ColourValue( 1, 1, 1 ) );
- //Create the MainMenu
- mMainMenu = new MainMenu(qApp, qApp->mainWidget());
+ //Create the MainMenu
+ mMainMenu = new MainMenu(qApp, qApp->mainWidget());
- //Create widget to choose between models
- //mChooseMeshWidget = new ChooseMeshWidget(mJaiquaEntity, mRobotEntity, qApp->mainWidget());
- //mChooseMeshWidget->setWindowOpacity(qApp->settings()->value("System/DefaultWindowOpacity", 1.0).toDouble());
- //mChooseMeshWidget->move(qApp->mainWidget()->geometry().left() + qApp->mainWidget()->geometry().width() - mChooseMeshWidget->frameGeometry().width() - 10, qApp->mainWidget()->geometry().top() + 10);
- //mChooseMeshWidget->show();
+ //Create widget to choose between models
+ //mChooseMeshWidget = new ChooseMeshWidget(mJaiquaEntity, mRobotEntity, qApp->mainWidget());
+ //mChooseMeshWidget->setWindowOpacity(qApp->settings()->value("System/DefaultWindowOpacity", 1.0).toDouble());
+ //mChooseMeshWidget->move(qApp->mainWidget()->geometry().left() + qApp->mainWidget()->geometry().width() - mChooseMeshWidget->frameGeometry().width() - 10, qApp->mainWidget()->geometry().top() + 10);
+ //mChooseMeshWidget->show();
- mTime = new QTime;
- mTime->start();
+ mTime = new QTime;
+ mTime->start();
- mIsFirstFrame = true;
+ mIsFirstFrame = true;
- mCameraSpeed = 10.0;
+ mCameraSpeed = 10.0;
- for (Ogre::SceneManager::MovableObjectIterator moi = mSceneManager->getMovableObjectIterator("Entity"); moi.hasMoreElements(); moi.moveNext())
+ for (Ogre::SceneManager::MovableObjectIterator moi = mSceneManager->getMovableObjectIterator("Entity"); moi.hasMoreElements(); moi.moveNext())
+ {
+ Ogre::Entity *entity = static_cast<Ogre::Entity*>(moi.peekNextValue());
+
+ Ogre::AnimationStateSet* animationStateSet = entity->getAllAnimationStates();
+ if(animationStateSet && animationStateSet->hasAnimationState("Walk"))
{
- Ogre::Entity *entity = static_cast<Ogre::Entity*>(moi.peekNextValue());
-
- Ogre::AnimationStateSet* animationStateSet = entity->getAllAnimationStates();
- if(animationStateSet && animationStateSet->hasAnimationState("Walk"))
- {
- Ogre::AnimationState* walkAnimationState = animationStateSet->getAnimationState("Walk");
- walkAnimationState->setLoop(true);
- walkAnimationState->setEnabled(true);
- }
+ Ogre::AnimationState* walkAnimationState = animationStateSet->getAnimationState("Walk");
+ walkAnimationState->setLoop(true);
+ walkAnimationState->setEnabled(true);
}
+ }
- mApplication->showFPSCounter();
+ mApplication->showFPSCounter();
- mStyleSettingsWidget = new StyleSettingsWidget;
- mApplication->addSettingsWidget("Style", mStyleSettingsWidget);
+ mStyleSettingsWidget = new StyleSettingsWidget;
+ mApplication->addSettingsWidget("Style", mStyleSettingsWidget);
- /*cameraPositionScriptValue = scriptEngine->toScriptValue(mCamera->getPosition());
- cameraDirectionScriptValue = scriptEngine->toScriptValue(mCamera->getDirection());
- cameraRightScriptValue = scriptEngine->toScriptValue(mCamera->getRight());
+ /*cameraPositionScriptValue = scriptEngine->toScriptValue(mCamera->getPosition());
+ cameraDirectionScriptValue = scriptEngine->toScriptValue(mCamera->getDirection());
+ cameraRightScriptValue = scriptEngine->toScriptValue(mCamera->getRight());
- scriptEngine->globalObject().setProperty("cameraPosition", cameraPositionScriptValue);
- scriptEngine->globalObject().setProperty("cameraDirection", cameraDirectionScriptValue);
- scriptEngine->globalObject().setProperty("cameraRight", cameraRightScriptValue);*/
- }
+ scriptEngine->globalObject().setProperty("cameraPosition", cameraPositionScriptValue);
+ scriptEngine->globalObject().setProperty("cameraDirection", cameraDirectionScriptValue);
+ scriptEngine->globalObject().setProperty("cameraRight", cameraRightScriptValue);*/
+}
- void EngineTestGameLogic::update(void)
+void EngineTestGameLogic::update(void)
+{
+ mLastFrameTime = mCurrentTime;
+ mCurrentTime = mTime->elapsed();
+
+ float timeElapsedInSeconds = (mCurrentTime - mLastFrameTime) / 1000.0f;
+
+ for (Ogre::SceneManager::MovableObjectIterator moi = mSceneManager->getMovableObjectIterator("Entity"); moi.hasMoreElements(); moi.moveNext())
{
- mLastFrameTime = mCurrentTime;
- mCurrentTime = mTime->elapsed();
+ Ogre::Entity *entity = static_cast<Ogre::Entity*>(moi.peekNextValue());
- float timeElapsedInSeconds = (mCurrentTime - mLastFrameTime) / 1000.0f;
-
- for (Ogre::SceneManager::MovableObjectIterator moi = mSceneManager->getMovableObjectIterator("Entity"); moi.hasMoreElements(); moi.moveNext())
+ Ogre::AnimationStateSet* animationStateSet = entity->getAllAnimationStates();
+ if(animationStateSet && animationStateSet->hasAnimationState("Walk"))
{
- Ogre::Entity *entity = static_cast<Ogre::Entity*>(moi.peekNextValue());
-
- Ogre::AnimationStateSet* animationStateSet = entity->getAllAnimationStates();
- if(animationStateSet && animationStateSet->hasAnimationState("Walk"))
- {
- Ogre::AnimationState* walkAnimationState = animationStateSet->getAnimationState("Walk");
- walkAnimationState->addTime(timeElapsedInSeconds);
- }
+ Ogre::AnimationState* walkAnimationState = animationStateSet->getAnimationState("Walk");
+ walkAnimationState->addTime(timeElapsedInSeconds);
}
+ }
- float distance = mCameraSpeed * timeElapsedInSeconds;
+ float distance = mCameraSpeed * timeElapsedInSeconds;
- mIsFirstFrame = false;
+ mIsFirstFrame = false;
- QScriptValue result = scriptEngine->evaluate(updateScript);
- if (scriptEngine->hasUncaughtException())
- {
- int line = scriptEngine->uncaughtExceptionLineNumber();
- qCritical() << "uncaught exception at line" << line << ":" << result.toString();
- }
-
- mouse.resetDelta();
- mouse.resetWheelDelta();
- }
-
- void EngineTestGameLogic::shutdown(void)
+ QScriptValue result = scriptEngine->evaluate(updateScript);
+ if (scriptEngine->hasUncaughtException())
{
- mSceneManager->clearScene();
- Ogre::Root::getSingleton().destroySceneManager(mSceneManager);
+ int line = scriptEngine->uncaughtExceptionLineNumber();
+ qCritical() << "uncaught exception at line" << line << ":" << result.toString();
}
- void EngineTestGameLogic::onKeyPress(QKeyEvent* event)
- {
- keyboard.press(event->key());
+ mouse.resetDelta();
+ mouse.resetWheelDelta();
+}
- if(event->key() == Qt::Key_Escape)
- {
- //qApp->centerWidget(mMainMenu, qApp->mMainWindow);
- mMainMenu->exec();
- }
- }
+void EngineTestGameLogic::shutdown(void)
+{
+ mSceneManager->clearScene();
+ Ogre::Root::getSingleton().destroySceneManager(mSceneManager);
+}
- void EngineTestGameLogic::onKeyRelease(QKeyEvent* event)
+void EngineTestGameLogic::onKeyPress(QKeyEvent* event)
+{
+ keyboard.press(event->key());
+
+ if(event->key() == Qt::Key_Escape)
{
- keyboard.release(event->key());
+ //qApp->centerWidget(mMainMenu, qApp->mMainWindow);
+ mMainMenu->exec();
}
+}
- void EngineTestGameLogic::onMousePress(QMouseEvent* event)
- {
- mouse.press(event->button());
+void EngineTestGameLogic::onKeyRelease(QKeyEvent* event)
+{
+ keyboard.release(event->key());
+}
- //Update the mouse position as well or we get 'jumps'
- mouse.setPos(event->pos());
- mouse.resetDelta();
- }
+void EngineTestGameLogic::onMousePress(QMouseEvent* event)
+{
+ mouse.press(event->button());
- void EngineTestGameLogic::onMouseRelease(QMouseEvent* event)
- {
- mouse.release(event->button());
- }
+ //Update the mouse position as well or we get 'jumps'
+ mouse.setPos(event->pos());
+ mouse.resetDelta();
+}
- void EngineTestGameLogic::onMouseMove(QMouseEvent* event)
- {
- //mCurrentMousePos = event->pos();
- mouse.setPos(event->pos());
- }
+void EngineTestGameLogic::onMouseRelease(QMouseEvent* event)
+{
+ mouse.release(event->button());
+}
- void EngineTestGameLogic::onWheel(QWheelEvent* event)
- {
- //mCurrentWheelPos += event->delta();
- mouse.modifyWheelDelta(event->delta());
- }
+void EngineTestGameLogic::onMouseMove(QMouseEvent* event)
+{
+ //mCurrentMousePos = event->pos();
+ mouse.setPos(event->pos());
+}
- Log* EngineTestGameLogic::demoLog(void)
- {
- return mDemoLog;
- }
+void EngineTestGameLogic::onWheel(QWheelEvent* event)
+{
+ //mCurrentWheelPos += event->delta();
+ mouse.modifyWheelDelta(event->delta());
+}
- void EngineTestGameLogic::loadScene(QString filename)
- {
- //The QtOgre DotScene loading code will clear the existing scene except for cameras, as these
- //could be used by existing viewports. Therefore we clear and viewports and cameras before
- //calling the loading code.
- mApplication->ogreRenderWindow()->removeAllViewports();
- mSceneManager->destroyAllCameras();
+Log* EngineTestGameLogic::demoLog(void)
+{
+ return mDemoLog;
+}
- //Now load the scene.
- DotSceneHandler handler(mSceneManager);
- QXmlSimpleReader reader;
- reader.setContentHandler(&handler);
- reader.setErrorHandler(&handler);
+void EngineTestGameLogic::loadScene(QString filename)
+{
+ //The QtOgre DotScene loading code will clear the existing scene except for cameras, as these
+ //could be used by existing viewports. Therefore we clear and viewports and cameras before
+ //calling the loading code.
+ mApplication->ogreRenderWindow()->removeAllViewports();
+ mSceneManager->destroyAllCameras();
- QFile file(filename);
- file.open(QFile::ReadOnly | QFile::Text);
- QXmlInputSource xmlInputSource(&file);
- reader.parse(xmlInputSource);
+ //Now load the scene.
+ DotSceneHandler handler(mSceneManager);
+ QXmlSimpleReader reader;
+ reader.setContentHandler(&handler);
+ reader.setErrorHandler(&handler);
- //Now create a viewport, using the first camera in the scene.
- mCamera = mSceneManager->getCameraIterator().peekNextValue();
+ QFile file(filename);
+ file.open(QFile::ReadOnly | QFile::Text);
+ QXmlInputSource xmlInputSource(&file);
+ reader.parse(xmlInputSource);
- //mCamera->setPosition(0, 0, 20);
- //mCamera->lookAt(0, 0, 0);
- mCamera->setNearClipDistance(1.0);
- mCamera->setFarClipDistance(1000.0);
- //mCamera->setFOVy(Ogre::Radian(1.0f));
+ //Now create a viewport, using the first camera in the scene.
+ mCamera = mSceneManager->getCameraIterator().peekNextValue();
- Ogre::Viewport* viewport = mApplication->ogreRenderWindow()->addViewport(mCamera);
- viewport->setBackgroundColour(Ogre::ColourValue::Black);
+ //mCamera->setPosition(0, 0, 20);
+ //mCamera->lookAt(0, 0, 0);
+ mCamera->setNearClipDistance(1.0);
+ mCamera->setFarClipDistance(1000.0);
+ //mCamera->setFOVy(Ogre::Radian(1.0f));
- cameraWrapper.setOgreCamera(mCamera);
- }
\ No newline at end of file
+ Ogre::Viewport* viewport = mApplication->ogreRenderWindow()->addViewport(mCamera);
+ viewport->setBackgroundColour(Ogre::ColourValue::Black);
+
+ cameraWrapper.setOgreCamera(mCamera);
+}
+
+void EngineTestGameLogic::initScriptEngine(void)
+{
+ scriptEngine = new QScriptEngine;
+
+ QStringList extensions;
+ extensions << "qt.core"
+ << "qt.gui"
+ << "qt.xml"
+ << "qt.svg"
+ << "qt.network"
+ << "qt.sql"
+ << "qt.opengl"
+ << "qt.webkit"
+ << "qt.xmlpatterns"
+ << "qt.uitools";
+ QStringList failExtensions;
+ foreach (const QString &ext, extensions)
+ {
+ QScriptValue ret = scriptEngine->importExtension(ext);
+ if (ret.isError())
+ {
+ failExtensions.append(ext);
+ }
+ }
+ if (!failExtensions.isEmpty())
+ {
+ if (failExtensions.size() == extensions.size())
+ {
+ qWarning("Failed to import Qt bindings!\n"
+ "Plugins directory searched: %s/script\n"
+ "Make sure that the bindings have been built, "
+ "and that this executable and the plugins are "
+ "using compatible Qt libraries.", qPrintable(qApp->libraryPaths().join(", ")));
+ }
+ else
+ {
+ qWarning("Failed to import some Qt bindings: %s\n"
+ "Plugins directory searched: %s/script\n"
+ "Make sure that the bindings have been built, "
+ "and that this executable and the plugins are "
+ "using compatible Qt libraries.",
+ qPrintable(failExtensions.join(", ")), qPrintable(qApp->libraryPaths().join(", ")));
+ }
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-06-28 22:03:37
|
Revision: 2925
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2925&view=rev
Author: esuvs
Date: 2010-06-28 22:03:31 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Tidying up logging framework.
Modified Paths:
--------------
trunk/QtOgreFramework/QtOgre/include/LogModel.h
trunk/QtOgreFramework/QtOgre/source/Log.cpp
Modified: trunk/QtOgreFramework/QtOgre/include/LogModel.h
===================================================================
--- trunk/QtOgreFramework/QtOgre/include/LogModel.h 2010-06-28 21:48:59 UTC (rev 2924)
+++ trunk/QtOgreFramework/QtOgre/include/LogModel.h 2010-06-28 22:03:31 UTC (rev 2925)
@@ -11,6 +11,7 @@
class LogEntry;
const int LOG_COLUMN_COUNT = 4; //Do we really need this?
+ const int LOG_FILTER_COLUMN = 3; //Do we really need this?
// A simple model that will let us customize display, sorting, and filtering of log messages
class LogModel : public QAbstractTableModel
Modified: trunk/QtOgreFramework/QtOgre/source/Log.cpp
===================================================================
--- trunk/QtOgreFramework/QtOgre/source/Log.cpp 2010-06-28 21:48:59 UTC (rev 2924)
+++ trunk/QtOgreFramework/QtOgre/source/Log.cpp 2010-06-28 22:03:31 UTC (rev 2925)
@@ -40,7 +40,7 @@
//Create a sort/filter proxy of our log entries model so we can sort and filter it :)
mProxyModel->setSourceModel(mLogModel); // the proxy should point to the real model
- mProxyModel->setFilterKeyColumn(3); // the message column (for filtering by regex) TODO: nuke the MAGIC NUMBER!
+ mProxyModel->setFilterKeyColumn(LOG_FILTER_COLUMN); // the message column (for filtering by regex) TODO: nuke the MAGIC NUMBER!
mProxyModel->setDynamicSortFilter(true); // keep filtering updated when data changes
m_pLogTable->setModel(mProxyModel); // the view points to our proxy
m_pLogTable->setSortingEnabled(false); // no need for sorting and it seems to get slow
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-06-28 21:49:06
|
Revision: 2924
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2924&view=rev
Author: esuvs
Date: 2010-06-28 21:48:59 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Tidying up logging framework.
Modified Paths:
--------------
trunk/QtOgreFramework/QtOgre/include/Log.h
trunk/QtOgreFramework/QtOgre/include/LogEntry.h
trunk/QtOgreFramework/QtOgre/include/LogModel.h
trunk/QtOgreFramework/QtOgre/source/Log.cpp
trunk/QtOgreFramework/QtOgre/source/LogEntry.cpp
trunk/QtOgreFramework/QtOgre/source/LogModel.cpp
Modified: trunk/QtOgreFramework/QtOgre/include/Log.h
===================================================================
--- trunk/QtOgreFramework/QtOgre/include/Log.h 2010-06-28 09:27:07 UTC (rev 2923)
+++ trunk/QtOgreFramework/QtOgre/include/Log.h 2010-06-28 21:48:59 UTC (rev 2924)
@@ -48,6 +48,7 @@
//Private methods for writing HTML
void writeHTMLHeader(void);
void writeHTMLTail(void);
+ void writeMessageToHTML(LogEntry entry);
//This is used as a bitfield to determine what message types are enabled
int mVisibleMessageTypes;
@@ -81,7 +82,6 @@
bool m_bSliderPressed;
private slots:
- void writeMessageToHTML(LogEntry *entry);
void computeVisibleMessageTypes(bool ignored);
// Logging is implemented as a slot so that the Qt signal-slot
Modified: trunk/QtOgreFramework/QtOgre/include/LogEntry.h
===================================================================
--- trunk/QtOgreFramework/QtOgre/include/LogEntry.h 2010-06-28 09:27:07 UTC (rev 2923)
+++ trunk/QtOgreFramework/QtOgre/include/LogEntry.h 2010-06-28 21:48:59 UTC (rev 2924)
@@ -9,19 +9,16 @@
namespace QtOgre
{
- // This could probably just be a struct but I'm using QObject as a base so that the model
- // can manage the pointers for us
- class LogEntry : public QObject
+ class LogEntry
{
- Q_OBJECT
public:
- LogEntry(int line, const QString &file, const QString &msg, LogLevel level, QObject *parent = 0);
- LogLevel getLevel();
- QVariant getData(int column);
+ LogEntry(const QString &msg, LogLevel level);
+ LogLevel getLevel(void);
+ const QString& getMessage(void);
+ const QTime& getTimestamp(void);
+
private:
- int mLine;
- QString mFile;
QString mMsg;
QTime mTimestamp;
LogLevel mLevel;
Modified: trunk/QtOgreFramework/QtOgre/include/LogModel.h
===================================================================
--- trunk/QtOgreFramework/QtOgre/include/LogModel.h 2010-06-28 09:27:07 UTC (rev 2923)
+++ trunk/QtOgreFramework/QtOgre/include/LogModel.h 2010-06-28 21:48:59 UTC (rev 2924)
@@ -29,15 +29,10 @@
public slots:
//TODO: make slots for debug, warning, etc...
- void append(int line, const QString &file, const QString &msg, LogLevel level);
-
- signals:
- // slots can't return values, so we'll fire this signal
- // when items are added and let Qt handle dispatching
- void entry_added(LogEntry*);
+ void append(const LogEntry& logEntry);
private:
- QList<LogEntry*> mEntries;
+ QList<LogEntry> mEntries;
Log *mLog;
};
}
Modified: trunk/QtOgreFramework/QtOgre/source/Log.cpp
===================================================================
--- trunk/QtOgreFramework/QtOgre/source/Log.cpp 2010-06-28 09:27:07 UTC (rev 2923)
+++ trunk/QtOgreFramework/QtOgre/source/Log.cpp 2010-06-28 21:48:59 UTC (rev 2924)
@@ -28,7 +28,6 @@
connect(showErrorsButton, SIGNAL(toggled(bool)), this, SLOT(computeVisibleMessageTypes(bool)));
connect(filterLineEdit, SIGNAL(textChanged(const QString&)), mProxyModel, SLOT(setFilterFixedString(const QString&)));
connect(clearFilterButton, SIGNAL(pressed()), filterLineEdit, SLOT(clear()));
- connect(mLogModel, SIGNAL(entry_added(LogEntry*)), this, SLOT(writeMessageToHTML(LogEntry*)));
connect(m_pLogTable->verticalScrollBar(), SIGNAL(sliderPressed(void)), this, SLOT(onSliderPressed(void)));
connect(m_pLogTable->verticalScrollBar(), SIGNAL(sliderReleased(void)), this, SLOT(onSliderReleased(void)));
@@ -146,19 +145,15 @@
void Log::logMessage(const QString& message, LogLevel logLevel)
{
- /*mLogModel->append(0, "file", message, logLevel);
- m_pLogTable->verticalHeader()->resizeSection(mLogModel->rowCount() - 1, 14);
- m_pLogTable->scrollToBottom();
- if(mForceProcessEvents) {
- qApp->processEvents();
- }*/
-
emit _logMessageReceived(message, logLevel);
}
void Log::logMessageImpl(const QString& message, LogLevel logLevel)
{
- mLogModel->append(0, "file", message, logLevel);
+ LogEntry logEntry(message, logLevel);
+ writeMessageToHTML(logEntry);
+
+ mLogModel->append(logEntry);
m_pLogTable->verticalHeader()->resizeSection(mLogModel->rowCount() - 1, 14);
if(!m_bSliderPressed)
{
@@ -199,11 +194,11 @@
<< "<tbody>" << endl;
}
- void Log::writeMessageToHTML(LogEntry *entry)
+ void Log::writeMessageToHTML(LogEntry entry)
{
QString colour;
QString icon;
- switch(entry->getLevel())
+ switch(entry.getLevel())
{
case LL_DEBUG:
colour = "white";
@@ -229,10 +224,10 @@
<< "<img src=\"images/" << icon << "\">"
<< "</td>"
<< "<td style=\"width: 90px;\"><span style=\"color: " << colour << ";\">"
- << entry->getData(0).toTime().toString("hh:mm:ss a") << " - "
+ << entry.getTimestamp().toString("hh:mm:ss a") << " - "
<< "</span></td>"
<< "<td><span style=\"color: " << colour << ";\">"
- << entry->getData(3).toString()
+ << entry.getMessage()
<< "</span></td></tr>" << endl;
}
Modified: trunk/QtOgreFramework/QtOgre/source/LogEntry.cpp
===================================================================
--- trunk/QtOgreFramework/QtOgre/source/LogEntry.cpp 2010-06-28 09:27:07 UTC (rev 2923)
+++ trunk/QtOgreFramework/QtOgre/source/LogEntry.cpp 2010-06-28 21:48:59 UTC (rev 2924)
@@ -2,35 +2,25 @@
namespace QtOgre
{
- LogEntry::LogEntry(int line, const QString &file, const QString &msg, LogLevel level, QObject *parent)
- :QObject(parent)
- ,mLine(line)
- ,mFile(file)
- ,mMsg(msg)
+ LogEntry::LogEntry(const QString &msg, LogLevel level)
+ :mMsg(msg)
,mLevel(level)
,mTimestamp(QTime::currentTime())
{
}
- LogLevel LogEntry::getLevel()
+ LogLevel LogEntry::getLevel(void)
{
return mLevel;
}
- QVariant LogEntry::getData(int column)
+ const QString& LogEntry::getMessage(void)
{
- switch(column)
- {
- case 0:
- return QVariant(mTimestamp);
- case 1:
- return QVariant(mLine);
- case 2:
- return QVariant(mFile);
- case 3:
- return QVariant(mMsg);
- default:
- return QVariant();
- }
+ return mMsg;
}
+
+ const QTime& LogEntry::getTimestamp(void)
+ {
+ return mTimestamp;
+ }
}
\ No newline at end of file
Modified: trunk/QtOgreFramework/QtOgre/source/LogModel.cpp
===================================================================
--- trunk/QtOgreFramework/QtOgre/source/LogModel.cpp 2010-06-28 09:27:07 UTC (rev 2923)
+++ trunk/QtOgreFramework/QtOgre/source/LogModel.cpp 2010-06-28 21:48:59 UTC (rev 2924)
@@ -7,7 +7,7 @@
{
LogModel::LogModel(Log *log, QObject *parent)
:QAbstractTableModel(parent)
- ,mEntries(QList<LogEntry*>())
+ ,mEntries(QList<LogEntry>())
,mLog(log)
{
}
@@ -25,7 +25,7 @@
}
// valid index, so go fetch the entry object
- LogEntry *entry = mEntries.at(index.row());
+ LogEntry entry = mEntries.at(index.row());
switch (role)
{
case Qt::DecorationRole: // called to show icons
@@ -33,20 +33,27 @@
if (index.column() == 0)
{
// re-use the same QIcons that the Log owner created
- return mLog->getIcon(entry->getLevel());
+ return mLog->getIcon(entry.getLevel());
}
else
{
return QVariant();
}
case Qt::DisplayRole:
- return entry->getData(index.column());
+ if(index.column() == 0)
+ {
+ return QVariant(entry.getTimestamp());
+ }
+ else if(index.column() == 3)
+ {
+ return QVariant(entry.getMessage());
+ }
case Qt::ForegroundRole:
- return mLog->getForegroundColour(entry->getLevel());
+ return mLog->getForegroundColour(entry.getLevel());
case Qt::UserRole:
- return entry->getLevel();
+ return entry.getLevel();
case Qt::ToolTipRole:
- return entry->getData(3);
+ return QVariant(entry.getMessage());
default: //some other role we don't really care about
return QVariant();
}
@@ -84,17 +91,14 @@
}
}
- void LogModel::append(int line, const QString &file, const QString &msg, LogLevel level)
+ void LogModel::append(const LogEntry& logEntry)
{
//TODO: we could buffer appends up and only emit the change signals every
//Nth entry or every few secondsthis would probably be more efficient
+ mEntries.append(logEntry);
- LogEntry *entry = new LogEntry(line, file, msg, level, this);
- mEntries.append(entry);
-
// if we don't emit these signals, the view never knows to update
emit layoutAboutToBeChanged();
emit layoutChanged(); // causes a redraw
- emit entry_added(entry);
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-06-28 09:27:13
|
Revision: 2923
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2923&view=rev
Author: kardoon
Date: 2010-06-28 09:27:07 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Set the plugin folder in a slightly cleverer way.
Modified Paths:
--------------
trunk/QtOgreFramework/EngineTest/CMakeLists.txt
trunk/QtOgreFramework/EngineTest/plugins.cfg.in
trunk/QtOgreFramework/EngineTest/plugins_d.cfg.in
Modified: trunk/QtOgreFramework/EngineTest/CMakeLists.txt
===================================================================
--- trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-06-27 18:35:29 UTC (rev 2922)
+++ trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-06-28 09:27:07 UTC (rev 2923)
@@ -57,6 +57,13 @@
ADD_CUSTOM_TARGET(copyenginetestmedia ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/media ${CMAKE_CURRENT_BINARY_DIR}/media COMMENT "Copying media files to build directory" VERBATIM)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/settings.ini ${CMAKE_CURRENT_BINARY_DIR}/settings.ini COPYONLY)
+IF(WIN32)
+ SET(OGRE_RELEASE_PLUGIN_FOLDER ${OGRESDK}/bin/release)
+ SET(OGRE_DEBUG_PLUGIN_FOLDER ${OGRESDK}/bin/debug)
+ELSE()
+ SET(OGRE_RELEASE_PLUGIN_FOLDER ${OGRE_LIBRARY_DIRS}/OGRE)
+ SET(OGRE_DEBUG_PLUGIN_FOLDER ${OGRE_LIBRARY_DIRS}/OGRE)
+ENDIF()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/plugins.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/plugins.cfg)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/plugins_d.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/plugins_d.cfg)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/resources.cfg ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg COPYONLY)
Modified: trunk/QtOgreFramework/EngineTest/plugins.cfg.in
===================================================================
--- trunk/QtOgreFramework/EngineTest/plugins.cfg.in 2010-06-27 18:35:29 UTC (rev 2922)
+++ trunk/QtOgreFramework/EngineTest/plugins.cfg.in 2010-06-28 09:27:07 UTC (rev 2923)
@@ -1,7 +1,7 @@
# Defines plugins to load
# Define plugin folder
-PluginFolder=${OGRESDK}/bin/release
+PluginFolder=${OGRE_RELEASE_PLUGIN_FOLDER}
# Define plugins
Plugin=RenderSystem_GL
Modified: trunk/QtOgreFramework/EngineTest/plugins_d.cfg.in
===================================================================
--- trunk/QtOgreFramework/EngineTest/plugins_d.cfg.in 2010-06-27 18:35:29 UTC (rev 2922)
+++ trunk/QtOgreFramework/EngineTest/plugins_d.cfg.in 2010-06-28 09:27:07 UTC (rev 2923)
@@ -1,7 +1,7 @@
# Defines plugins to load
# Define plugin folder
-PluginFolder=${OGRESDK}/bin/debug
+PluginFolder=${OGRE_DEBUG_PLUGIN_FOLDER}
# Define plugins
Plugin=RenderSystem_GL_d
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-06-27 18:35:36
|
Revision: 2922
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2922&view=rev
Author: esuvs
Date: 2010-06-27 18:35:29 +0000 (Sun, 27 Jun 2010)
Log Message:
-----------
Log viewer improvements.
Modified Paths:
--------------
trunk/QtOgreFramework/QtOgre/include/Log.h
trunk/QtOgreFramework/QtOgre/source/Log.cpp
trunk/QtOgreFramework/QtOgre/ui/Log.ui
Added Paths:
-----------
trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
Removed Paths:
-------------
trunk/QtOgreFramework/EngineTest/source/DemoGameLogic.cpp
Deleted: trunk/QtOgreFramework/EngineTest/source/DemoGameLogic.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/DemoGameLogic.cpp 2010-06-27 11:03:23 UTC (rev 2921)
+++ trunk/QtOgreFramework/EngineTest/source/DemoGameLogic.cpp 2010-06-27 18:35:29 UTC (rev 2922)
@@ -1,315 +0,0 @@
-#include "DemoGameLogic.h"
-
-#include "DotSceneHandler.h"
-#include "MainMenu.h"
-#include "Scripting/OgreRadianClass.h"
-#include "Scripting/OgreVector3Class.h"
-
-#include "LogManager.h"
-#include "OgreWidget.h"
-#include "StyleSettingsWidget.h"
-
-#include <OgreEntity.h>
-#include <OgreRenderWindow.h>
-#include <OgreResourceGroupManager.h>
-#include <OgreRoot.h>
-
-#include <QKeyEvent>
-#include <QMouseEvent>
-#include <QSettings>
-
-#include <QMetaObject>
-
-using namespace QtOgre;
-
- QScriptValue toScriptValueQPoint(QScriptEngine *engine, const QPoint &s)
- {
- QScriptValue obj = engine->newObject();
- obj.setProperty("x", s.x());
- obj.setProperty("y", s.y());
- return obj;
- }
-
- void fromScriptValueQPoint(const QScriptValue &obj, QPoint &s)
- {
- s.setX(obj.property("x").toInt32());
- s.setY(obj.property("y").toInt32());
- }
-
- struct QtMetaObject : private QObject
- {
- public:
- static const QMetaObject *get()
- { return &static_cast<QtMetaObject*>(0)->staticQtMetaObject; }
- };
-
- DemoGameLogic::DemoGameLogic(void)
- :GameLogic()
- {
- }
-
- void DemoGameLogic::initialise(void)
- {
- scriptEngine = new QScriptEngine;
-
- scriptEngine->importExtension("qt.core");
- scriptEngine->importExtension("qt.gui");
-
-
- QScriptValue keyboardScriptValue = scriptEngine->newQObject(&keyboard);
- scriptEngine->globalObject().setProperty("keyboard", keyboardScriptValue);
-
- QScriptValue mouseScriptValue = scriptEngine->newQObject(&mouse);
- scriptEngine->globalObject().setProperty("mouse", mouseScriptValue);
-
- QScriptValue cameraScriptValue = scriptEngine->newQObject(&cameraWrapper);
- scriptEngine->globalObject().setProperty("camera", cameraScriptValue);
-
- QScriptValue Qt = scriptEngine->newQMetaObject(QtMetaObject::get());
- Qt.setProperty("App", scriptEngine->newQObject(qApp));
- scriptEngine->globalObject().setProperty("Qt", Qt);
-
- qScriptRegisterMetaType(scriptEngine, toScriptValueQPoint, fromScriptValueQPoint);
-
- OgreVector3Class *vecClass = new OgreVector3Class(scriptEngine);
- scriptEngine->globalObject().setProperty("OgreVector3", vecClass->constructor());
-
- OgreRadianClass *radianClass = new OgreRadianClass(scriptEngine);
- scriptEngine->globalObject().setProperty("OgreRadian", radianClass->constructor());
-
- updateScript =
- "vec = new OgreVector3;"
- "vec.x = 0.0;"
- "vec.y = 0.0;"
- "vec.z = 0.0;"
- "if(keyboard.isPressed(Qt.Key_W))"
- "{"
- " vec.z = -1.0;"
- "}"
- "if(keyboard.isPressed(Qt.Key_S))"
- "{"
- " vec.z = 1.0;"
- "}"
- "if(keyboard.isPressed(Qt.Key_A))"
- "{"
- " vec.x = -1.0;"
- "}"
- "if(keyboard.isPressed(Qt.Key_D))"
- "{"
- " vec.x = 1.0;"
- "}"
- "camera.moveRelative(vec);"
- "if(mouse.isPressed(Qt.RightButton))"
- "{"
- " mouseDelta = mouse.computeDelta();"
- " camera.yaw(new OgreRadian(-mouseDelta.x * 0.01));"
- "}"
- "if(mouse.isPressed(Qt.RightButton))"
- "{"
- " mouseDelta = mouse.computeDelta();"
- " camera.pitch(new OgreRadian(-mouseDelta.y * 0.01));"
- "}"
- "wheelDelta = mouse.getWheelDelta();"
- "print('wheelDelta = ', wheelDelta);"
- "fov = camera.getFOVy();"
- "print('old fov = ', fov.valueRadians);"
- "tempFOV = new OgreRadian(-wheelDelta * 0.001);"
- "fov.valueRadians = fov.valueRadians + tempFOV.valueRadians;"
- "print('new fov = ', fov.valueRadians);"
- "camera.setFOVy(fov);"
- ;
-
- //debugger.attachTo(scriptEngine);
- //debugger.action(QScriptEngineDebugger::InterruptAction)->trigger();
-
-
-
-
- //qApp->setStyleSheet(qApp->settings()->value("UI/StyleFile").toString());
-
- mDemoLog = mApplication->createLog("Demo");
-
- mApplication->showLogManager();
-
- mDemoLog->logMessage("A demonstration debug message", LL_DEBUG);
- mDemoLog->logMessage("A demonstration info message", LL_INFO);
- mDemoLog->logMessage("A demonstration warning message", LL_WARNING);
- mDemoLog->logMessage("A demonstration error message", LL_ERROR);
-
- //Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
-
- // Create the generic scene manager
- mSceneManager = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC, "GenericSceneManager");
-
- //Set up scene
- loadScene("media/scenes/test.scene");
-
- //mApplication->ogreRenderWindow()->addViewport(mCamera)->setBackgroundColour(Ogre::ColourValue::Black);
-
- mSceneManager->setAmbientLight( Ogre::ColourValue( 1, 1, 1 ) );
-
- //Create the MainMenu
- mMainMenu = new MainMenu(qApp, qApp->mainWidget());
-
- //Create widget to choose between models
- //mChooseMeshWidget = new ChooseMeshWidget(mJaiquaEntity, mRobotEntity, qApp->mainWidget());
- //mChooseMeshWidget->setWindowOpacity(qApp->settings()->value("System/DefaultWindowOpacity", 1.0).toDouble());
- //mChooseMeshWidget->move(qApp->mainWidget()->geometry().left() + qApp->mainWidget()->geometry().width() - mChooseMeshWidget->frameGeometry().width() - 10, qApp->mainWidget()->geometry().top() + 10);
- //mChooseMeshWidget->show();
-
- mTime = new QTime;
- mTime->start();
-
- mIsFirstFrame = true;
-
- mCameraSpeed = 10.0;
-
-
-
- for (Ogre::SceneManager::MovableObjectIterator moi = mSceneManager->getMovableObjectIterator("Entity"); moi.hasMoreElements(); moi.moveNext())
- {
- Ogre::Entity *entity = static_cast<Ogre::Entity*>(moi.peekNextValue());
-
- Ogre::AnimationStateSet* animationStateSet = entity->getAllAnimationStates();
- if(animationStateSet && animationStateSet->hasAnimationState("Walk"))
- {
- Ogre::AnimationState* walkAnimationState = animationStateSet->getAnimationState("Walk");
- walkAnimationState->setLoop(true);
- walkAnimationState->setEnabled(true);
- }
- }
-
- mApplication->showFPSCounter();
-
- mStyleSettingsWidget = new StyleSettingsWidget;
- mApplication->addSettingsWidget("Style", mStyleSettingsWidget);
-
- /*cameraPositionScriptValue = scriptEngine->toScriptValue(mCamera->getPosition());
- cameraDirectionScriptValue = scriptEngine->toScriptValue(mCamera->getDirection());
- cameraRightScriptValue = scriptEngine->toScriptValue(mCamera->getRight());
-
- scriptEngine->globalObject().setProperty("cameraPosition", cameraPositionScriptValue);
- scriptEngine->globalObject().setProperty("cameraDirection", cameraDirectionScriptValue);
- scriptEngine->globalObject().setProperty("cameraRight", cameraRightScriptValue);*/
- }
-
- void DemoGameLogic::update(void)
- {
- mLastFrameTime = mCurrentTime;
- mCurrentTime = mTime->elapsed();
-
- float timeElapsedInSeconds = (mCurrentTime - mLastFrameTime) / 1000.0f;
-
- for (Ogre::SceneManager::MovableObjectIterator moi = mSceneManager->getMovableObjectIterator("Entity"); moi.hasMoreElements(); moi.moveNext())
- {
- Ogre::Entity *entity = static_cast<Ogre::Entity*>(moi.peekNextValue());
-
- Ogre::AnimationStateSet* animationStateSet = entity->getAllAnimationStates();
- if(animationStateSet && animationStateSet->hasAnimationState("Walk"))
- {
- Ogre::AnimationState* walkAnimationState = animationStateSet->getAnimationState("Walk");
- walkAnimationState->addTime(timeElapsedInSeconds);
- }
- }
-
- float distance = mCameraSpeed * timeElapsedInSeconds;
-
- mIsFirstFrame = false;
-
- QScriptValue result = scriptEngine->evaluate(updateScript);
- if (scriptEngine->hasUncaughtException())
- {
- int line = scriptEngine->uncaughtExceptionLineNumber();
- qCritical() << "uncaught exception at line" << line << ":" << result.toString();
- }
-
- mouse.resetDelta();
- mouse.resetWheelDelta();
- }
-
- void DemoGameLogic::shutdown(void)
- {
- mSceneManager->clearScene();
- Ogre::Root::getSingleton().destroySceneManager(mSceneManager);
- }
-
- void DemoGameLogic::onKeyPress(QKeyEvent* event)
- {
- keyboard.press(event->key());
-
- if(event->key() == Qt::Key_Escape)
- {
- //qApp->centerWidget(mMainMenu, qApp->mMainWindow);
- mMainMenu->exec();
- }
- }
-
- void DemoGameLogic::onKeyRelease(QKeyEvent* event)
- {
- keyboard.release(event->key());
- }
-
- void DemoGameLogic::onMousePress(QMouseEvent* event)
- {
- mouse.press(event->button());
-
- //Update the mouse position as well or we get 'jumps'
- mouse.setPos(event->pos());
- mouse.resetDelta();
- }
-
- void DemoGameLogic::onMouseRelease(QMouseEvent* event)
- {
- mouse.release(event->button());
- }
-
- void DemoGameLogic::onMouseMove(QMouseEvent* event)
- {
- //mCurrentMousePos = event->pos();
- mouse.setPos(event->pos());
- }
-
- void DemoGameLogic::onWheel(QWheelEvent* event)
- {
- //mCurrentWheelPos += event->delta();
- mouse.modifyWheelDelta(event->delta());
- }
-
- Log* DemoGameLogic::demoLog(void)
- {
- return mDemoLog;
- }
-
- void DemoGameLogic::loadScene(QString filename)
- {
- //The QtOgre DotScene loading code will clear the existing scene except for cameras, as these
- //could be used by existing viewports. Therefore we clear and viewports and cameras before
- //calling the loading code.
- mApplication->ogreRenderWindow()->removeAllViewports();
- mSceneManager->destroyAllCameras();
-
- //Now load the scene.
- DotSceneHandler handler(mSceneManager);
- QXmlSimpleReader reader;
- reader.setContentHandler(&handler);
- reader.setErrorHandler(&handler);
-
- QFile file(filename);
- file.open(QFile::ReadOnly | QFile::Text);
- QXmlInputSource xmlInputSource(&file);
- reader.parse(xmlInputSource);
-
- //Now create a viewport, using the first camera in the scene.
- mCamera = mSceneManager->getCameraIterator().peekNextValue();
-
- //mCamera->setPosition(0, 0, 20);
- //mCamera->lookAt(0, 0, 0);
- mCamera->setNearClipDistance(1.0);
- mCamera->setFarClipDistance(1000.0);
- //mCamera->setFOVy(Ogre::Radian(1.0f));
-
- Ogre::Viewport* viewport = mApplication->ogreRenderWindow()->addViewport(mCamera);
- viewport->setBackgroundColour(Ogre::ColourValue::Black);
-
- cameraWrapper.setOgreCamera(mCamera);
- }
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp (rev 0)
+++ trunk/QtOgreFramework/EngineTest/source/EngineTestGameLogic.cpp 2010-06-27 18:35:29 UTC (rev 2922)
@@ -0,0 +1,337 @@
+#include "EngineTestGameLogic.h"
+
+#include "DotSceneHandler.h"
+#include "MainMenu.h"
+#include "Scripting/OgreRadianClass.h"
+#include "Scripting/OgreVector3Class.h"
+
+#include "LogManager.h"
+#include "OgreWidget.h"
+#include "StyleSettingsWidget.h"
+
+#include <OgreEntity.h>
+#include <OgreRenderWindow.h>
+#include <OgreResourceGroupManager.h>
+#include <OgreRoot.h>
+
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QSettings>
+
+#include <QMetaObject>
+
+using namespace QtOgre;
+
+ QScriptValue toScriptValueQPoint(QScriptEngine *engine, const QPoint &s)
+ {
+ QScriptValue obj = engine->newObject();
+ obj.setProperty("x", s.x());
+ obj.setProperty("y", s.y());
+ return obj;
+ }
+
+ void fromScriptValueQPoint(const QScriptValue &obj, QPoint &s)
+ {
+ s.setX(obj.property("x").toInt32());
+ s.setY(obj.property("y").toInt32());
+ }
+
+ struct QtMetaObject : private QObject
+ {
+ public:
+ static const QMetaObject *get()
+ { return &static_cast<QtMetaObject*>(0)->staticQtMetaObject; }
+ };
+
+ EngineTestGameLogic::EngineTestGameLogic(void)
+ :GameLogic()
+ {
+ }
+
+ void EngineTestGameLogic::initialise(void)
+ {
+ scriptEngine = new QScriptEngine;
+
+ QDir dir("C:\\qt\\qt-labs-qtscriptgenerator\\plugins");
+ QStringList paths = qApp->libraryPaths();
+ paths << dir.absolutePath();
+ qApp->setLibraryPaths(paths);
+
+ QString temp;
+ foreach(temp, paths)
+ {
+ qCritical() << temp;
+ }
+
+ QScriptValue retCore = scriptEngine->importExtension("qt.core");
+ QScriptValue retGui = scriptEngine->importExtension("qt.gui");
+ if(retCore.isError())
+ {
+ qCritical() << "Failed to load core plugin";
+ }
+ if(retGui.isError())
+ {
+ qCritical() << "Failed to load gui plugin";
+ }
+
+
+ QScriptValue keyboardScriptValue = scriptEngine->newQObject(&keyboard);
+ scriptEngine->globalObject().setProperty("keyboard", keyboardScriptValue);
+
+ QScriptValue mouseScriptValue = scriptEngine->newQObject(&mouse);
+ scriptEngine->globalObject().setProperty("mouse", mouseScriptValue);
+
+ QScriptValue cameraScriptValue = scriptEngine->newQObject(&cameraWrapper);
+ scriptEngine->globalObject().setProperty("camera", cameraScriptValue);
+
+ QScriptValue Qt = scriptEngine->newQMetaObject(QtMetaObject::get());
+ Qt.setProperty("App", scriptEngine->newQObject(qApp));
+ scriptEngine->globalObject().setProperty("Qt", Qt);
+
+ qScriptRegisterMetaType(scriptEngine, toScriptValueQPoint, fromScriptValueQPoint);
+
+ OgreVector3Class *vecClass = new OgreVector3Class(scriptEngine);
+ scriptEngine->globalObject().setProperty("OgreVector3", vecClass->constructor());
+
+ OgreRadianClass *radianClass = new OgreRadianClass(scriptEngine);
+ scriptEngine->globalObject().setProperty("OgreRadian", radianClass->constructor());
+
+ updateScript =
+ "vec = new OgreVector3;"
+ "vec.x = 0.0;"
+ "vec.y = 0.0;"
+ "vec.z = 0.0;"
+ "var vector = new QVector3D();"
+ "vector.setX(-1.0);"
+ "print('vector = ', vector);"
+ "if(keyboard.isPressed(Qt.Key_W))"
+ "{"
+ " vec.z = vector.x();"
+ "}"
+ "if(keyboard.isPressed(Qt.Key_S))"
+ "{"
+ " vec.z = 1.0;"
+ "}"
+ "if(keyboard.isPressed(Qt.Key_A))"
+ "{"
+ " vec.x = -1.0;"
+ "}"
+ "if(keyboard.isPressed(Qt.Key_D))"
+ "{"
+ " vec.x = 1.0;"
+ "}"
+ "camera.moveRelative(vec);"
+ "if(mouse.isPressed(Qt.RightButton))"
+ "{"
+ " mouseDelta = mouse.computeDelta();"
+ " camera.yaw(new OgreRadian(-mouseDelta.x * 0.01));"
+ "}"
+ "if(mouse.isPressed(Qt.RightButton))"
+ "{"
+ " mouseDelta = mouse.computeDelta();"
+ " camera.pitch(new OgreRadian(-mouseDelta.y * 0.01));"
+ "}"
+ "wheelDelta = mouse.getWheelDelta();"
+ "print('wheelDelta = ', wheelDelta);"
+ "fov = camera.getFOVy();"
+ "print('old fov = ', fov.valueRadians);"
+ "tempFOV = new OgreRadian(-wheelDelta * 0.001);"
+ "fov.valueRadians = fov.valueRadians + tempFOV.valueRadians;"
+ "print('new fov = ', fov.valueRadians);"
+ "camera.setFOVy(fov);"
+ ;
+
+ //debugger.attachTo(scriptEngine);
+ //debugger.action(QScriptEngineDebugger::InterruptAction)->trigger();
+
+
+
+
+ //qApp->setStyleSheet(qApp->settings()->value("UI/StyleFile").toString());
+
+ mDemoLog = mApplication->createLog("EngineTest");
+
+ mApplication->showLogManager();
+
+ mDemoLog->logMessage("A demonstration debug message", LL_DEBUG);
+ mDemoLog->logMessage("A demonstration info message", LL_INFO);
+ mDemoLog->logMessage("A demonstration warning message", LL_WARNING);
+ mDemoLog->logMessage("A demonstration error message", LL_ERROR);
+
+ //Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+
+ // Create the generic scene manager
+ mSceneManager = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC, "GenericSceneManager");
+
+ //Set up scene
+ loadScene("media/scenes/test.scene");
+
+ //mApplication->ogreRenderWindow()->addViewport(mCamera)->setBackgroundColour(Ogre::ColourValue::Black);
+
+ mSceneManager->setAmbientLight( Ogre::ColourValue( 1, 1, 1 ) );
+
+ //Create the MainMenu
+ mMainMenu = new MainMenu(qApp, qApp->mainWidget());
+
+ //Create widget to choose between models
+ //mChooseMeshWidget = new ChooseMeshWidget(mJaiquaEntity, mRobotEntity, qApp->mainWidget());
+ //mChooseMeshWidget->setWindowOpacity(qApp->settings()->value("System/DefaultWindowOpacity", 1.0).toDouble());
+ //mChooseMeshWidget->move(qApp->mainWidget()->geometry().left() + qApp->mainWidget()->geometry().width() - mChooseMeshWidget->frameGeometry().width() - 10, qApp->mainWidget()->geometry().top() + 10);
+ //mChooseMeshWidget->show();
+
+ mTime = new QTime;
+ mTime->start();
+
+ mIsFirstFrame = true;
+
+ mCameraSpeed = 10.0;
+
+
+
+ for (Ogre::SceneManager::MovableObjectIterator moi = mSceneManager->getMovableObjectIterator("Entity"); moi.hasMoreElements(); moi.moveNext())
+ {
+ Ogre::Entity *entity = static_cast<Ogre::Entity*>(moi.peekNextValue());
+
+ Ogre::AnimationStateSet* animationStateSet = entity->getAllAnimationStates();
+ if(animationStateSet && animationStateSet->hasAnimationState("Walk"))
+ {
+ Ogre::AnimationState* walkAnimationState = animationStateSet->getAnimationState("Walk");
+ walkAnimationState->setLoop(true);
+ walkAnimationState->setEnabled(true);
+ }
+ }
+
+ mApplication->showFPSCounter();
+
+ mStyleSettingsWidget = new StyleSettingsWidget;
+ mApplication->addSettingsWidget("Style", mStyleSettingsWidget);
+
+ /*cameraPositionScriptValue = scriptEngine->toScriptValue(mCamera->getPosition());
+ cameraDirectionScriptValue = scriptEngine->toScriptValue(mCamera->getDirection());
+ cameraRightScriptValue = scriptEngine->toScriptValue(mCamera->getRight());
+
+ scriptEngine->globalObject().setProperty("cameraPosition", cameraPositionScriptValue);
+ scriptEngine->globalObject().setProperty("cameraDirection", cameraDirectionScriptValue);
+ scriptEngine->globalObject().setProperty("cameraRight", cameraRightScriptValue);*/
+ }
+
+ void EngineTestGameLogic::update(void)
+ {
+ mLastFrameTime = mCurrentTime;
+ mCurrentTime = mTime->elapsed();
+
+ float timeElapsedInSeconds = (mCurrentTime - mLastFrameTime) / 1000.0f;
+
+ for (Ogre::SceneManager::MovableObjectIterator moi = mSceneManager->getMovableObjectIterator("Entity"); moi.hasMoreElements(); moi.moveNext())
+ {
+ Ogre::Entity *entity = static_cast<Ogre::Entity*>(moi.peekNextValue());
+
+ Ogre::AnimationStateSet* animationStateSet = entity->getAllAnimationStates();
+ if(animationStateSet && animationStateSet->hasAnimationState("Walk"))
+ {
+ Ogre::AnimationState* walkAnimationState = animationStateSet->getAnimationState("Walk");
+ walkAnimationState->addTime(timeElapsedInSeconds);
+ }
+ }
+
+ float distance = mCameraSpeed * timeElapsedInSeconds;
+
+ mIsFirstFrame = false;
+
+ QScriptValue result = scriptEngine->evaluate(updateScript);
+ if (scriptEngine->hasUncaughtException())
+ {
+ int line = scriptEngine->uncaughtExceptionLineNumber();
+ qCritical() << "uncaught exception at line" << line << ":" << result.toString();
+ }
+
+ mouse.resetDelta();
+ mouse.resetWheelDelta();
+ }
+
+ void EngineTestGameLogic::shutdown(void)
+ {
+ mSceneManager->clearScene();
+ Ogre::Root::getSingleton().destroySceneManager(mSceneManager);
+ }
+
+ void EngineTestGameLogic::onKeyPress(QKeyEvent* event)
+ {
+ keyboard.press(event->key());
+
+ if(event->key() == Qt::Key_Escape)
+ {
+ //qApp->centerWidget(mMainMenu, qApp->mMainWindow);
+ mMainMenu->exec();
+ }
+ }
+
+ void EngineTestGameLogic::onKeyRelease(QKeyEvent* event)
+ {
+ keyboard.release(event->key());
+ }
+
+ void EngineTestGameLogic::onMousePress(QMouseEvent* event)
+ {
+ mouse.press(event->button());
+
+ //Update the mouse position as well or we get 'jumps'
+ mouse.setPos(event->pos());
+ mouse.resetDelta();
+ }
+
+ void EngineTestGameLogic::onMouseRelease(QMouseEvent* event)
+ {
+ mouse.release(event->button());
+ }
+
+ void EngineTestGameLogic::onMouseMove(QMouseEvent* event)
+ {
+ //mCurrentMousePos = event->pos();
+ mouse.setPos(event->pos());
+ }
+
+ void EngineTestGameLogic::onWheel(QWheelEvent* event)
+ {
+ //mCurrentWheelPos += event->delta();
+ mouse.modifyWheelDelta(event->delta());
+ }
+
+ Log* EngineTestGameLogic::demoLog(void)
+ {
+ return mDemoLog;
+ }
+
+ void EngineTestGameLogic::loadScene(QString filename)
+ {
+ //The QtOgre DotScene loading code will clear the existing scene except for cameras, as these
+ //could be used by existing viewports. Therefore we clear and viewports and cameras before
+ //calling the loading code.
+ mApplication->ogreRenderWindow()->removeAllViewports();
+ mSceneManager->destroyAllCameras();
+
+ //Now load the scene.
+ DotSceneHandler handler(mSceneManager);
+ QXmlSimpleReader reader;
+ reader.setContentHandler(&handler);
+ reader.setErrorHandler(&handler);
+
+ QFile file(filename);
+ file.open(QFile::ReadOnly | QFile::Text);
+ QXmlInputSource xmlInputSource(&file);
+ reader.parse(xmlInputSource);
+
+ //Now create a viewport, using the first camera in the scene.
+ mCamera = mSceneManager->getCameraIterator().peekNextValue();
+
+ //mCamera->setPosition(0, 0, 20);
+ //mCamera->lookAt(0, 0, 0);
+ mCamera->setNearClipDistance(1.0);
+ mCamera->setFarClipDistance(1000.0);
+ //mCamera->setFOVy(Ogre::Radian(1.0f));
+
+ Ogre::Viewport* viewport = mApplication->ogreRenderWindow()->addViewport(mCamera);
+ viewport->setBackgroundColour(Ogre::ColourValue::Black);
+
+ cameraWrapper.setOgreCamera(mCamera);
+ }
\ No newline at end of file
Modified: trunk/QtOgreFramework/QtOgre/include/Log.h
===================================================================
--- trunk/QtOgreFramework/QtOgre/include/Log.h 2010-06-27 11:03:23 UTC (rev 2921)
+++ trunk/QtOgreFramework/QtOgre/include/Log.h 2010-06-27 18:35:29 UTC (rev 2922)
@@ -76,6 +76,9 @@
//New Models
LogModel* mLogModel; //holds all log data
LogModelSortFilterProxy *mProxyModel; //proxy for sorting/filtering the mLogModel
+
+ //Used to disable autoscrolling when user grabs scrollbar
+ bool m_bSliderPressed;
private slots:
void writeMessageToHTML(LogEntry *entry);
@@ -84,6 +87,9 @@
// Logging is implemented as a slot so that the Qt signal-slot
// mechanism can ensure it is always called on the main thread.
void logMessageImpl(const QString& message, LogLevel logLevel);
+
+ void onSliderPressed(void);
+ void onSliderReleased(void);
};
}
Modified: trunk/QtOgreFramework/QtOgre/source/Log.cpp
===================================================================
--- trunk/QtOgreFramework/QtOgre/source/Log.cpp 2010-06-27 11:03:23 UTC (rev 2921)
+++ trunk/QtOgreFramework/QtOgre/source/Log.cpp 2010-06-27 18:35:29 UTC (rev 2922)
@@ -6,6 +6,7 @@
#include <QHeaderView>
#include <QTime>
#include <QFile>
+#include <QScrollBar>
#include <QSortFilterProxyModel>
namespace QtOgre
@@ -16,6 +17,7 @@
,mName(name)
,mLogModel(new LogModel(this, this))
,mProxyModel(new LogModelSortFilterProxy(this))
+ ,m_bSliderPressed(false)
{
setupUi(this);
@@ -28,6 +30,9 @@
connect(clearFilterButton, SIGNAL(pressed()), filterLineEdit, SLOT(clear()));
connect(mLogModel, SIGNAL(entry_added(LogEntry*)), this, SLOT(writeMessageToHTML(LogEntry*)));
+ connect(m_pLogTable->verticalScrollBar(), SIGNAL(sliderPressed(void)), this, SLOT(onSliderPressed(void)));
+ connect(m_pLogTable->verticalScrollBar(), SIGNAL(sliderReleased(void)), this, SLOT(onSliderReleased(void)));
+
// We need to make sure that log messages are only written from the main thread. In order to do this we make use of the Qt signal slot mechanism.
// The log message function simply emits a signal, an Qt will ensure that this is delivered to the main thread in a safe manner. There may be better
// or faster ways of achiving this behaviour but it seems to work for now.
@@ -37,28 +42,28 @@
//Create a sort/filter proxy of our log entries model so we can sort and filter it :)
mProxyModel->setSourceModel(mLogModel); // the proxy should point to the real model
mProxyModel->setFilterKeyColumn(3); // the message column (for filtering by regex) TODO: nuke the MAGIC NUMBER!
- mProxyModel->setDynamicSortFilter(true); // keep sort order updated when data changes
- logTable->setModel(mProxyModel); // the view points to our proxy
- logTable->setSortingEnabled(true); // let the view use the sorting of the proxy
+ mProxyModel->setDynamicSortFilter(true); // keep filtering updated when data changes
+ m_pLogTable->setModel(mProxyModel); // the view points to our proxy
+ m_pLogTable->setSortingEnabled(false); // no need for sorting and it seems to get slow
//Using this approach of resizing to contents seems to have
//noticeable performance penalties when adding rows to the log.
- //logTable->horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents);
- //logTable->horizontalHeader()->setResizeMode(1, QHeaderView::ResizeToContents);
- //logTable->horizontalHeader()->setResizeMode(2, QHeaderView::ResizeToContents);
- //logTable->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+ //m_pLogTable->horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents);
+ //m_pLogTable->horizontalHeader()->setResizeMode(1, QHeaderView::ResizeToContents);
+ //m_pLogTable->horizontalHeader()->setResizeMode(2, QHeaderView::ResizeToContents);
+ //m_pLogTable->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
//So instead we hard code the sizes
- logTable->horizontalHeader()->setResizeMode(0, QHeaderView::Fixed);
- logTable->horizontalHeader()->resizeSection(0, 100);
- logTable->horizontalHeader()->setResizeMode(1, QHeaderView::Fixed);
- logTable->horizontalHeader()->resizeSection(1, 30);
- logTable->horizontalHeader()->resizeSection(2, 120);
- logTable->horizontalHeader()->resizeSection(3, 800);
+ m_pLogTable->horizontalHeader()->setResizeMode(0, QHeaderView::Fixed);
+ m_pLogTable->horizontalHeader()->resizeSection(0, 100);
+ m_pLogTable->horizontalHeader()->setResizeMode(1, QHeaderView::Fixed);
+ m_pLogTable->horizontalHeader()->resizeSection(1, 30);
+ m_pLogTable->horizontalHeader()->resizeSection(2, 120);
+ m_pLogTable->horizontalHeader()->resizeSection(3, 800);
- logTable->verticalHeader()->hide();
- //logTable->verticalHeader()->setResizeMode(QHeaderView::Fixed);
- //logTable->verticalHeader()->resizeSections(20);
+ m_pLogTable->verticalHeader()->hide();
+ //m_pLogTable->verticalHeader()->setResizeMode(QHeaderView::Fixed);
+ //m_pLogTable->verticalHeader()->resizeSections(20);
//We use .png images here, rather than .svg. They are frequently being created on-the-fly
@@ -78,10 +83,10 @@
errorColor.setRgb(255,64,64);
//Set the widgets background to the colour we chose above.
- QPalette palette = logTable->palette();
+ QPalette palette = m_pLogTable->palette();
palette.setColor(QPalette::Active, QPalette::Base, bgColor);
palette.setColor(QPalette::Inactive, QPalette::Base, bgColor);
- logTable->setPalette(palette);
+ m_pLogTable->setPalette(palette);
//Initial set up of which log levels are displayed
computeVisibleMessageTypes(true);
@@ -142,8 +147,8 @@
void Log::logMessage(const QString& message, LogLevel logLevel)
{
/*mLogModel->append(0, "file", message, logLevel);
- logTable->verticalHeader()->resizeSection(mLogModel->rowCount() - 1, 14);
- logTable->scrollToBottom();
+ m_pLogTable->verticalHeader()->resizeSection(mLogModel->rowCount() - 1, 14);
+ m_pLogTable->scrollToBottom();
if(mForceProcessEvents) {
qApp->processEvents();
}*/
@@ -154,9 +159,13 @@
void Log::logMessageImpl(const QString& message, LogLevel logLevel)
{
mLogModel->append(0, "file", message, logLevel);
- logTable->verticalHeader()->resizeSection(mLogModel->rowCount() - 1, 14);
- logTable->scrollToBottom();
- if(mForceProcessEvents) {
+ m_pLogTable->verticalHeader()->resizeSection(mLogModel->rowCount() - 1, 14);
+ if(!m_bSliderPressed)
+ {
+ m_pLogTable->scrollToBottom();
+ }
+ if(mForceProcessEvents)
+ {
qApp->processEvents();
}
}
@@ -237,10 +246,13 @@
<< "</html>" << endl;
}
- /*
- //Set the size of the row
- //logTable->setRowHeight(row, 20); is an alternative to the following
- logTable->verticalHeader()->setResizeMode(row, QHeaderView::Fixed);
- logTable->verticalHeader()->resizeSection(row, 20);
- */
-}
+ void Log::onSliderPressed(void)
+ {
+ m_bSliderPressed = true;
+ }
+
+ void Log::onSliderReleased(void)
+ {
+ m_bSliderPressed = false;
+ }
+}
\ No newline at end of file
Modified: trunk/QtOgreFramework/QtOgre/ui/Log.ui
===================================================================
--- trunk/QtOgreFramework/QtOgre/ui/Log.ui 2010-06-27 11:03:23 UTC (rev 2921)
+++ trunk/QtOgreFramework/QtOgre/ui/Log.ui 2010-06-27 18:35:29 UTC (rev 2922)
@@ -205,7 +205,7 @@
</widget>
</item>
<item row="1" column="0" colspan="9">
- <widget class="QTableView" name="logTable">
+ <widget class="QTableView" name="m_pLogTable">
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
@@ -236,15 +236,6 @@
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
- <attribute name="verticalHeaderVisible">
- <bool>false</bool>
- </attribute>
- <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
- <bool>true</bool>
- </attribute>
- <attribute name="horizontalHeaderStretchLastSection">
- <bool>true</bool>
- </attribute>
</widget>
</item>
</layout>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-06-27 11:03:29
|
Revision: 2921
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2921&view=rev
Author: esuvs
Date: 2010-06-27 11:03:23 +0000 (Sun, 27 Jun 2010)
Log Message:
-----------
Renamed some files.
Modified Paths:
--------------
trunk/QtOgreFramework/EngineTest/CMakeLists.txt
trunk/QtOgreFramework/EngineTest/source/main.cpp
Added Paths:
-----------
trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h
Removed Paths:
-------------
trunk/QtOgreFramework/EngineTest/include/DemoGameLogic.h
Modified: trunk/QtOgreFramework/EngineTest/CMakeLists.txt
===================================================================
--- trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-06-27 10:48:02 UTC (rev 2920)
+++ trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-06-27 11:03:23 UTC (rev 2921)
@@ -7,7 +7,7 @@
source/main.cpp
source/Mouse.cpp
source/ChooseMeshWidget.cpp
- source/DemoGameLogic.cpp
+ source/EngineTestGameLogic.cpp
source/Keyboard.cpp
source/MainMenu.cpp
source/StyleSettingsWidget.cpp
@@ -16,7 +16,7 @@
SET(INC_FILES
include/CameraWrapper.h
include/ChooseMeshWidget.h
- include/DemoGameLogic.h
+ include/EngineTestGameLogic.h
include/Keyboard.h
include/MainMenu.h
include/Mouse.h
Deleted: trunk/QtOgreFramework/EngineTest/include/DemoGameLogic.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/DemoGameLogic.h 2010-06-27 10:48:02 UTC (rev 2920)
+++ trunk/QtOgreFramework/EngineTest/include/DemoGameLogic.h 2010-06-27 11:03:23 UTC (rev 2921)
@@ -1,84 +0,0 @@
-#ifndef DEMOGAMELOGIC_H_
-#define DEMOGAMELOGIC_H_
-
-#include "CameraWrapper.h"
-#include "ChooseMeshWidget.h"
-#include "GameLogic.h"
-#include "Keyboard.h"
-#include "Mouse.h"
-#include "MainMenu.h"
-
-#include <OgreCamera.h>
-#include <OgrePrerequisites.h>
-
-#include <QHash>
-
-#include <QTime>
-
-#include <QtScript>
-#include <QScriptEngineDebugger>
-
-
-class StyleSettingsWidget;
-
-class DemoGameLogic : public QtOgre::GameLogic
-{
-public:
- DemoGameLogic(void);
-
- void initialise(void);
- void update(void);
- void shutdown(void);
-
- void onKeyPress(QKeyEvent* event);
- void onKeyRelease(QKeyEvent* event);
-
- void onMouseMove(QMouseEvent* event);
- void onMousePress(QMouseEvent* event);
- void onMouseRelease(QMouseEvent* event);
-
- void onWheel(QWheelEvent* event);
-
- QtOgre::Log* demoLog(void);
-
- void loadScene(QString filename);
-
-private:
- Keyboard keyboard;
- Mouse mouse;
- /*QPoint mLastFrameMousePos;
- QPoint mCurrentMousePos;*/
-
- /*int mLastFrameWheelPos;
- int mCurrentWheelPos;*/
- QTime* mTime;
-
- int mLastFrameTime;
- int mCurrentTime;
-
- bool mIsFirstFrame;
-
- float mCameraSpeed;
-
- ChooseMeshWidget* mChooseMeshWidget;
-
- MainMenu* mMainMenu;
-
- StyleSettingsWidget* mStyleSettingsWidget;
-
- Ogre::Camera* mCamera;
- Ogre::SceneManager* mSceneManager;
- QtOgre::Log* mDemoLog;
-
- //Scripting
- QScriptEngine* scriptEngine;
- QString updateScript;
- CameraWrapper cameraWrapper;
- QScriptValue cameraPositionScriptValue;
- QScriptValue cameraDirectionScriptValue;
- QScriptValue cameraRightScriptValue;
-
- QScriptEngineDebugger debugger;
-};
-
-#endif /*DEMOGAMELOGIC_H_*/
\ No newline at end of file
Copied: trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h (from rev 2918, trunk/QtOgreFramework/EngineTest/include/DemoGameLogic.h)
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h (rev 0)
+++ trunk/QtOgreFramework/EngineTest/include/EngineTestGameLogic.h 2010-06-27 11:03:23 UTC (rev 2921)
@@ -0,0 +1,84 @@
+#ifndef ENGINETESTGAMELOGIC_H_
+#define ENGINETESTGAMELOGIC_H_
+
+#include "CameraWrapper.h"
+#include "ChooseMeshWidget.h"
+#include "GameLogic.h"
+#include "Keyboard.h"
+#include "Mouse.h"
+#include "MainMenu.h"
+
+#include <OgreCamera.h>
+#include <OgrePrerequisites.h>
+
+#include <QHash>
+
+#include <QTime>
+
+#include <QtScript>
+#include <QScriptEngineDebugger>
+
+
+class StyleSettingsWidget;
+
+class EngineTestGameLogic : public QtOgre::GameLogic
+{
+public:
+ EngineTestGameLogic(void);
+
+ void initialise(void);
+ void update(void);
+ void shutdown(void);
+
+ void onKeyPress(QKeyEvent* event);
+ void onKeyRelease(QKeyEvent* event);
+
+ void onMouseMove(QMouseEvent* event);
+ void onMousePress(QMouseEvent* event);
+ void onMouseRelease(QMouseEvent* event);
+
+ void onWheel(QWheelEvent* event);
+
+ QtOgre::Log* demoLog(void);
+
+ void loadScene(QString filename);
+
+private:
+ Keyboard keyboard;
+ Mouse mouse;
+ /*QPoint mLastFrameMousePos;
+ QPoint mCurrentMousePos;*/
+
+ /*int mLastFrameWheelPos;
+ int mCurrentWheelPos;*/
+ QTime* mTime;
+
+ int mLastFrameTime;
+ int mCurrentTime;
+
+ bool mIsFirstFrame;
+
+ float mCameraSpeed;
+
+ ChooseMeshWidget* mChooseMeshWidget;
+
+ MainMenu* mMainMenu;
+
+ StyleSettingsWidget* mStyleSettingsWidget;
+
+ Ogre::Camera* mCamera;
+ Ogre::SceneManager* mSceneManager;
+ QtOgre::Log* mDemoLog;
+
+ //Scripting
+ QScriptEngine* scriptEngine;
+ QString updateScript;
+ CameraWrapper cameraWrapper;
+ QScriptValue cameraPositionScriptValue;
+ QScriptValue cameraDirectionScriptValue;
+ QScriptValue cameraRightScriptValue;
+
+ QScriptEngineDebugger debugger;
+};
+
+#endif /*ENGINETESTGAMELOGIC_H_*/
\ No newline at end of file
Modified: trunk/QtOgreFramework/EngineTest/source/main.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/main.cpp 2010-06-27 10:48:02 UTC (rev 2920)
+++ trunk/QtOgreFramework/EngineTest/source/main.cpp 2010-06-27 11:03:23 UTC (rev 2921)
@@ -1,5 +1,5 @@
#include <Application.h>
-#include "DemoGameLogic.h"
+#include "EngineTestGameLogic.h"
#include <QPushButton>
#include <QIcon>
@@ -8,6 +8,6 @@
int main(int argc, char *argv[])
{
- Application app(argc, argv, new DemoGameLogic);
+ Application app(argc, argv, new EngineTestGameLogic);
return app.exec(QtOgre::DisplaySettingsDialog);
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-06-27 10:48:08
|
Revision: 2920
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2920&view=rev
Author: esuvs
Date: 2010-06-27 10:48:02 +0000 (Sun, 27 Jun 2010)
Log Message:
-----------
Reverted scripting-related changes from demo app as these are now part of the EngineTest app.
Modified Paths:
--------------
trunk/QtOgreFramework/Demo/CMakeLists.txt
trunk/QtOgreFramework/Demo/include/ChooseMeshWidget.h
trunk/QtOgreFramework/Demo/include/DemoGameLogic.h
trunk/QtOgreFramework/Demo/include/MainMenu.h
trunk/QtOgreFramework/Demo/include/StyleSettingsWidget.h
trunk/QtOgreFramework/Demo/source/ChooseMeshWidget.cpp
trunk/QtOgreFramework/Demo/source/DemoGameLogic.cpp
trunk/QtOgreFramework/Demo/source/MainMenu.cpp
trunk/QtOgreFramework/Demo/source/StyleSettingsWidget.cpp
trunk/QtOgreFramework/EngineTest/source/DemoGameLogic.cpp
Removed Paths:
-------------
trunk/QtOgreFramework/Demo/include/CameraWrapper.h
trunk/QtOgreFramework/Demo/include/Keyboard.h
trunk/QtOgreFramework/Demo/include/Mouse.h
trunk/QtOgreFramework/Demo/source/CameraWrapper.cpp
trunk/QtOgreFramework/Demo/source/Keyboard.cpp
trunk/QtOgreFramework/Demo/source/Mouse.cpp
Modified: trunk/QtOgreFramework/Demo/CMakeLists.txt
===================================================================
--- trunk/QtOgreFramework/Demo/CMakeLists.txt 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/CMakeLists.txt 2010-06-27 10:48:02 UTC (rev 2920)
@@ -3,23 +3,17 @@
PROJECT(Demo)
SET(SRC_FILES
- source/CameraWrapper.cpp
source/main.cpp
- source/Mouse.cpp
source/ChooseMeshWidget.cpp
source/DemoGameLogic.cpp
- source/Keyboard.cpp
source/MainMenu.cpp
source/StyleSettingsWidget.cpp
)
SET(INC_FILES
- include/CameraWrapper.h
include/ChooseMeshWidget.h
include/DemoGameLogic.h
- include/Keyboard.h
include/MainMenu.h
- include/Mouse.h
include/StyleSettingsWidget.h
)
@@ -39,8 +33,6 @@
FIND_PACKAGE(Qt4)
SET(QT_USE_QTGUI 1)
-SET(QT_USE_QTSCRIPT 1)
-SET(QT_USE_QTSCRIPTTOOLS 1)
SET(QT_USE_QTXML 1)
INCLUDE(${QT_USE_FILE})
Deleted: trunk/QtOgreFramework/Demo/include/CameraWrapper.h
===================================================================
--- trunk/QtOgreFramework/Demo/include/CameraWrapper.h 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/include/CameraWrapper.h 2010-06-27 10:48:02 UTC (rev 2920)
@@ -1,31 +0,0 @@
-#ifndef CAMERAWRAPPER_H_
-#define CAMERAWRAPPER_H_
-
-#include <OgrePrerequisites.h>
-#include <OgreMath.h>
-
-#include <QObject>
-
-class CameraWrapper : public QObject
-{
- Q_OBJECT
-
-public:
- void setOgreCamera(Ogre::Camera* pOgreCamera);
-
-public slots:
- void moveRelative(const Ogre::Vector3 &vec);
-
- void yaw (const Ogre::Radian &angle);
-
- void pitch (const Ogre::Radian &angle);
-
- Ogre::Radian getFOVy (void) const;
-
- void setFOVy (const Ogre::Radian& fovy);
-
-private:
- Ogre::Camera* m_pOgreCamera;
-};
-
-#endif //CAMERAWRAPPER_H_
\ No newline at end of file
Modified: trunk/QtOgreFramework/Demo/include/ChooseMeshWidget.h
===================================================================
--- trunk/QtOgreFramework/Demo/include/ChooseMeshWidget.h 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/include/ChooseMeshWidget.h 2010-06-27 10:48:02 UTC (rev 2920)
@@ -5,22 +5,25 @@
#include "OgrePrerequisites.h"
-class DemoGameLogic;
-
-class ChooseMeshWidget : public QWidget, private Ui::ChooseMeshWidget
+namespace QtOgre
{
- Q_OBJECT
+ class DemoGameLogic;
-public:
- ChooseMeshWidget(Ogre::Entity* jaiquaEntity, Ogre::Entity* robotEntity, QWidget *parent = 0);
+ class ChooseMeshWidget : public QWidget, private Ui::ChooseMeshWidget
+ {
+ Q_OBJECT
-public slots:
- void on_mJaiquaRadioButton_toggled(bool checked);
- void on_mRobotRadioButton_toggled(bool checked);
+ public:
+ ChooseMeshWidget(Ogre::Entity* jaiquaEntity, Ogre::Entity* robotEntity, QWidget *parent = 0);
-private:
- Ogre::Entity* mJaiquaEntity;
- Ogre::Entity* mRobotEntity;
-};
+ public slots:
+ void on_mJaiquaRadioButton_toggled(bool checked);
+ void on_mRobotRadioButton_toggled(bool checked);
+ private:
+ Ogre::Entity* mJaiquaEntity;
+ Ogre::Entity* mRobotEntity;
+ };
+}
+
#endif /*CHOOSEMESHWIDGET_H_*/
\ No newline at end of file
Modified: trunk/QtOgreFramework/Demo/include/DemoGameLogic.h
===================================================================
--- trunk/QtOgreFramework/Demo/include/DemoGameLogic.h 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/include/DemoGameLogic.h 2010-06-27 10:48:02 UTC (rev 2920)
@@ -1,84 +1,73 @@
#ifndef DEMOGAMELOGIC_H_
#define DEMOGAMELOGIC_H_
-#include "CameraWrapper.h"
#include "ChooseMeshWidget.h"
#include "GameLogic.h"
-#include "Keyboard.h"
-#include "Mouse.h"
#include "MainMenu.h"
-#include <OgreCamera.h>
#include <OgrePrerequisites.h>
#include <QHash>
#include <QTime>
-#include <QtScript>
-#include <QScriptEngineDebugger>
-
-
-class StyleSettingsWidget;
-
-class DemoGameLogic : public QtOgre::GameLogic
+namespace QtOgre
{
-public:
- DemoGameLogic(void);
+ enum KeyStates
+ {
+ KS_RELEASED,
+ KS_PRESSED
+ };
+
+ class StyleSettingsWidget;
+
+ class DemoGameLogic : public GameLogic
+ {
+ public:
+ DemoGameLogic(void);
- void initialise(void);
- void update(void);
- void shutdown(void);
+ void initialise(void);
+ void update(void);
+ void shutdown(void);
- void onKeyPress(QKeyEvent* event);
- void onKeyRelease(QKeyEvent* event);
+ void onKeyPress(QKeyEvent* event);
+ void onKeyRelease(QKeyEvent* event);
- void onMouseMove(QMouseEvent* event);
- void onMousePress(QMouseEvent* event);
- void onMouseRelease(QMouseEvent* event);
+ void onMouseMove(QMouseEvent* event);
+ void onMousePress(QMouseEvent* event);
- void onWheel(QWheelEvent* event);
+ void onWheel(QWheelEvent* event);
- QtOgre::Log* demoLog(void);
+ QtOgre::Log* demoLog(void);
- void loadScene(QString filename);
+ void loadScene(QString filename);
-private:
- Keyboard keyboard;
- Mouse mouse;
- /*QPoint mLastFrameMousePos;
- QPoint mCurrentMousePos;*/
+ private:
+ QHash<int, KeyStates> mKeyStates;
+ QPoint mLastFrameMousePos;
+ QPoint mCurrentMousePos;
- /*int mLastFrameWheelPos;
- int mCurrentWheelPos;*/
- QTime* mTime;
+ int mLastFrameWheelPos;
+ int mCurrentWheelPos;
+ QTime* mTime;
- int mLastFrameTime;
- int mCurrentTime;
+ int mLastFrameTime;
+ int mCurrentTime;
- bool mIsFirstFrame;
+ bool mIsFirstFrame;
- float mCameraSpeed;
+ float mCameraSpeed;
- ChooseMeshWidget* mChooseMeshWidget;
+ ChooseMeshWidget* mChooseMeshWidget;
- MainMenu* mMainMenu;
+ MainMenu* mMainMenu;
- StyleSettingsWidget* mStyleSettingsWidget;
+ StyleSettingsWidget* mStyleSettingsWidget;
- Ogre::Camera* mCamera;
- Ogre::SceneManager* mSceneManager;
- QtOgre::Log* mDemoLog;
+ Ogre::Camera* mCamera;
+ Ogre::SceneManager* mSceneManager;
+ QtOgre::Log* mDemoLog;
+ };
+}
- //Scripting
- QScriptEngine* scriptEngine;
- QString updateScript;
- CameraWrapper cameraWrapper;
- QScriptValue cameraPositionScriptValue;
- QScriptValue cameraDirectionScriptValue;
- QScriptValue cameraRightScriptValue;
-
- QScriptEngineDebugger debugger;
-};
-
#endif /*DEMOGAMELOGIC_H_*/
\ No newline at end of file
Deleted: trunk/QtOgreFramework/Demo/include/Keyboard.h
===================================================================
--- trunk/QtOgreFramework/Demo/include/Keyboard.h 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/include/Keyboard.h 2010-06-27 10:48:02 UTC (rev 2920)
@@ -1,19 +0,0 @@
-#ifndef KEYBOARD_H_
-#define KEYBOARD_H_
-
-#include <QHash>
-
-class Keyboard : public QObject
- {
- Q_OBJECT
-
- public slots:
- bool isPressed(int key);
- void press(int key);
- void release(int key);
-
- private:
- QHash<int, bool> mKeyStates;
- };
-
-#endif //KEYBOARD_H_
\ No newline at end of file
Modified: trunk/QtOgreFramework/Demo/include/MainMenu.h
===================================================================
--- trunk/QtOgreFramework/Demo/include/MainMenu.h 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/include/MainMenu.h 2010-06-27 10:48:02 UTC (rev 2920)
@@ -5,23 +5,27 @@
#include "Application.h"
-class MainMenu : public QDialog, private Ui::MainMenu
+namespace QtOgre
{
- Q_OBJECT
-public:
- MainMenu(QtOgre::Application* application, QWidget* mainWidget, QWidget *parent = 0);
+ class MainMenu : public QDialog, private Ui::MainMenu
+ {
+ Q_OBJECT
-public slots:
- void on_mQuitButton_clicked(void);
- void on_mResumeButton_clicked(void);
- void on_mSettingsButton_clicked(void);
- void on_mViewLogsButton_clicked(void);
+ public:
+ MainMenu(Application* application, QWidget* mainWidget, QWidget *parent = 0);
-private:
- QtOgre::Application *mApplication;
- QWidget* mMainWidget;
+ public slots:
+ void on_mQuitButton_clicked(void);
+ void on_mResumeButton_clicked(void);
+ void on_mSettingsButton_clicked(void);
+ void on_mViewLogsButton_clicked(void);
-};
+ private:
+ Application *mApplication;
+ QWidget* mMainWidget;
+ };
+}
+
#endif /*MAINMENU_H_*/
\ No newline at end of file
Deleted: trunk/QtOgreFramework/Demo/include/Mouse.h
===================================================================
--- trunk/QtOgreFramework/Demo/include/Mouse.h 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/include/Mouse.h 2010-06-27 10:48:02 UTC (rev 2920)
@@ -1,42 +0,0 @@
-#ifndef MOUSE_H_
-#define MOUSE_H_
-
-#include <QObject>
-#include <QPoint>
-
-class Mouse : public QObject
-{
- Q_OBJECT
-
-public:
- Mouse(void);
-
-public slots:
- bool isPressed(int mouseButton);
-
- void press(int mouseButton);
-
- void release(int mouseButton);
-
- const QPoint& pos(void);
-
- void setPos(const QPoint& pos);
-
- QPoint computeDelta(void);
-
- void resetDelta(void);
-
- void modifyWheelDelta(int wheelDelta);
-
- int getWheelDelta(void);
-
- void resetWheelDelta(void);
-
-private:
- Qt::MouseButtons mMouseButtons;
- QPoint mPos;
- QPoint mOldPos;
- int mWheelDelta;
-};
-
-#endif //MOUSE_H_
\ No newline at end of file
Modified: trunk/QtOgreFramework/Demo/include/StyleSettingsWidget.h
===================================================================
--- trunk/QtOgreFramework/Demo/include/StyleSettingsWidget.h 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/include/StyleSettingsWidget.h 2010-06-27 10:48:02 UTC (rev 2920)
@@ -5,21 +5,25 @@
#include <AbstractSettingsWidget.h>
-class StyleSettingsWidget : public QtOgre::AbstractSettingsWidget, private Ui::StyleSettingsWidget
+namespace QtOgre
{
- Q_OBJECT
-public:
- StyleSettingsWidget(QWidget *parent = 0);
+ class StyleSettingsWidget : public AbstractSettingsWidget, private Ui::StyleSettingsWidget
+ {
+ Q_OBJECT
- void disableFirstTimeOnlySettings(void);
+ public:
+ StyleSettingsWidget(QWidget *parent = 0);
-public slots:
- void readFromSettings(void);
- void writeToSettings(void);
+ void disableFirstTimeOnlySettings(void);
+
+ public slots:
+ void readFromSettings(void);
+ void writeToSettings(void);
-private slots:
- void chooseStyleFile(bool);
-};
+ private slots:
+ void chooseStyleFile(bool);
+ };
+}
#endif /*QTOGRE_STYLESETTINGSWIDGET_H_*/
Deleted: trunk/QtOgreFramework/Demo/source/CameraWrapper.cpp
===================================================================
--- trunk/QtOgreFramework/Demo/source/CameraWrapper.cpp 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/source/CameraWrapper.cpp 2010-06-27 10:48:02 UTC (rev 2920)
@@ -1,34 +0,0 @@
-#include "CameraWrapper.h"
-
-#include <OgreCamera.h>
-#include <OgreMath.h>
-
-void CameraWrapper::setOgreCamera(Ogre::Camera* pOgreCamera)
-{
- m_pOgreCamera = pOgreCamera;
-}
-
-void CameraWrapper::moveRelative(const Ogre::Vector3 &vec)
-{
- m_pOgreCamera->moveRelative(vec);
-}
-
-void CameraWrapper::yaw (const Ogre::Radian &angle)
-{
- m_pOgreCamera->yaw(angle);
-}
-
-void CameraWrapper::pitch (const Ogre::Radian &angle)
-{
- m_pOgreCamera->pitch(angle);
-}
-
-Ogre::Radian CameraWrapper::getFOVy (void) const
-{
- return m_pOgreCamera->getFOVy();
-}
-
-void CameraWrapper::setFOVy (const Ogre::Radian& fovy)
-{
- m_pOgreCamera->setFOVy(fovy);
-}
\ No newline at end of file
Modified: trunk/QtOgreFramework/Demo/source/ChooseMeshWidget.cpp
===================================================================
--- trunk/QtOgreFramework/Demo/source/ChooseMeshWidget.cpp 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/source/ChooseMeshWidget.cpp 2010-06-27 10:48:02 UTC (rev 2920)
@@ -2,23 +2,26 @@
#include <OgreEntity.h>
-ChooseMeshWidget::ChooseMeshWidget(Ogre::Entity* jaiquaEntity, Ogre::Entity* robotEntity, QWidget *parent)
- :QWidget(parent, Qt::Tool)
+namespace QtOgre
{
- setupUi(this);
+ ChooseMeshWidget::ChooseMeshWidget(Ogre::Entity* jaiquaEntity, Ogre::Entity* robotEntity, QWidget *parent)
+ :QWidget(parent, Qt::Tool)
+ {
+ setupUi(this);
- mJaiquaEntity = jaiquaEntity;
- mRobotEntity = robotEntity;
-}
+ mJaiquaEntity = jaiquaEntity;
+ mRobotEntity = robotEntity;
+ }
-void ChooseMeshWidget::on_mJaiquaRadioButton_toggled(bool checked)
-{
- mRobotEntity->setVisible(!checked);
- mJaiquaEntity->setVisible(checked);
-}
+ void ChooseMeshWidget::on_mJaiquaRadioButton_toggled(bool checked)
+ {
+ mRobotEntity->setVisible(!checked);
+ mJaiquaEntity->setVisible(checked);
+ }
-void ChooseMeshWidget::on_mRobotRadioButton_toggled(bool checked)
-{
- mRobotEntity->setVisible(checked);
- mJaiquaEntity->setVisible(!checked);
+ void ChooseMeshWidget::on_mRobotRadioButton_toggled(bool checked)
+ {
+ mRobotEntity->setVisible(checked);
+ mJaiquaEntity->setVisible(!checked);
+ }
}
\ No newline at end of file
Modified: trunk/QtOgreFramework/Demo/source/DemoGameLogic.cpp
===================================================================
--- trunk/QtOgreFramework/Demo/source/DemoGameLogic.cpp 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/source/DemoGameLogic.cpp 2010-06-27 10:48:02 UTC (rev 2920)
@@ -1,9 +1,6 @@
#include "DemoGameLogic.h"
-
#include "DotSceneHandler.h"
#include "MainMenu.h"
-#include "Scripting/OgreRadianClass.h"
-#include "Scripting/OgreVector3Class.h"
#include "LogManager.h"
#include "OgreWidget.h"
@@ -18,31 +15,8 @@
#include <QMouseEvent>
#include <QSettings>
-#include <QMetaObject>
-
-using namespace QtOgre;
-
- QScriptValue toScriptValueQPoint(QScriptEngine *engine, const QPoint &s)
- {
- QScriptValue obj = engine->newObject();
- obj.setProperty("x", s.x());
- obj.setProperty("y", s.y());
- return obj;
- }
-
- void fromScriptValueQPoint(const QScriptValue &obj, QPoint &s)
- {
- s.setX(obj.property("x").toInt32());
- s.setY(obj.property("y").toInt32());
- }
-
- struct QtMetaObject : private QObject
- {
- public:
- static const QMetaObject *get()
- { return &static_cast<QtMetaObject*>(0)->staticQtMetaObject; }
- };
-
+namespace QtOgre
+{
DemoGameLogic::DemoGameLogic(void)
:GameLogic()
{
@@ -50,81 +24,6 @@
void DemoGameLogic::initialise(void)
{
- scriptEngine = new QScriptEngine;
-
- scriptEngine->importExtension("qt.core");
- scriptEngine->importExtension("qt.gui");
-
-
- QScriptValue keyboardScriptValue = scriptEngine->newQObject(&keyboard);
- scriptEngine->globalObject().setProperty("keyboard", keyboardScriptValue);
-
- QScriptValue mouseScriptValue = scriptEngine->newQObject(&mouse);
- scriptEngine->globalObject().setProperty("mouse", mouseScriptValue);
-
- QScriptValue cameraScriptValue = scriptEngine->newQObject(&cameraWrapper);
- scriptEngine->globalObject().setProperty("camera", cameraScriptValue);
-
- QScriptValue Qt = scriptEngine->newQMetaObject(QtMetaObject::get());
- Qt.setProperty("App", scriptEngine->newQObject(qApp));
- scriptEngine->globalObject().setProperty("Qt", Qt);
-
- qScriptRegisterMetaType(scriptEngine, toScriptValueQPoint, fromScriptValueQPoint);
-
- OgreVector3Class *vecClass = new OgreVector3Class(scriptEngine);
- scriptEngine->globalObject().setProperty("OgreVector3", vecClass->constructor());
-
- OgreRadianClass *radianClass = new OgreRadianClass(scriptEngine);
- scriptEngine->globalObject().setProperty("OgreRadian", radianClass->constructor());
-
- updateScript =
- "vec = new OgreVector3;"
- "vec.x = 0.0;"
- "vec.y = 0.0;"
- "vec.z = 0.0;"
- "if(keyboard.isPressed(Qt.Key_W))"
- "{"
- " vec.z = -1.0;"
- "}"
- "if(keyboard.isPressed(Qt.Key_S))"
- "{"
- " vec.z = 1.0;"
- "}"
- "if(keyboard.isPressed(Qt.Key_A))"
- "{"
- " vec.x = -1.0;"
- "}"
- "if(keyboard.isPressed(Qt.Key_D))"
- "{"
- " vec.x = 1.0;"
- "}"
- "camera.moveRelative(vec);"
- "if(mouse.isPressed(Qt.RightButton))"
- "{"
- " mouseDelta = mouse.computeDelta();"
- " camera.yaw(new OgreRadian(-mouseDelta.x * 0.01));"
- "}"
- "if(mouse.isPressed(Qt.RightButton))"
- "{"
- " mouseDelta = mouse.computeDelta();"
- " camera.pitch(new OgreRadian(-mouseDelta.y * 0.01));"
- "}"
- "wheelDelta = mouse.getWheelDelta();"
- "print('wheelDelta = ', wheelDelta);"
- "fov = camera.getFOVy();"
- "print('old fov = ', fov.valueRadians);"
- "tempFOV = new OgreRadian(-wheelDelta * 0.001);"
- "fov.valueRadians = fov.valueRadians + tempFOV.valueRadians;"
- "print('new fov = ', fov.valueRadians);"
- "camera.setFOVy(fov);"
- ;
-
- debugger.attachTo(scriptEngine);
- //debugger.action(QScriptEngineDebugger::InterruptAction)->trigger();
-
-
-
-
//qApp->setStyleSheet(qApp->settings()->value("UI/StyleFile").toString());
mDemoLog = mApplication->createLog("Demo");
@@ -183,14 +82,6 @@
mStyleSettingsWidget = new StyleSettingsWidget;
mApplication->addSettingsWidget("Style", mStyleSettingsWidget);
-
- /*cameraPositionScriptValue = scriptEngine->toScriptValue(mCamera->getPosition());
- cameraDirectionScriptValue = scriptEngine->toScriptValue(mCamera->getDirection());
- cameraRightScriptValue = scriptEngine->toScriptValue(mCamera->getRight());
-
- scriptEngine->globalObject().setProperty("cameraPosition", cameraPositionScriptValue);
- scriptEngine->globalObject().setProperty("cameraDirection", cameraDirectionScriptValue);
- scriptEngine->globalObject().setProperty("cameraRight", cameraRightScriptValue);*/
}
void DemoGameLogic::update(void)
@@ -214,17 +105,40 @@
float distance = mCameraSpeed * timeElapsedInSeconds;
- mIsFirstFrame = false;
+ if(mKeyStates[Qt::Key_W] == KS_PRESSED)
+ {
+ mCamera->setPosition(mCamera->getPosition() + mCamera->getDirection() * distance);
+ }
+ if(mKeyStates[Qt::Key_S] == KS_PRESSED)
+ {
+ mCamera->setPosition(mCamera->getPosition() - mCamera->getDirection() * distance);
+ }
+ if(mKeyStates[Qt::Key_A] == KS_PRESSED)
+ {
+ mCamera->setPosition(mCamera->getPosition() - mCamera->getRight() * distance);
+ }
+ if(mKeyStates[Qt::Key_D] == KS_PRESSED)
+ {
+ mCamera->setPosition(mCamera->getPosition() + mCamera->getRight() * distance);
+ }
- QScriptValue result = scriptEngine->evaluate(updateScript);
- if (scriptEngine->hasUncaughtException())
+ if(!mIsFirstFrame)
{
- int line = scriptEngine->uncaughtExceptionLineNumber();
- qCritical() << "uncaught exception at line" << line << ":" << result.toString();
+ QPoint mouseDelta = mCurrentMousePos - mLastFrameMousePos;
+ mCamera->yaw(Ogre::Radian(-mouseDelta.x() * timeElapsedInSeconds));
+ mCamera->pitch(Ogre::Radian(-mouseDelta.y() * timeElapsedInSeconds));
+
+ int wheelDelta = mCurrentWheelPos - mLastFrameWheelPos;
+ Ogre::Radian fov = mCamera->getFOVy();
+ fov += Ogre::Radian(-wheelDelta * 0.001);
+ fov = (std::min)(fov, Ogre::Radian(2.0f));
+ fov = (std::max)(fov, Ogre::Radian(0.5f));
+ mCamera->setFOVy(fov);
}
+ mLastFrameMousePos = mCurrentMousePos;
+ mLastFrameWheelPos = mCurrentWheelPos;
- mouse.resetDelta();
- mouse.resetWheelDelta();
+ mIsFirstFrame = false;
}
void DemoGameLogic::shutdown(void)
@@ -235,7 +149,7 @@
void DemoGameLogic::onKeyPress(QKeyEvent* event)
{
- keyboard.press(event->key());
+ mKeyStates[event->key()] = KS_PRESSED;
if(event->key() == Qt::Key_Escape)
{
@@ -246,33 +160,23 @@
void DemoGameLogic::onKeyRelease(QKeyEvent* event)
{
- keyboard.release(event->key());
+ mKeyStates[event->key()] = KS_RELEASED;
}
void DemoGameLogic::onMousePress(QMouseEvent* event)
{
- mouse.press(event->button());
-
- //Update the mouse position as well or we get 'jumps'
- mouse.setPos(event->pos());
- mouse.resetDelta();
+ mCurrentMousePos = event->pos();
+ mLastFrameMousePos = mCurrentMousePos;
}
- void DemoGameLogic::onMouseRelease(QMouseEvent* event)
- {
- mouse.release(event->button());
- }
-
void DemoGameLogic::onMouseMove(QMouseEvent* event)
{
- //mCurrentMousePos = event->pos();
- mouse.setPos(event->pos());
+ mCurrentMousePos = event->pos();
}
void DemoGameLogic::onWheel(QWheelEvent* event)
{
- //mCurrentWheelPos += event->delta();
- mouse.modifyWheelDelta(event->delta());
+ mCurrentWheelPos += event->delta();
}
Log* DemoGameLogic::demoLog(void)
@@ -310,6 +214,5 @@
Ogre::Viewport* viewport = mApplication->ogreRenderWindow()->addViewport(mCamera);
viewport->setBackgroundColour(Ogre::ColourValue::Black);
-
- cameraWrapper.setOgreCamera(mCamera);
- }
\ No newline at end of file
+ }
+}
\ No newline at end of file
Deleted: trunk/QtOgreFramework/Demo/source/Keyboard.cpp
===================================================================
--- trunk/QtOgreFramework/Demo/source/Keyboard.cpp 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/source/Keyboard.cpp 2010-06-27 10:48:02 UTC (rev 2920)
@@ -1,16 +0,0 @@
-#include "Keyboard.h"
-
-bool Keyboard::isPressed(int key)
-{
- return mKeyStates[key];
-}
-
-void Keyboard::press(int key)
-{
- mKeyStates[key] = true;
-}
-
-void Keyboard::release(int key)
-{
- mKeyStates[key] = false;
-}
\ No newline at end of file
Modified: trunk/QtOgreFramework/Demo/source/MainMenu.cpp
===================================================================
--- trunk/QtOgreFramework/Demo/source/MainMenu.cpp 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/source/MainMenu.cpp 2010-06-27 10:48:02 UTC (rev 2920)
@@ -4,34 +4,35 @@
#include "OgreWidget.h"
#include "SettingsDialog.h"
-using namespace QtOgre;
-
-MainMenu::MainMenu(Application* application, QWidget* mainWidget, QWidget *parent)
-:QDialog(parent)
+namespace QtOgre
{
- setupUi(this);
+ MainMenu::MainMenu(Application* application, QWidget* mainWidget, QWidget *parent)
+ :QDialog(parent)
+ {
+ setupUi(this);
- mApplication = application;
- mMainWidget = mainWidget;
-}
+ mApplication = application;
+ mMainWidget = mainWidget;
+ }
-void MainMenu::on_mQuitButton_clicked(void)
-{
- mMainWidget->close();
-}
+ void MainMenu::on_mQuitButton_clicked(void)
+ {
+ mMainWidget->close();
+ }
-void MainMenu::on_mResumeButton_clicked(void)
-{
- reject();
-}
+ void MainMenu::on_mResumeButton_clicked(void)
+ {
+ reject();
+ }
-void MainMenu::on_mSettingsButton_clicked(void)
-{
- mApplication->showSettingsDialog();
-}
+ void MainMenu::on_mSettingsButton_clicked(void)
+ {
+ mApplication->showSettingsDialog();
+ }
-void MainMenu::on_mViewLogsButton_clicked(void)
-{
- mApplication->showLogManager();
- //reject();
+ void MainMenu::on_mViewLogsButton_clicked(void)
+ {
+ mApplication->showLogManager();
+ //reject();
+ }
}
\ No newline at end of file
Deleted: trunk/QtOgreFramework/Demo/source/Mouse.cpp
===================================================================
--- trunk/QtOgreFramework/Demo/source/Mouse.cpp 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/source/Mouse.cpp 2010-06-27 10:48:02 UTC (rev 2920)
@@ -1,71 +0,0 @@
-#include "Mouse.h"
-
-Mouse::Mouse(void)
- :mWheelDelta(0)
-{
-}
-
-bool Mouse::isPressed(int mouseButton)
-{
- //Note - I'd rather pass a Qt::MouseButton in a parameter to this
- //function and avoid the class, but I had problems registering it
- //with qScriptRegisterMetaType().
- Qt::MouseButton mb = static_cast<Qt::MouseButton>(mouseButton);
-
- return mMouseButtons & mb;
-}
-
-void Mouse::press(int mouseButton)
-{
- //Note - I'd rather pass a Qt::MouseButton in a parameter to this
- //function and avoid the class, but I had problems registering it
- //with qScriptRegisterMetaType().
- Qt::MouseButton mb = static_cast<Qt::MouseButton>(mouseButton);
-
- mMouseButtons |= mb;
-}
-
-void Mouse::release(int mouseButton)
-{
- //Note - I'd rather pass a Qt::MouseButton in a parameter to this
- //function and avoid the class, but I had problems registering it
- //with qScriptRegisterMetaType().
- Qt::MouseButton mb = static_cast<Qt::MouseButton>(mouseButton);
-
- mMouseButtons &= ~mb;
-}
-
-const QPoint& Mouse::pos(void)
-{
- return mPos;
-}
-
-void Mouse::setPos(const QPoint& pos)
-{
- mPos = pos;
-}
-
-QPoint Mouse::computeDelta(void)
-{
- return mPos - mOldPos;
-}
-
-void Mouse::resetDelta(void)
-{
- mOldPos = mPos;
-}
-
-void Mouse::modifyWheelDelta(int wheelDelta)
-{
- mWheelDelta += wheelDelta;
-}
-
-int Mouse::getWheelDelta(void)
-{
- return mWheelDelta;
-}
-
-void Mouse::resetWheelDelta(void)
-{
- mWheelDelta = 0;
-}
\ No newline at end of file
Modified: trunk/QtOgreFramework/Demo/source/StyleSettingsWidget.cpp
===================================================================
--- trunk/QtOgreFramework/Demo/source/StyleSettingsWidget.cpp 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/Demo/source/StyleSettingsWidget.cpp 2010-06-27 10:48:02 UTC (rev 2920)
@@ -5,38 +5,39 @@
#include <QSettings>
#include <QFileDialog>
-using namespace QtOgre;
-
-StyleSettingsWidget::StyleSettingsWidget(QWidget *parent)
-:AbstractSettingsWidget(parent)
+namespace QtOgre
{
- setupUi(this);
+ StyleSettingsWidget::StyleSettingsWidget(QWidget *parent)
+ :AbstractSettingsWidget(parent)
+ {
+ setupUi(this);
- connect(browseButton, SIGNAL(clicked(bool)), this, SLOT(chooseStyleFile(bool)));
-}
+ connect(browseButton, SIGNAL(clicked(bool)), this, SLOT(chooseStyleFile(bool)));
+ }
-void StyleSettingsWidget::disableFirstTimeOnlySettings(void)
-{
- //None
-}
+ void StyleSettingsWidget::disableFirstTimeOnlySettings(void)
+ {
+ //None
+ }
-void StyleSettingsWidget::readFromSettings(void)
-{
- fileLineEdit->setText(mSettings->value("UI/StyleFile").toString());
-}
+ void StyleSettingsWidget::readFromSettings(void)
+ {
+ fileLineEdit->setText(mSettings->value("UI/StyleFile").toString());
+ }
-void StyleSettingsWidget::writeToSettings(void)
-{
- mSettings->setValue("UI/StyleFile", fileLineEdit->text());
- QFile styleFile(fileLineEdit->text());
- styleFile.open(QIODevice::ReadOnly | QIODevice::Text);
- qApp->setStyleSheet(QString(styleFile.readAll()));
- styleFile.close();
-}
+ void StyleSettingsWidget::writeToSettings(void)
+ {
+ mSettings->setValue("UI/StyleFile", fileLineEdit->text());
+ QFile styleFile(fileLineEdit->text());
+ styleFile.open(QIODevice::ReadOnly | QIODevice::Text);
+ qApp->setStyleSheet(QString(styleFile.readAll()));
+ styleFile.close();
+ }
-void StyleSettingsWidget::chooseStyleFile(bool checked)
-{
- //QFileDialog fileDialog(this, "Style file");
- //fileDialog.setNameFilter("Qt Style Files (*.qss)");
- fileLineEdit->setText(QFileDialog::getOpenFileName(this, "Style file", "", "Qt Style Files (*.qss)"));
+ void StyleSettingsWidget::chooseStyleFile(bool checked)
+ {
+ //QFileDialog fileDialog(this, "Style file");
+ //fileDialog.setNameFilter("Qt Style Files (*.qss)");
+ fileLineEdit->setText(QFileDialog::getOpenFileName(this, "Style file", "", "Qt Style Files (*.qss)"));
+ }
}
Modified: trunk/QtOgreFramework/EngineTest/source/DemoGameLogic.cpp
===================================================================
--- trunk/QtOgreFramework/EngineTest/source/DemoGameLogic.cpp 2010-06-26 15:26:58 UTC (rev 2919)
+++ trunk/QtOgreFramework/EngineTest/source/DemoGameLogic.cpp 2010-06-27 10:48:02 UTC (rev 2920)
@@ -119,7 +119,7 @@
"camera.setFOVy(fov);"
;
- debugger.attachTo(scriptEngine);
+ //debugger.attachTo(scriptEngine);
//debugger.action(QScriptEngineDebugger::InterruptAction)->trigger();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kal...@us...> - 2010-06-26 15:27:04
|
Revision: 2919
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2919&view=rev
Author: kallaspriit
Date: 2010-06-26 15:26:58 +0000 (Sat, 26 Jun 2010)
Log Message:
-----------
Updated INSTALL.TXT
There is a new environment variable used:
"OGRE_BUILD_HOME" - directory where you built your Ogre 1.7
Modified Paths:
--------------
branches/ogrenewt/newton20/INSTALL.TXT
Modified: branches/ogrenewt/newton20/INSTALL.TXT
===================================================================
--- branches/ogrenewt/newton20/INSTALL.TXT 2010-06-26 09:04:00 UTC (rev 2918)
+++ branches/ogrenewt/newton20/INSTALL.TXT 2010-06-26 15:26:58 UTC (rev 2919)
@@ -1,8 +1,8 @@
-Last updated 13.03.2010 by kallaspriit
+Last updated 26.06.2010 by kallaspriit
To compile OgreNewt, you also need:
-- Ogre (tested with 1.6.4) - http://ogre3d.org
-- Newton Game Dynamics (tested with 2.18) - http://www.newtondynamics.com/forum (see the beta thread for latest)
+- Ogre (tested with 1.7.1) - http://ogre3d.org
+- Newton Game Dynamics (tested with 2.22) - http://www.newtondynamics.com/forum (see the beta thread for latest)
- Boost (tested with 1.40.0) - http://boost.org
1. On Windows:
@@ -11,6 +11,7 @@
1) Using Visual Studio 2008
Just use the solution provided and before compiling, set the following environment variables:
"OGRE_HOME" - ogre home directory (i compiled Ogre myself, the directories may not be correct with precompiled version)
+ "OGRE_BUILD_HOME" - directory where you built your Ogre 1.7
"BOOST_HOME" - boost directory (get the latest from http://boost.org)
"NEWTON_HOME" - NGD install directory
"OGRENEWT_HOME" - OgreNewt root directory
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <es...@us...> - 2010-06-26 09:04:07
|
Revision: 2918
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2918&view=rev
Author: esuvs
Date: 2010-06-26 09:04:00 +0000 (Sat, 26 Jun 2010)
Log Message:
-----------
Added EngineTest as a new project for prototyping ideas for Thermite.
Modified Paths:
--------------
trunk/QtOgreFramework/CMakeLists.txt
trunk/QtOgreFramework/Demo/CMakeLists.txt
Added Paths:
-----------
trunk/QtOgreFramework/EngineTest/
trunk/QtOgreFramework/EngineTest/CMakeLists.txt
trunk/QtOgreFramework/EngineTest/include/
trunk/QtOgreFramework/EngineTest/include/CameraWrapper.h
trunk/QtOgreFramework/EngineTest/include/ChooseMeshWidget.h
trunk/QtOgreFramework/EngineTest/include/DemoGameLogic.h
trunk/QtOgreFramework/EngineTest/include/Keyboard.h
trunk/QtOgreFramework/EngineTest/include/MainMenu.h
trunk/QtOgreFramework/EngineTest/include/Mouse.h
trunk/QtOgreFramework/EngineTest/include/StyleSettingsWidget.h
trunk/QtOgreFramework/EngineTest/media/
trunk/QtOgreFramework/EngineTest/media/materials/
trunk/QtOgreFramework/EngineTest/media/materials/Example_Basic.cg
trunk/QtOgreFramework/EngineTest/media/materials/Examples.program
trunk/QtOgreFramework/EngineTest/media/materials/Jaiqua.material
trunk/QtOgreFramework/EngineTest/media/materials/Robot.material
trunk/QtOgreFramework/EngineTest/media/materials/SkyBox.material
trunk/QtOgreFramework/EngineTest/media/materials/skinningTwoWeightsShadowCasterVp.glsl
trunk/QtOgreFramework/EngineTest/media/materials/skinningTwoWeightsVp.glsl
trunk/QtOgreFramework/EngineTest/media/models/
trunk/QtOgreFramework/EngineTest/media/models/Cube.mesh
trunk/QtOgreFramework/EngineTest/media/models/Sphere.mesh
trunk/QtOgreFramework/EngineTest/media/models/jaiqua.mesh
trunk/QtOgreFramework/EngineTest/media/models/jaiqua.skeleton
trunk/QtOgreFramework/EngineTest/media/models/robot.mesh
trunk/QtOgreFramework/EngineTest/media/models/robot.skeleton
trunk/QtOgreFramework/EngineTest/media/scenes/
trunk/QtOgreFramework/EngineTest/media/scenes/test.scene
trunk/QtOgreFramework/EngineTest/media/textures/
trunk/QtOgreFramework/EngineTest/media/textures/blue_jaiqua.jpg
trunk/QtOgreFramework/EngineTest/media/textures/r2skin.jpg
trunk/QtOgreFramework/EngineTest/media/textures/ruins_bk.png
trunk/QtOgreFramework/EngineTest/media/textures/ruins_dn.png
trunk/QtOgreFramework/EngineTest/media/textures/ruins_fr.png
trunk/QtOgreFramework/EngineTest/media/textures/ruins_lf.png
trunk/QtOgreFramework/EngineTest/media/textures/ruins_rt.png
trunk/QtOgreFramework/EngineTest/media/textures/ruins_up.png
trunk/QtOgreFramework/EngineTest/plugins.cfg.in
trunk/QtOgreFramework/EngineTest/plugins_d.cfg.in
trunk/QtOgreFramework/EngineTest/resources/
trunk/QtOgreFramework/EngineTest/resources/DemoResources.qrc
trunk/QtOgreFramework/EngineTest/resources/icons/
trunk/QtOgreFramework/EngineTest/resources/icons/COPYING
trunk/QtOgreFramework/EngineTest/resources/icons/application-exit.svg
trunk/QtOgreFramework/EngineTest/resources/icons/go-previous.svg
trunk/QtOgreFramework/EngineTest/resources/icons/preferences-system.svg
trunk/QtOgreFramework/EngineTest/resources/icons/utilities-log-viewer.svg
trunk/QtOgreFramework/EngineTest/resources/images/
trunk/QtOgreFramework/EngineTest/resources/images/QtOgreLogo.png
trunk/QtOgreFramework/EngineTest/resources.cfg
trunk/QtOgreFramework/EngineTest/settings.ini
trunk/QtOgreFramework/EngineTest/source/
trunk/QtOgreFramework/EngineTest/source/CameraWrapper.cpp
trunk/QtOgreFramework/EngineTest/source/ChooseMeshWidget.cpp
trunk/QtOgreFramework/EngineTest/source/DemoGameLogic.cpp
trunk/QtOgreFramework/EngineTest/source/Keyboard.cpp
trunk/QtOgreFramework/EngineTest/source/MainMenu.cpp
trunk/QtOgreFramework/EngineTest/source/Mouse.cpp
trunk/QtOgreFramework/EngineTest/source/StyleSettingsWidget.cpp
trunk/QtOgreFramework/EngineTest/source/main.cpp
trunk/QtOgreFramework/EngineTest/ui/
trunk/QtOgreFramework/EngineTest/ui/ChooseMeshWidget.ui
trunk/QtOgreFramework/EngineTest/ui/MainMenu.ui
trunk/QtOgreFramework/EngineTest/ui/StyleSettingsWidget.ui
trunk/QtOgreFramework/EngineTest/ui/coffee.qss
trunk/QtOgreFramework/EngineTest/ui/test.qss
Modified: trunk/QtOgreFramework/CMakeLists.txt
===================================================================
--- trunk/QtOgreFramework/CMakeLists.txt 2010-06-25 20:37:05 UTC (rev 2917)
+++ trunk/QtOgreFramework/CMakeLists.txt 2010-06-26 09:04:00 UTC (rev 2918)
@@ -7,3 +7,4 @@
ADD_SUBDIRECTORY(QtOgre)
ADD_SUBDIRECTORY(Demo)
+ADD_SUBDIRECTORY(EngineTest)
Modified: trunk/QtOgreFramework/Demo/CMakeLists.txt
===================================================================
--- trunk/QtOgreFramework/Demo/CMakeLists.txt 2010-06-25 20:37:05 UTC (rev 2917)
+++ trunk/QtOgreFramework/Demo/CMakeLists.txt 2010-06-26 09:04:00 UTC (rev 2918)
@@ -55,7 +55,7 @@
ADD_EXECUTABLE(Demo ${SRC_FILES} ${MOC_SRCS} ${UI_SRCS} ${RESOURCE_SRCS})
TARGET_LINK_LIBRARIES(Demo ${QT_LIBRARIES} ${OGRE_LIBRARIES} QtOgreStatic)
-ADD_CUSTOM_TARGET(copymedia ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/media ${CMAKE_CURRENT_BINARY_DIR}/media COMMENT "Copying media files to build directory" VERBATIM)
+ADD_CUSTOM_TARGET(copydemomedia ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/media ${CMAKE_CURRENT_BINARY_DIR}/media COMMENT "Copying media files to build directory" VERBATIM)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/settings.ini ${CMAKE_CURRENT_BINARY_DIR}/settings.ini COPYONLY)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/plugins.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/plugins.cfg)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/plugins_d.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/plugins_d.cfg)
Added: trunk/QtOgreFramework/EngineTest/CMakeLists.txt
===================================================================
--- trunk/QtOgreFramework/EngineTest/CMakeLists.txt (rev 0)
+++ trunk/QtOgreFramework/EngineTest/CMakeLists.txt 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,74 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+PROJECT(EngineTest)
+
+SET(SRC_FILES
+ source/CameraWrapper.cpp
+ source/main.cpp
+ source/Mouse.cpp
+ source/ChooseMeshWidget.cpp
+ source/DemoGameLogic.cpp
+ source/Keyboard.cpp
+ source/MainMenu.cpp
+ source/StyleSettingsWidget.cpp
+)
+
+SET(INC_FILES
+ include/CameraWrapper.h
+ include/ChooseMeshWidget.h
+ include/DemoGameLogic.h
+ include/Keyboard.h
+ include/MainMenu.h
+ include/Mouse.h
+ include/StyleSettingsWidget.h
+)
+
+SET(UI_FILES
+ ui/ChooseMeshWidget.ui
+ ui/MainMenu.ui
+ ui/StyleSettingsWidget.ui
+)
+
+SET(RESOURCE_FILES
+ resources/DemoResources.qrc
+)
+
+#"Sources" and "Headers" are the group names in Visual Studio.
+SOURCE_GROUP("Sources" FILES ${SRC_FILES})
+SOURCE_GROUP("Headers" FILES ${INC_FILES})
+
+FIND_PACKAGE(Qt4)
+SET(QT_USE_QTGUI 1)
+SET(QT_USE_QTSCRIPT 1)
+SET(QT_USE_QTSCRIPTTOOLS 1)
+SET(QT_USE_QTXML 1)
+INCLUDE(${QT_USE_FILE})
+
+QT4_WRAP_CPP(MOC_SRCS ${INC_FILES})
+QT4_WRAP_UI(UI_SRCS ${UI_FILES})
+QT4_ADD_RESOURCES(RESOURCE_SRCS ${RESOURCE_FILES})
+
+SET(CMAKE_DEBUG_POSTFIX "_d")
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/../QtOgre/include ${EngineTest_BINARY_DIR} ${EngineTest_BINARY_DIR}/include ${QtOgre_BINARY_DIR} ${OGRE_INCLUDE_DIRS})
+LINK_DIRECTORIES(${OGRE_LIBRARY_DIRS} ${QtOgre_BINARY_DIR})
+ADD_EXECUTABLE(EngineTest ${SRC_FILES} ${MOC_SRCS} ${UI_SRCS} ${RESOURCE_SRCS})
+TARGET_LINK_LIBRARIES(EngineTest ${QT_LIBRARIES} ${OGRE_LIBRARIES} QtOgreStatic)
+
+ADD_CUSTOM_TARGET(copyenginetestmedia ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/media ${CMAKE_CURRENT_BINARY_DIR}/media COMMENT "Copying media files to build directory" VERBATIM)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/settings.ini ${CMAKE_CURRENT_BINARY_DIR}/settings.ini COPYONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/plugins.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/plugins.cfg)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/plugins_d.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/plugins_d.cfg)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/resources.cfg ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg COPYONLY)
+
+IF (WIN32) #Windows
+#CONFIGURE_FILE(${OGRE_LIBRARY_DIRS}/OgreMain_d.dll ${CMAKE_CURRENT_BINARY_DIR}/debug/OgreMain_d.dll COPYONLY)
+#CONFIGURE_FILE(${OGRE_LIBRARY_DIRS}/RenderSystem_GL_d.dll ${CMAKE_CURRENT_BINARY_DIR}/debug/RenderSystem_GL_d.dll COPYONLY)
+#CONFIGURE_FILE(${OGRE_LIBRARY_DIRS}/RenderSystem_Direct3D9_d.dll ${CMAKE_CURRENT_BINARY_DIR}/debug/RenderSystem_Direct3D9_d.dll COPYONLY)
+
+#CONFIGURE_FILE(${OGRE_LIBRARY_DIRS}/OgreMain.dll ${CMAKE_CURRENT_BINARY_DIR}/release/OgreMain.dll COPYONLY)
+#CONFIGURE_FILE(${OGRE_LIBRARY_DIRS}/RenderSystem_GL.dll ${CMAKE_CURRENT_BINARY_DIR}/release/RenderSystem_GL.dll COPYONLY)
+#CONFIGURE_FILE(${OGRE_LIBRARY_DIRS}/RenderSystem_Direct3D9.dll ${CMAKE_CURRENT_BINARY_DIR}/release/RenderSystem_Direct3D9.dll COPYONLY)
+ENDIF (WIN32)
+
+
Added: trunk/QtOgreFramework/EngineTest/include/CameraWrapper.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/CameraWrapper.h (rev 0)
+++ trunk/QtOgreFramework/EngineTest/include/CameraWrapper.h 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,31 @@
+#ifndef CAMERAWRAPPER_H_
+#define CAMERAWRAPPER_H_
+
+#include <OgrePrerequisites.h>
+#include <OgreMath.h>
+
+#include <QObject>
+
+class CameraWrapper : public QObject
+{
+ Q_OBJECT
+
+public:
+ void setOgreCamera(Ogre::Camera* pOgreCamera);
+
+public slots:
+ void moveRelative(const Ogre::Vector3 &vec);
+
+ void yaw (const Ogre::Radian &angle);
+
+ void pitch (const Ogre::Radian &angle);
+
+ Ogre::Radian getFOVy (void) const;
+
+ void setFOVy (const Ogre::Radian& fovy);
+
+private:
+ Ogre::Camera* m_pOgreCamera;
+};
+
+#endif //CAMERAWRAPPER_H_
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/include/ChooseMeshWidget.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/ChooseMeshWidget.h (rev 0)
+++ trunk/QtOgreFramework/EngineTest/include/ChooseMeshWidget.h 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,26 @@
+#ifndef CHOOSEMESHWIDGET_H_
+#define CHOOSEMESHWIDGET_H_
+
+#include "ui_ChooseMeshWidget.h"
+
+#include "OgrePrerequisites.h"
+
+class DemoGameLogic;
+
+class ChooseMeshWidget : public QWidget, private Ui::ChooseMeshWidget
+{
+ Q_OBJECT
+
+public:
+ ChooseMeshWidget(Ogre::Entity* jaiquaEntity, Ogre::Entity* robotEntity, QWidget *parent = 0);
+
+public slots:
+ void on_mJaiquaRadioButton_toggled(bool checked);
+ void on_mRobotRadioButton_toggled(bool checked);
+
+private:
+ Ogre::Entity* mJaiquaEntity;
+ Ogre::Entity* mRobotEntity;
+};
+
+#endif /*CHOOSEMESHWIDGET_H_*/
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/include/DemoGameLogic.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/DemoGameLogic.h (rev 0)
+++ trunk/QtOgreFramework/EngineTest/include/DemoGameLogic.h 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,84 @@
+#ifndef DEMOGAMELOGIC_H_
+#define DEMOGAMELOGIC_H_
+
+#include "CameraWrapper.h"
+#include "ChooseMeshWidget.h"
+#include "GameLogic.h"
+#include "Keyboard.h"
+#include "Mouse.h"
+#include "MainMenu.h"
+
+#include <OgreCamera.h>
+#include <OgrePrerequisites.h>
+
+#include <QHash>
+
+#include <QTime>
+
+#include <QtScript>
+#include <QScriptEngineDebugger>
+
+
+class StyleSettingsWidget;
+
+class DemoGameLogic : public QtOgre::GameLogic
+{
+public:
+ DemoGameLogic(void);
+
+ void initialise(void);
+ void update(void);
+ void shutdown(void);
+
+ void onKeyPress(QKeyEvent* event);
+ void onKeyRelease(QKeyEvent* event);
+
+ void onMouseMove(QMouseEvent* event);
+ void onMousePress(QMouseEvent* event);
+ void onMouseRelease(QMouseEvent* event);
+
+ void onWheel(QWheelEvent* event);
+
+ QtOgre::Log* demoLog(void);
+
+ void loadScene(QString filename);
+
+private:
+ Keyboard keyboard;
+ Mouse mouse;
+ /*QPoint mLastFrameMousePos;
+ QPoint mCurrentMousePos;*/
+
+ /*int mLastFrameWheelPos;
+ int mCurrentWheelPos;*/
+ QTime* mTime;
+
+ int mLastFrameTime;
+ int mCurrentTime;
+
+ bool mIsFirstFrame;
+
+ float mCameraSpeed;
+
+ ChooseMeshWidget* mChooseMeshWidget;
+
+ MainMenu* mMainMenu;
+
+ StyleSettingsWidget* mStyleSettingsWidget;
+
+ Ogre::Camera* mCamera;
+ Ogre::SceneManager* mSceneManager;
+ QtOgre::Log* mDemoLog;
+
+ //Scripting
+ QScriptEngine* scriptEngine;
+ QString updateScript;
+ CameraWrapper cameraWrapper;
+ QScriptValue cameraPositionScriptValue;
+ QScriptValue cameraDirectionScriptValue;
+ QScriptValue cameraRightScriptValue;
+
+ QScriptEngineDebugger debugger;
+};
+
+#endif /*DEMOGAMELOGIC_H_*/
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/include/Keyboard.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/Keyboard.h (rev 0)
+++ trunk/QtOgreFramework/EngineTest/include/Keyboard.h 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,19 @@
+#ifndef KEYBOARD_H_
+#define KEYBOARD_H_
+
+#include <QHash>
+
+class Keyboard : public QObject
+ {
+ Q_OBJECT
+
+ public slots:
+ bool isPressed(int key);
+ void press(int key);
+ void release(int key);
+
+ private:
+ QHash<int, bool> mKeyStates;
+ };
+
+#endif //KEYBOARD_H_
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/include/MainMenu.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/MainMenu.h (rev 0)
+++ trunk/QtOgreFramework/EngineTest/include/MainMenu.h 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,27 @@
+#ifndef MAINMENU_H_
+#define MAINMENU_H_
+
+#include "ui_MainMenu.h"
+
+#include "Application.h"
+
+class MainMenu : public QDialog, private Ui::MainMenu
+{
+ Q_OBJECT
+
+public:
+ MainMenu(QtOgre::Application* application, QWidget* mainWidget, QWidget *parent = 0);
+
+public slots:
+ void on_mQuitButton_clicked(void);
+ void on_mResumeButton_clicked(void);
+ void on_mSettingsButton_clicked(void);
+ void on_mViewLogsButton_clicked(void);
+
+private:
+ QtOgre::Application *mApplication;
+ QWidget* mMainWidget;
+
+};
+
+#endif /*MAINMENU_H_*/
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/include/Mouse.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/Mouse.h (rev 0)
+++ trunk/QtOgreFramework/EngineTest/include/Mouse.h 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,42 @@
+#ifndef MOUSE_H_
+#define MOUSE_H_
+
+#include <QObject>
+#include <QPoint>
+
+class Mouse : public QObject
+{
+ Q_OBJECT
+
+public:
+ Mouse(void);
+
+public slots:
+ bool isPressed(int mouseButton);
+
+ void press(int mouseButton);
+
+ void release(int mouseButton);
+
+ const QPoint& pos(void);
+
+ void setPos(const QPoint& pos);
+
+ QPoint computeDelta(void);
+
+ void resetDelta(void);
+
+ void modifyWheelDelta(int wheelDelta);
+
+ int getWheelDelta(void);
+
+ void resetWheelDelta(void);
+
+private:
+ Qt::MouseButtons mMouseButtons;
+ QPoint mPos;
+ QPoint mOldPos;
+ int mWheelDelta;
+};
+
+#endif //MOUSE_H_
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/include/StyleSettingsWidget.h
===================================================================
--- trunk/QtOgreFramework/EngineTest/include/StyleSettingsWidget.h (rev 0)
+++ trunk/QtOgreFramework/EngineTest/include/StyleSettingsWidget.h 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,25 @@
+#ifndef QTOGRE_STYLESETTINGSWIDGET_H_
+#define QTOGRE_STYLESETTINGSWIDGET_H_
+
+#include "ui_StyleSettingsWidget.h"
+
+#include <AbstractSettingsWidget.h>
+
+class StyleSettingsWidget : public QtOgre::AbstractSettingsWidget, private Ui::StyleSettingsWidget
+{
+ Q_OBJECT
+
+public:
+ StyleSettingsWidget(QWidget *parent = 0);
+
+ void disableFirstTimeOnlySettings(void);
+
+public slots:
+ void readFromSettings(void);
+ void writeToSettings(void);
+
+private slots:
+ void chooseStyleFile(bool);
+};
+
+#endif /*QTOGRE_STYLESETTINGSWIDGET_H_*/
Added: trunk/QtOgreFramework/EngineTest/media/materials/Example_Basic.cg
===================================================================
--- trunk/QtOgreFramework/EngineTest/media/materials/Example_Basic.cg (rev 0)
+++ trunk/QtOgreFramework/EngineTest/media/materials/Example_Basic.cg 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,157 @@
+/*
+ Single-weight-per-vertex hardware skinning, 2 lights
+ The trouble with vertex programs is they're not general purpose, but
+ fixed function hardware skinning is very poorly supported
+*/
+void hardwareSkinningOneWeight_vp(
+ float4 position : POSITION,
+ float3 normal : NORMAL,
+ float2 uv : TEXCOORD0,
+ float blendIdx : BLENDINDICES,
+
+
+ out float4 oPosition : POSITION,
+ out float2 oUv : TEXCOORD0,
+ out float4 colour : COLOR,
+ // Support up to 24 bones of float3x4
+ // vs_1_1 only supports 96 params so more than this is not feasible
+ uniform float3x4 worldMatrix3x4Array[24],
+ uniform float4x4 viewProjectionMatrix,
+ uniform float4 lightPos[2],
+ uniform float4 lightDiffuseColour[2],
+ uniform float4 ambient)
+{
+ // transform by indexed matrix
+ float4 blendPos = float4(mul(worldMatrix3x4Array[blendIdx], position).xyz, 1.0);
+ // view / projection
+ oPosition = mul(viewProjectionMatrix, blendPos);
+ // transform normal
+ float3 norm = mul((float3x3)worldMatrix3x4Array[blendIdx], normal);
+ // Lighting - support point and directional
+ float3 lightDir0 = normalize(
+ lightPos[0].xyz - (blendPos.xyz * lightPos[0].w));
+ float3 lightDir1 = normalize(
+ lightPos[1].xyz - (blendPos.xyz * lightPos[1].w));
+
+ oUv = uv;
+ colour = ambient +
+ (saturate(dot(lightDir0, norm)) * lightDiffuseColour[0]) +
+ (saturate(dot(lightDir1, norm)) * lightDiffuseColour[1]);
+
+}
+
+/*
+ Single-weight-per-vertex hardware skinning, shadow-caster pass
+*/
+void hardwareSkinningOneWeightCaster_vp(
+ float4 position : POSITION,
+ float3 normal : NORMAL,
+ float blendIdx : BLENDINDICES,
+
+
+ out float4 oPosition : POSITION,
+ out float4 colour : COLOR,
+ // Support up to 24 bones of float3x4
+ // vs_1_1 only supports 96 params so more than this is not feasible
+ uniform float3x4 worldMatrix3x4Array[24],
+ uniform float4x4 viewProjectionMatrix,
+ uniform float4 ambient)
+{
+ // transform by indexed matrix
+ float4 blendPos = float4(mul(worldMatrix3x4Array[blendIdx], position).xyz, 1.0);
+ // view / projection
+ oPosition = mul(viewProjectionMatrix, blendPos);
+
+ colour = ambient;
+
+}
+
+/*
+ Two-weight-per-vertex hardware skinning, 2 lights
+ The trouble with vertex programs is they're not general purpose, but
+ fixed function hardware skinning is very poorly supported
+*/
+void hardwareSkinningTwoWeights_vp(
+ float4 position : POSITION,
+ float3 normal : NORMAL,
+ float2 uv : TEXCOORD0,
+ float4 blendIdx : BLENDINDICES,
+ float4 blendWgt : BLENDWEIGHT,
+
+
+ out float4 oPosition : POSITION,
+ out float2 oUv : TEXCOORD0,
+ out float4 colour : COLOR,
+ // Support up to 24 bones of float3x4
+ // vs_1_1 only supports 96 params so more than this is not feasible
+ uniform float3x4 worldMatrix3x4Array[24],
+ uniform float4x4 viewProjectionMatrix,
+ uniform float4 lightPos[2],
+ uniform float4 lightDiffuseColour[2],
+ uniform float4 ambient)
+{
+ // transform by indexed matrix
+ float4 blendPos = float4(0,0,0,0);
+ int i;
+ for (i = 0; i < 2; ++i)
+ {
+ blendPos += float4(mul(worldMatrix3x4Array[blendIdx[i]], position).xyz, 1.0) * blendWgt[i];
+ }
+ // view / projection
+ oPosition = mul(viewProjectionMatrix, blendPos);
+ // transform normal
+ float3 norm = float3(0,0,0);
+ for (i = 0; i < 2; ++i)
+ {
+ norm += mul((float3x3)worldMatrix3x4Array[blendIdx[i]], normal) *
+ blendWgt[i];
+ }
+ norm = normalize(norm);
+ // Lighting - support point and directional
+ float3 lightDir0 = normalize(
+ lightPos[0].xyz - (blendPos.xyz * lightPos[0].w));
+ float3 lightDir1 = normalize(
+ lightPos[1].xyz - (blendPos.xyz * lightPos[1].w));
+
+
+ oUv = uv;
+ colour = float4(0.5, 0.5, 0.5, 1) +
+ (saturate(dot(lightDir0, norm)) * lightDiffuseColour[0]) +
+ (saturate(dot(lightDir1, norm)) * lightDiffuseColour[1]);
+
+}
+
+/*
+ Two-weight-per-vertex hardware skinning, shadow caster pass
+*/
+void hardwareSkinningTwoWeightsCaster_vp(
+ float4 position : POSITION,
+ float3 normal : NORMAL,
+ float2 uv : TEXCOORD0,
+ float4 blendIdx : BLENDINDICES,
+ float4 blendWgt : BLENDWEIGHT,
+
+
+ out float4 oPosition : POSITION,
+ out float4 colour : COLOR,
+ // Support up to 24 bones of float3x4
+ // vs_1_1 only supports 96 params so more than this is not feasible
+ uniform float3x4 worldMatrix3x4Array[24],
+ uniform float4x4 viewProjectionMatrix,
+ uniform float4 ambient)
+{
+ // transform by indexed matrix
+ float4 blendPos = float4(0,0,0,0);
+ int i;
+ for (i = 0; i < 2; ++i)
+ {
+ blendPos += float4(mul(worldMatrix3x4Array[blendIdx[i]], position).xyz, 1.0) * blendWgt[i];
+ }
+ // view / projection
+ oPosition = mul(viewProjectionMatrix, blendPos);
+
+
+ colour = ambient;
+
+
+}
Added: trunk/QtOgreFramework/EngineTest/media/materials/Examples.program
===================================================================
--- trunk/QtOgreFramework/EngineTest/media/materials/Examples.program (rev 0)
+++ trunk/QtOgreFramework/EngineTest/media/materials/Examples.program 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,68 @@
+// Same as below, but for use when rendering texture shadows
+vertex_program Ogre/HardwareSkinningOneWeightShadowCaster cg
+{
+ source Example_Basic.cg
+ entry_point hardwareSkinningOneWeightCaster_vp
+ profiles vs_1_1 arbvp1
+ includes_skeletal_animation true
+}
+// Basic hardware skinning using one indexed weight per vertex
+vertex_program Ogre/HardwareSkinningOneWeight cg
+{
+ source Example_Basic.cg
+ entry_point hardwareSkinningOneWeight_vp
+ profiles vs_1_1 arbvp1
+ includes_skeletal_animation true
+}
+
+// Basic hardware skinning using two indexed weights per vertex
+vertex_program Ogre/HardwareSkinningTwoWeightsCg cg
+{
+ source Example_Basic.cg
+ entry_point hardwareSkinningTwoWeights_vp
+ profiles vs_1_1 arbvp1
+ includes_skeletal_animation true
+}
+
+vertex_program Ogre/HardwareSkinningTwoWeightsGLSL glsl
+{
+ source skinningTwoWeightsVp.glsl
+ includes_skeletal_animation true
+}
+
+vertex_program Ogre/HardwareSkinningTwoWeights unified
+{
+ delegate Ogre/HardwareSkinningTwoWeightsGLSL
+ delegate Ogre/HardwareSkinningTwoWeightsCg
+
+ default_params
+ {
+ param_named_auto worldMatrix3x4Array world_matrix_array_3x4
+ param_named_auto viewProjectionMatrix viewproj_matrix
+ param_named_auto lightPos[0] light_position 0
+ param_named_auto lightPos[1] light_position 1
+ param_named_auto lightDiffuseColour[0] light_diffuse_colour 0
+ param_named_auto lightDiffuseColour[1] light_diffuse_colour 1
+ }
+}
+
+// Same as below, but for use when rendering texture shadows
+vertex_program Ogre/HardwareSkinningTwoWeightsShadowCasterCg cg
+{
+ source Example_Basic.cg
+ entry_point hardwareSkinningTwoWeightsCaster_vp
+ profiles vs_1_1 arbvp1
+ includes_skeletal_animation true
+}
+
+vertex_program Ogre/HardwareSkinningTwoWeightsShadowCasterGLSL glsl
+{
+ source skinningTwoWeightsShadowCasterVp.glsl
+ includes_skeletal_animation true
+}
+
+vertex_program Ogre/HardwareSkinningTwoWeightsShadowCaster unified
+{
+ delegate Ogre/HardwareSkinningTwoWeightsShadowCasterGLSL
+ delegate Ogre/HardwareSkinningTwoWeightsShadowCasterCg
+}
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/media/materials/Jaiqua.material
===================================================================
--- trunk/QtOgreFramework/EngineTest/media/materials/Jaiqua.material (rev 0)
+++ trunk/QtOgreFramework/EngineTest/media/materials/Jaiqua.material 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,42 @@
+material jaiqua
+{
+ // Hardware skinning techniique
+ technique
+ {
+ pass
+ {
+ vertex_program_ref Ogre/HardwareSkinningTwoWeights
+ {
+
+ }
+ // alternate shadow caster program
+ shadow_caster_vertex_program_ref Ogre/HardwareSkinningTwoWeightsShadowCaster
+ {
+ param_named_auto worldMatrix3x4Array world_matrix_array_3x4
+ param_named_auto viewProjectionMatrix viewproj_matrix
+ param_named_auto ambient ambient_light_colour
+
+ }
+
+ texture_unit
+ {
+ texture blue_jaiqua.jpg
+ tex_address_mode clamp
+ }
+ }
+ }
+
+ // Software blending technique
+ technique
+ {
+ pass
+ {
+ texture_unit
+ {
+ texture blue_jaiqua.jpg
+ tex_address_mode clamp
+ }
+ }
+ }
+
+}
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/media/materials/Robot.material
===================================================================
--- trunk/QtOgreFramework/EngineTest/media/materials/Robot.material (rev 0)
+++ trunk/QtOgreFramework/EngineTest/media/materials/Robot.material 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,47 @@
+material Examples/Robot
+{
+ // Hardware skinning techniique
+ technique
+ {
+ pass
+ {
+ vertex_program_ref Ogre/HardwareSkinningOneWeight
+ {
+ param_named_auto worldMatrix3x4Array world_matrix_array_3x4
+ param_named_auto viewProjectionMatrix viewproj_matrix
+ param_named_auto lightPos[0] light_position 0
+ param_named_auto lightPos[1] light_position 1
+ param_named_auto lightDiffuseColour[0] light_diffuse_colour 0
+ param_named_auto lightDiffuseColour[1] light_diffuse_colour 1
+ param_named_auto ambient ambient_light_colour
+
+ }
+ // alternate shadow caster program
+ shadow_caster_vertex_program_ref Ogre/HardwareSkinningOneWeightShadowCaster
+ {
+ param_named_auto worldMatrix3x4Array world_matrix_array_3x4
+ param_named_auto viewProjectionMatrix viewproj_matrix
+ param_named_auto ambient ambient_light_colour
+
+ }
+
+ texture_unit
+ {
+ texture r2skin.jpg
+ }
+ }
+ }
+
+ // Software blending technique
+ technique
+ {
+ pass
+ {
+
+ texture_unit
+ {
+ texture r2skin.jpg
+ }
+ }
+ }
+}
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/media/materials/SkyBox.material
===================================================================
--- trunk/QtOgreFramework/EngineTest/media/materials/SkyBox.material (rev 0)
+++ trunk/QtOgreFramework/EngineTest/media/materials/SkyBox.material 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,17 @@
+material SkyBox
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+
+ texture_unit
+ {
+ cubic_texture ruins.png separateUV
+ tex_address_mode clamp
+ }
+ }
+ }
+}
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/media/materials/skinningTwoWeightsShadowCasterVp.glsl
===================================================================
--- trunk/QtOgreFramework/EngineTest/media/materials/skinningTwoWeightsShadowCasterVp.glsl (rev 0)
+++ trunk/QtOgreFramework/EngineTest/media/materials/skinningTwoWeightsShadowCasterVp.glsl 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,42 @@
+// Example GLSL program for skinning with two bone weights per vertex
+
+attribute vec4 vertex;
+attribute vec4 uv0;
+attribute vec4 blendIndices;
+attribute vec4 blendWeights;
+
+// 3x4 matrix, passed as vec4's for compatibility with GL 2.0
+// GL 2.0 supports 3x4 matrices
+// Support 24 bones ie 24*3, but use 72 since our parser can pick that out for sizing
+uniform vec4 worldMatrix3x4Array[72];
+uniform mat4 viewProjectionMatrix;
+uniform vec4 ambient;
+
+void main()
+{
+ vec3 blendPos = vec3(0,0,0);
+
+ for (int bone = 0; bone < 2; ++bone)
+ {
+ // perform matrix multiplication manually since no 3x4 matrices
+ // ATI GLSL compiler can't handle indexing an array within an array so calculate the inner index first
+ int idx = int(blendIndices[bone]) * 3;
+ // ATI GLSL compiler can't handle unrolling the loop so do it manually
+ // ATI GLSL has better performance when mat4 is used rather than using individual dot product
+ // There is a bug in ATI mat4 constructor (Cat 7.2) when indexed uniform array elements are used as vec4 parameter so manually assign
+ mat4 worldMatrix;
+ worldMatrix[0] = worldMatrix3x4Array[idx];
+ worldMatrix[1] = worldMatrix3x4Array[idx + 1];
+ worldMatrix[2] = worldMatrix3x4Array[idx + 2];
+ worldMatrix[3] = vec4(0);
+ // now weight this into final
+ blendPos += (vertex * worldMatrix).xyz * blendWeights[bone];
+ }
+
+ // apply view / projection to position
+ gl_Position = viewProjectionMatrix * vec4(blendPos, 1);
+
+ gl_FrontSecondaryColor = vec4(0,0,0,0);
+ gl_FrontColor = ambient;
+ gl_TexCoord[0] = uv0;
+}
Added: trunk/QtOgreFramework/EngineTest/media/materials/skinningTwoWeightsVp.glsl
===================================================================
--- trunk/QtOgreFramework/EngineTest/media/materials/skinningTwoWeightsVp.glsl (rev 0)
+++ trunk/QtOgreFramework/EngineTest/media/materials/skinningTwoWeightsVp.glsl 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,60 @@
+// Example GLSL program for skinning with two bone weights per vertex
+
+attribute vec4 vertex;
+attribute vec3 normal;
+attribute vec4 uv0;
+attribute vec4 blendIndices;
+attribute vec4 blendWeights;
+
+// 3x4 matrix, passed as vec4's for compatibility with GL 2.0
+// GL 2.0 supports 3x4 matrices
+// Support 24 bones ie 24*3, but use 72 since our parser can pick that out for sizing
+uniform vec4 worldMatrix3x4Array[72];
+uniform mat4 viewProjectionMatrix;
+uniform vec4 lightPos[2];
+uniform vec4 lightDiffuseColour[2];
+
+void main()
+{
+ vec3 blendPos = vec3(0,0,0);
+ vec3 blendNorm = vec3(0,0,0);
+
+ for (int bone = 0; bone < 2; ++bone)
+ {
+ // perform matrix multiplication manually since no 3x4 matrices
+ // ATI GLSL compiler can't handle indexing an array within an array so calculate the inner index first
+ int idx = int(blendIndices[bone]) * 3;
+ // ATI GLSL compiler can't handle unrolling the loop so do it manually
+ // ATI GLSL has better performance when mat4 is used rather than using individual dot product
+ // There is a bug in ATI mat4 constructor (Cat 7.2) when indexed uniform array elements are used as vec4 parameter so manually assign
+ mat4 worldMatrix;
+ worldMatrix[0] = worldMatrix3x4Array[idx];
+ worldMatrix[1] = worldMatrix3x4Array[idx + 1];
+ worldMatrix[2] = worldMatrix3x4Array[idx + 2];
+ worldMatrix[3] = vec4(0);
+ // now weight this into final
+ float weight = blendWeights[bone];
+ blendPos += (vertex * worldMatrix).xyz * weight;
+
+ mat3 worldRotMatrix = mat3(worldMatrix[0].xyz, worldMatrix[1].xyz, worldMatrix[2].xyz);
+ blendNorm += (normal * worldRotMatrix) * weight;
+
+ }
+
+ // apply view / projection to position
+ gl_Position = viewProjectionMatrix * vec4(blendPos, 1);
+
+ // simple vertex lighting model
+ vec3 lightDir0 = normalize(
+ lightPos[0].xyz - (blendPos.xyz * lightPos[0].w));
+ vec3 lightDir1 = normalize(
+ lightPos[1].xyz - (blendPos.xyz * lightPos[1].w));
+
+ gl_FrontSecondaryColor = vec4(0);
+ gl_FrontColor = vec4(0.5, 0.5, 0.5, 1.0)
+ + clamp(dot(lightDir0, blendNorm), 0.0, 1.0) * lightDiffuseColour[0]
+ + clamp(dot(lightDir1, blendNorm), 0.0, 1.0) * lightDiffuseColour[1];
+
+ gl_TexCoord[0] = uv0;
+
+}
Added: trunk/QtOgreFramework/EngineTest/media/models/Cube.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/models/Cube.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/models/Sphere.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/models/Sphere.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/models/jaiqua.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/models/jaiqua.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/models/jaiqua.skeleton
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/models/jaiqua.skeleton
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/models/robot.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/models/robot.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/models/robot.skeleton
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/models/robot.skeleton
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/scenes/test.scene
===================================================================
--- trunk/QtOgreFramework/EngineTest/media/scenes/test.scene (rev 0)
+++ trunk/QtOgreFramework/EngineTest/media/scenes/test.scene 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,71 @@
+<?xml version="1.0" standalone="yes"?>
+<scene formatVersion="2.0">
+ <environment>
+ <skyBox material="SkyBox" distance="100.0" drawFirst="true">
+ <rotation qw="0" qx="0" qy="1" qz="0"/>
+ </skyBox>
+ </environment>
+ <nodes>
+ <node name="CameraNode">
+ <camera name="Camera" fov="1.0">
+ <position x="0" y="0" z="20" />
+ <lookTarget>
+ <position x="0" y="0" z="0" />
+ </lookTarget>
+ </camera>
+ </node>
+ <node name="CubeNode">
+ <scale x="0.02" y="0.02" z="0.02" />
+ <rotation qw="0" qx="0" qy="1" qz="0"/>
+ <position x="-5" y="0" z="0" />
+ <entity meshFile="Cube.mesh" name="Cube" castShadows="True"/>
+ <node name="JaiquaNode0">
+ <scale x="7" y="7" z="7" />
+ <position x="-150" y="-200" z="50" />
+ <entity meshFile="jaiqua.mesh" name="Jaiqua0" castShadows="True"/>
+ <node name="JaiquaNode1">
+ <position x="40" y="0" z="0" />
+ <entity meshFile="jaiqua.mesh" name="Jaiqua1" castShadows="True"/>
+ <node name="JaiquaNode2">
+ <position x="0" y="40" z="0" />
+ <entity meshFile="jaiqua.mesh" name="Jaiqua2" castShadows="True"/>
+ <node name="JaiquaNode3">
+ <position x="-40" y="0" z="0" />
+ <entity meshFile="jaiqua.mesh" name="Jaiqua3" castShadows="True"/>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ <node name="SphereNode">
+ <scale x="0.02" y="0.02" z="0.02" />
+ <position x="5" y="0" z="0" />
+ <entity meshFile="Sphere.mesh" name="Sphere" castShadows="True"/>
+ </node>
+ <node name="RobotNode0">
+ <scale x="0.03" y="0.03" z="0.03" />
+ <rotation qw="0.707" qx="0" qy="-0.707" qz="0"/>
+ <position x="8" y="-1" z="0" />
+ <entity meshFile="robot.mesh" name="Robot0" castShadows="True"/>
+ </node>
+ <node name="RobotNode1">
+ <scale x="0.03" y="0.03" z="0.03" />
+ <rotation qw="0.707" qx="0" qy="-0.707" qz="0"/>
+ <position x="2" y="-1" z="0" />
+ <entity meshFile="robot.mesh" name="Robot1" castShadows="True"/>
+ </node>
+ <node name="RobotNode2">
+ <scale x="0.03" y="0.03" z="0.03" />
+ <rotation qw="0.707" qx="0" qy="-0.707" qz="0"/>
+ <position x="5" y="2" z="0" />
+ <entity meshFile="robot.mesh" name="Robot2" castShadows="True"/>
+ </node>
+ <node name="RobotNode3">
+ <scale x="0.03" y="0.03" z="0.03" />
+ <rotation qw="0.707" qx="0" qy="-0.707" qz="0"/>
+ <position x="5" y="-4" z="0" />
+ <entity meshFile="robot.mesh" name="Robot3" castShadows="True"/>
+ </node>
+
+ </nodes>
+</scene>
Added: trunk/QtOgreFramework/EngineTest/media/textures/blue_jaiqua.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/textures/blue_jaiqua.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/textures/r2skin.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/textures/r2skin.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/textures/ruins_bk.png
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/textures/ruins_bk.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/textures/ruins_dn.png
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/textures/ruins_dn.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/textures/ruins_fr.png
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/textures/ruins_fr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/textures/ruins_lf.png
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/textures/ruins_lf.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/textures/ruins_rt.png
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/textures/ruins_rt.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/media/textures/ruins_up.png
===================================================================
(Binary files differ)
Property changes on: trunk/QtOgreFramework/EngineTest/media/textures/ruins_up.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/QtOgreFramework/EngineTest/plugins.cfg.in
===================================================================
--- trunk/QtOgreFramework/EngineTest/plugins.cfg.in (rev 0)
+++ trunk/QtOgreFramework/EngineTest/plugins.cfg.in 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,8 @@
+# Defines plugins to load
+
+# Define plugin folder
+PluginFolder=${OGRESDK}/bin/release
+
+# Define plugins
+Plugin=RenderSystem_GL
+Plugin=RenderSystem_Direct3D9
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/plugins_d.cfg.in
===================================================================
--- trunk/QtOgreFramework/EngineTest/plugins_d.cfg.in (rev 0)
+++ trunk/QtOgreFramework/EngineTest/plugins_d.cfg.in 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,8 @@
+# Defines plugins to load
+
+# Define plugin folder
+PluginFolder=${OGRESDK}/bin/debug
+
+# Define plugins
+Plugin=RenderSystem_GL_d
+Plugin=RenderSystem_Direct3D9_d
\ No newline at end of file
Added: trunk/QtOgreFramework/EngineTest/resources/DemoResources.qrc
===================================================================
--- trunk/QtOgreFramework/EngineTest/resources/DemoResources.qrc (rev 0)
+++ trunk/QtOgreFramework/EngineTest/resources/DemoResources.qrc 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,9 @@
+<RCC>
+ <qresource>
+ <file>images/QtOgreLogo.png</file>
+ <file>icons/application-exit.svg</file>
+ <file>icons/go-previous.svg</file>
+ <file>icons/preferences-system.svg</file>
+ <file>icons/utilities-log-viewer.svg</file>
+ </qresource>
+</RCC>
Added: trunk/QtOgreFramework/EngineTest/resources/icons/COPYING
===================================================================
--- trunk/QtOgreFramework/EngineTest/resources/icons/COPYING (rev 0)
+++ trunk/QtOgreFramework/EngineTest/resources/icons/COPYING 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,48 @@
+The Oxygen Icon Theme
+ Copyright (C) 2007 David Vignoni <da...@ic...>
+ Copyright (C) 2007 Johann Ollivier Lapeyre <jo...@ox...>
+ Copyright (C) 2007 Kenneth Wimer <kw...@bo...>
+ Copyright (C) 2007 Nuno Fernades Pinheiro <nf....@gm...>
+ Copyright (C) 2007 Riccardo Iaconelli <ric...@ox...>
+ Copyright (C) 2007 David Miller <mi...@ox...>
+
+and others
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+Clarification:
+
+ The GNU Lesser General Public License or LGPL is written for
+ software libraries in the first place. We expressly want the LGPL to
+ be valid for this artwork library too.
+
+ KDE Oxygen theme icons is a special kind of software library, it is an
+ artwork library, it's elements can be used in a Graphical User Interface, or
+ GUI.
+
+ Source code, for this library means:
+ - where they exist, SVG;
+ - otherwise, if applicable, the multi-layered formats xcf or psd, or
+ otherwise png.
+
+ The LGPL in some sections obliges you to make the files carry
+ notices. With images this is in some cases impossible or hardly useful.
+
+ With this library a notice is placed at a prominent place in the directory
+ containing the elements. You may follow this practice.
+
+ The exception in section 5 of the GNU Lesser General Public License covers
+ the use of elements of this art library in a GUI.
+
+ kde-artists [at] kde.org
Added: trunk/QtOgreFramework/EngineTest/resources/icons/application-exit.svg
===================================================================
--- trunk/QtOgreFramework/EngineTest/resources/icons/application-exit.svg (rev 0)
+++ trunk/QtOgreFramework/EngineTest/resources/icons/application-exit.svg 2010-06-26 09:04:00 UTC (rev 2918)
@@ -0,0 +1,787 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="128"
+ height="128"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45+devel"
+ version="1.0"
+ sodipodi:docbase="/home/david/Oxygen/kdelibs/scalable/actions"
+ sodipodi:docname="application-exit.svgz"
+ inkscape:output_extension="org.inkscape.output.svgz.inkscape"
+ inkscape:export-filename="/home/david/Oxygen/kdelibs/scalable/actions/rss.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3021">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3023" />
+ <stop
+ id="stop3029"
+ offset="0.5"
+ style="stop-color:#000000;stop-opacity:0.15636364;" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.68727273;"
+ offset="0.62264121"
+ id="stop3031" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.36363637;"
+ offset="1"
+ id="stop3025" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2990">
+ <stop
+ style="stop-color:#cccccc;stop-opacity:1;"
+ offset="0"
+ id="stop2992" />
+ <stop
+ style="stop-color:#f1f1f1;stop-opacity:1;"
+ offset="1"
+ id="stop2994" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3237">
+ <stop
+ style="stop-color:#ffeb8b;stop-opacity:1;"
+ offset="0"
+ id="stop3239" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3241" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6674">
+ <stop
+ style="stop-color:#bf0000;stop-opacity:1;"
+ offset="0"
+ id="stop6676" />
+ <stop
+ style="stop-color:#ff1111;stop-opacity:0;"
+ offset="1"
+ id="stop6678" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6666">
+ <stop
+ id="stop6668"
+ offset="0"
+ style="stop-color:#ff5900;stop-opacity:1;" />
+ <stop
+ id="stop6670"
+ offset="1"
+ style="stop-color:#8d0000;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6643">
+ <stop
+ style="stop-color:#ff6565;stop-opacity:1;"
+ offset="0"
+ id="stop6645" />
+ <stop
+ style="stop-color:#ffdfbf;stop-opacity:0;"
+ offset="1"
+ id="stop6647" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6631">
+ <stop
+ style="stop-color:#703700;stop-opacity:1;"
+ offset="0"
+ id="stop6633" />
+ <stop
+ style="stop-color:#bf5e00;stop-opacity:0;"
+ offset="1"
+ id="stop6635" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6610">
+ <stop
+ style="stop-color:#ffbf80;stop-opacity:1;"
+ offset="0"
+ id="stop6612" />
+ <stop
+ style="stop-color:#ffbf80;stop-opacity:0;"
+ offset="1"
+ id="stop6614" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6446">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop6448" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop6450" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6404">
+ <stop
+ style="stop-color:#770000;stop-opacity:1;"
+ offset="0"
+ id="stop6406" />
+ <stop
+ style="stop-color:#c10000;stop-opacity:1;"
+ offset="1"
+ id="stop6408" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9643">
+ <stop
+ style="stop-color:#ff0000;stop-opacity:1;"
+ offset="0"
+ id="stop9645" />
+ <stop
+ style="stop-color:#620000;stop-opacity:1;"
+ offset="1"
+ id="stop9647" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9643"
+ id="radialGradient9651"
+ cx="12.040753"
+ cy="118.14538"
+ fx="12.040753"
+ fy="118.14538"
+ r="42.559486"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="reflect"
+ gradientTransform="matrix(1.7951011,0,0,1.7951011,-9.5736166,-93.937523)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6666"
+ id="radialGradient9692"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.1890799,0,0,1.1890799,-114.77413,-31.375729)"
+ spreadMethod="pad"
+ cx="42.700352"
+ cy="103.5803"
+ fx="42.700352"
+ fy="103.5803"
+ r="42.559486" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6404"
+ id="linearGradient6410"
+ x1="39.741936"
+ y1="113.54839"
+ x2="11.458064"
+ y2="13.006452"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6446"
+ id="linearGradient6452"
+ x1="21.094994"
+ y1="21.101994"
+ x2="15.189133"
+ y2="27.007854"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="reflect"
+ gradientTransform="translate(-7.5870968,-7.3806452)" />
+ <filter
+ inkscape:collect="always"
+ id="filter6458">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.28444187"
+ id="feGaussianBlur6460" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6446"
+ id="linearGradient6464"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.4129032,0.6193548)"
+ spreadMethod="reflect"
+ x1="21.094994"
+ y1="21.101994"
+ x2="15.126888"
+ y2="27.070099" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6446"
+ id="linearGradient6470"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.4129032,0.6193548)"
+ spreadMethod="reflect"
+ x1="21.094994"
+ y1="21.101994"
+ x2="13.96104"
+ y2="28.235947" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6446"
+ id="linearGradient6472"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.4129032,0.6193548)"
+ spreadMethod="reflect"
+ x1="21.094994"
+ y1="21.101994"
+ x2="13.96104"
+ y2="28.235947" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6631"
+ id="linearGradient6637"
+ x1="55.329033"
+ y1="112"
+ x2="55.329033"
+ y2="74.913147"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6643"
+ id="linearGradient6649"
+ x1="62.038712"
+ y1="15.91371"
+ x2="62.038712"
+ y2="50.728985"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6610"
+ id="linearGradient6655"
+ gradientUnits="userSpaceOnUse"
+ x1="59.225807"
+ y1="20.283871"
+ x2="59.225807"
+ y2="117.32368"
+ gradientTransform="translate(0,1.6516129)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6610"
+ id="linearGradient6657"
+ gradientUnits="userSpaceOnUse"
+ x1="59.225807"
+ y1="20.283871"
+ x2="59.225807"
+ y2="117.32368" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6674"
+ id="linearGradient6680"
+ x1="19.096775"
+ y1="50.580647"
+ x2="80.047699"
+ y2="66.897575"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6446"
+ id="linearGradient2816"
+ gradientUnits="userSpaceOnUse"
+ x1="59.225807"
+ y1="-31.712746"
+ x2="59.225807"
+ y2="98.167175" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6446"
+ id="linearGradient3209"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.2623629,1)"
+ x1="59.225807"
+ y1="7.8973217"
+ x2="59.225807"
+ y2="46.228859" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6446"
+ id="linearGradient3225"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.2332229,1.9150941)"
+ x1="92.848534"
+ y1="60.664852"
+ x2="31.376678"
+ y2="21.03125" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6446"
+ id="linearGradient3231"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.2623629,1)"
+ x1="59.225807"
+ y1="7.8973217"
+ x2="59.225807"
+ y2="46.228859" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6446"
+ id="linearGradient3233"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.2332229,1.9150941)"
+ x1="115.76678"
+ y1="71.084908"
+ x2="31.376678"
+ y2="21.03125" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3237"
+ id="linearGradient3243"
+ x1="-60.945251"
+ y1="105.83054"
+ x2="-59.415245"
+ y2="45.631207"
+ gradientUnits="userSpaceOnUse" />
+ <filter
+ inkscape:collect="always"
+ id="filter3281">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.32872878"
+ id="feGaussianBlur3283" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6674"
+ id="linearGradient3289"
+ gradientUnits="userSpaceOnUse"
+ x1="60.402065"
+ y1="64.076149"
+ x2="60.402065"
+ y2="-20.962214" />
+ <filter
+ inkscape:collect="always"
+ id="filter3319">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="1.6179775"
+ id="feGaussianBlur3321" />
+ </filter>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2990"
+ id="radialGradient3000"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.712348,-0.1260581,0.1345724,0.7604617,-100.53448,20.174132)"
+ spreadMethod="reflect"
+ cx="64"
+ cy="81.325775"
+ fx="66.881805"
+ fy="105.27442"
+ r="43.474762" />
+ <filter
+ inkscape:collect="always"
+ id="filter3035">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.60200945"
+ id="feGaussianBlur3037" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter3104">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.4217763"
+ id="feGaussianBlur3106" />
+ </filter>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath3108">
+ <path
+ style="fill:url(#radialGradient3112);fill-opacity:1;stroke:none;stroke-width:16.49500084;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4.15;stroke-opacity:1"
+ d="M -166.22608,25.639042 C -168.37082,25.690988 -170.41095,26.576535 -171.91358,28.107792 C -188.83826,45.032475 -188.83826,72.745609 -171.91358,89.670296 C -154.9889,106.59499 -127.27576,106.59498 -110.35108,89.670296 C -93.426397,72.745608 -93.426407,45.032476 -110.35108,28.107792 C -113.57849,24.889007 -118.78854,24.911628 -122.00733,28.139042 C -125.22611,31.366456 -125.23474,36.576507 -122.00733,39.795292 C -111.39346,50.409165 -111.39346,67.400168 -122.00733,78.014046 C -132.62121,88.627926 -149.64346,88.627916 -160.25733,78.014046 C -170.8712,67.400167 -170.8712,50.409167 -160.25733,39.795292 C -157.82392,37.426791 -157.09428,33.799307 -158.41358,30.670292 C -159.73287,27.541276 -162.83146,25.550254 -166.22608,25.639042 z M -141.25733,26.357792 C -145.38715,26.426713 -148.68411,29.821465 -148.63233,33.951542 L -148.63233,65.951542 C -148.67058,68.656311 -147.24981,71.181744 -144.91358,72.545292 C -142.57735,73.908838 -139.68731,73.90884 -137.35108,72.545292 C -135.01484,71.181742 -133.59407,68.656311 -133.63233,65.951542 L -133.63233,33.951542 C -133.60691,31.924427 -134.41464,29.975845 -135.85108,28.545292 C -137.28752,27.114738 -139.23033,26.324051 -141.25733,26.357792 z"
+ id="path3110" />
+ </clipPath>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2990"
+ id="radialGradient3112"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.712348,-0.1260581,0.1345724,0.7604617,-197.66681,20.174132)"
+ spreadMethod="reflect"
+ cx="64"
+ cy="81.325775"
+ fx="66.881805"
+ fy="105.27442"
+ r="43.474762" />
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath3114">
+ <path
+ id="path3116"
+ d="M -69.09375,25.639042 C -71.238499,25.690988 -73.27862,26.576535 -74.78125,28.107792 C -91.705938,45.032475 -91.705939,72.745609 -74.78125,89.670296 C -57.856572,106.59499 -30.143439,106.59498 -13.21875,89.670296 C 3.70593,72.745608 3.70592,45.032476 -13.21875,28.107792 C -16.446164,24.889007 -21.656215,24.911628 -24.875,28.139042 C -28.093785,31.366456 -28.102414,36.576507 -24.875,39.795292 C -14.261134,50.409165 -14.261131,67.400168 -24.875,78.014046 C -35.488884,88.627926 -52.51113,88.627916 -63.125,78.014046 C -73.738879,67.400167 -73.738878,50.409167 -63.125,39.795292 C -60.691591,37.426791 -59.961952,33.799307 -61.28125,30.670292 C -62.600548,27.541276 -65.699137,25.550254 -69.09375,25.639042 z M -44.125,26.357792 C -48.254827,26.426713 -51.551787,29.821465 -51.5,33.951542 L -51.5,65.951542 C -51.538252,68.656311 -50.117481,71.181744 -47.78125,72.545292 C -45.44502,73.908838 -42.554982,73.90884 -40.21875,72.545292 C -37.882517,71.181742 -36.461748,68.656311 -36.5,65.951542 L -36.5,33.951542 C -36.474583,31.924427 -37.28231,29.975845 -38.71875,28.545292 C -40.155192,27.114738 -42.098006,26.324051 -44.125,26.357792 z"
+ style="fill:url(#radialGradient3118);fill-opacity:1;stroke:none;stroke-width:16.49500084;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4.15;stroke-opacity:1" />
+ </clipPath>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2990"
+ id="radialGradient3118"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.712348,-0.1260581,0.1345724,0.7604617,-100.53448,20.174132)"
+ spreadMethod="reflect"
+ cx="64"
+ cy="81.325775"
+ fx="66.881805"
+ fy="105.27442"
+ r="43.474762" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2990"
+ id="radialGradient2394"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.712348,-0.1260581,0.1345724,0.7604617,7.4655205,20.174132)"
+ spreadMethod="reflect"
+ cx="64"
+ cy="81.325775"
+ fx="66.881805"
+ fy="105.27442"
+ r="43.474762" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2990"
+ id="radialGradient2984"
+ cx="-20"
...
[truncated message content] |
|
From: <kal...@us...> - 2010-06-25 20:37:14
|
Revision: 2917
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2917&view=rev
Author: kallaspriit
Date: 2010-06-25 20:37:05 +0000 (Fri, 25 Jun 2010)
Log Message:
-----------
Updated VS2008 project files for Ogre 1.7.1
Modified Paths:
--------------
branches/ogrenewt/newton20/demos/Demo01_TheBasics/Demo01_TheBasics.vcproj
branches/ogrenewt/newton20/demos/Demo02_Joints/Demo02_Joints.vcproj
branches/ogrenewt/newton20/demos/Demo03_CollisionCallbacks/Demo03_CollisionCallbacks.vcproj
branches/ogrenewt/newton20/demos/Demo04_Raycasting/Demo04_Raycasting.vcproj
branches/ogrenewt/newton20/demos/Demo05_SimpleVehicle/Demo05_SimpleVehicle.vcproj
branches/ogrenewt/newton20/demos/Demo06_SimpleBuoyancy/Demo06_SimpleBuoyancy.vcproj
branches/ogrenewt/newton20/demos/Demo07_CustomJoints/Demo07_CustomJoints.vcproj
branches/ogrenewt/newton20/demos/Demo08_RagdollExample/Demo08_RagdollExample.vcproj
branches/ogrenewt/newton20/demos/Demo09_PlayerController/Demo09_PlayerController.vcproj
branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj
Modified: branches/ogrenewt/newton20/demos/Demo01_TheBasics/Demo01_TheBasics.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/Demo01_TheBasics/Demo01_TheBasics.vcproj 2010-06-25 18:14:37 UTC (rev 2916)
+++ branches/ogrenewt/newton20/demos/Demo01_TheBasics/Demo01_TheBasics.vcproj 2010-06-25 20:37:05 UTC (rev 2917)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)\";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_HOME)\include\OGRE""
+ AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)\";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\include\OGRE""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(NEWTON_HOME)\sdk\x32\dll_vs9";"$(OGRE_HOME)\lib\debug""
+ AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(NEWTON_HOME)\sdk\x32\dll_vs9";"$(OGRE_HOME)\lib\debug";"$(OGRE_BUILD_HOME)\lib\Debug""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -117,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -138,7 +138,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Release";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: branches/ogrenewt/newton20/demos/Demo02_Joints/Demo02_Joints.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/Demo02_Joints/Demo02_Joints.vcproj 2010-06-25 18:14:37 UTC (rev 2916)
+++ branches/ogrenewt/newton20/demos/Demo02_Joints/Demo02_Joints.vcproj 2010-06-25 20:37:05 UTC (rev 2917)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(BOOST_HOME)\";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include\OGRE";"$(OGRE_HOME)\include";..\..\inc;."
+ AdditionalIncludeDirectories=""$(BOOST_HOME)\";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include\OGRE";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";..\..\inc;."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(OGRE_BUILD_HOME)\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -117,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -138,7 +138,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Release";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: branches/ogrenewt/newton20/demos/Demo03_CollisionCallbacks/Demo03_CollisionCallbacks.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/Demo03_CollisionCallbacks/Demo03_CollisionCallbacks.vcproj 2010-06-25 18:14:37 UTC (rev 2916)
+++ branches/ogrenewt/newton20/demos/Demo03_CollisionCallbacks/Demo03_CollisionCallbacks.vcproj 2010-06-25 20:37:05 UTC (rev 2917)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_HOME)\include\OGRE""
+ AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\include\OGRE""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(OGRE_BUILD_HOME)\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -117,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -138,7 +138,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Release";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: branches/ogrenewt/newton20/demos/Demo04_Raycasting/Demo04_Raycasting.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/Demo04_Raycasting/Demo04_Raycasting.vcproj 2010-06-25 18:14:37 UTC (rev 2916)
+++ branches/ogrenewt/newton20/demos/Demo04_Raycasting/Demo04_Raycasting.vcproj 2010-06-25 20:37:05 UTC (rev 2917)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_HOME)\include\OGRE""
+ AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\include\OGRE""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(OGRE_BUILD_HOME)\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -117,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";C:\OgreSDK\include\CEGUI;"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";C:\OgreSDK\include\CEGUI;"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -138,7 +138,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Release";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: branches/ogrenewt/newton20/demos/Demo05_SimpleVehicle/Demo05_SimpleVehicle.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/Demo05_SimpleVehicle/Demo05_SimpleVehicle.vcproj 2010-06-25 18:14:37 UTC (rev 2916)
+++ branches/ogrenewt/newton20/demos/Demo05_SimpleVehicle/Demo05_SimpleVehicle.vcproj 2010-06-25 20:37:05 UTC (rev 2917)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_HOME)\include\OGRE""
+ AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\include\OGRE""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(OGRE_BUILD_HOME)\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -117,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -138,7 +138,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Release";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: branches/ogrenewt/newton20/demos/Demo06_SimpleBuoyancy/Demo06_SimpleBuoyancy.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/Demo06_SimpleBuoyancy/Demo06_SimpleBuoyancy.vcproj 2010-06-25 18:14:37 UTC (rev 2916)
+++ branches/ogrenewt/newton20/demos/Demo06_SimpleBuoyancy/Demo06_SimpleBuoyancy.vcproj 2010-06-25 20:37:05 UTC (rev 2917)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)\";"$(CEGUI_HOME)\";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_HOME)\include\OGRE";."
+ AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)\";"$(CEGUI_HOME)\";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\include\OGRE";."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib CEGUIOgreRenderer_d.lib CEGUIBase_d.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(CEGUI_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(CEGUI_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(OGRE_BUILD_HOME)\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -117,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";C:\OgreSDK\include\CEGUI;"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";C:\OgreSDK\include\CEGUI;"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -138,7 +138,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Release";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: branches/ogrenewt/newton20/demos/Demo07_CustomJoints/Demo07_CustomJoints.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/Demo07_CustomJoints/Demo07_CustomJoints.vcproj 2010-06-25 18:14:37 UTC (rev 2916)
+++ branches/ogrenewt/newton20/demos/Demo07_CustomJoints/Demo07_CustomJoints.vcproj 2010-06-25 20:37:05 UTC (rev 2917)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)\";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_HOME)\include\OGRE";."
+ AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)\";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\include\OGRE";."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(OGRE_BUILD_HOME)\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -117,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -138,7 +138,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Release";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: branches/ogrenewt/newton20/demos/Demo08_RagdollExample/Demo08_RagdollExample.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/Demo08_RagdollExample/Demo08_RagdollExample.vcproj 2010-06-25 18:14:37 UTC (rev 2916)
+++ branches/ogrenewt/newton20/demos/Demo08_RagdollExample/Demo08_RagdollExample.vcproj 2010-06-25 20:37:05 UTC (rev 2917)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\inc;..\tinyxml\inc;"$(BOOST_HOME)\";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_HOME)\include\OGRE""
+ AdditionalIncludeDirectories="..\..\inc;..\tinyxml\inc;"$(BOOST_HOME)\";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\include\OGRE""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib tinyxmld_STL.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\lib;..\tinyxml\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;..\tinyxml\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(OGRE_BUILD_HOME)\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -117,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\include\OIS";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\CEGUI";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRENEWT_HOME)\inc";..\tinyxml\inc;."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\include\OIS";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\CEGUI";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRENEWT_HOME)\inc";..\tinyxml\inc;."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -138,7 +138,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib tinyxml_STL.lib odbc32.lib odbccp32.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(OGRENEWT_HOME)\lib";"$(NEWTON_HOME)\sdk\x32\dll_vs9";..\tinyxml\lib"
+ AdditionalLibraryDirectories=""$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Release";"$(OGRE_HOME)\Dependencies\lib\Release";"$(OGRENEWT_HOME)\lib";"$(NEWTON_HOME)\sdk\x32\dll_vs9";..\tinyxml\lib"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
SubSystem="2"
Modified: branches/ogrenewt/newton20/demos/Demo09_PlayerController/Demo09_PlayerController.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/Demo09_PlayerController/Demo09_PlayerController.vcproj 2010-06-25 18:14:37 UTC (rev 2916)
+++ branches/ogrenewt/newton20/demos/Demo09_PlayerController/Demo09_PlayerController.vcproj 2010-06-25 20:37:05 UTC (rev 2917)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)\";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_HOME)\include\OGRE""
+ AdditionalIncludeDirectories="..\..\inc;"$(BOOST_HOME)\";"$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\include\OGRE""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(BOOST_HOME)\lib";"$(OGRE_HOME)\lib\debug";"$(OGRE_BUILD_HOME)\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -117,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";C:\OgreSDK\include\CEGUI;"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_BUILD_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";C:\OgreSDK\include\CEGUI;"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -138,7 +138,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Release";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj 2010-06-25 18:14:37 UTC (rev 2916)
+++ branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj 2010-06-25 20:37:05 UTC (rev 2917)
@@ -65,7 +65,7 @@
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib"
OutputFile="$(OutDir)\debug.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Debug";"$(OGRE_HOME)\Dependencies\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -142,7 +142,7 @@
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib"
OutputFile="$(OutDir)\release.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_BUILD_HOME)\lib\Release";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|