193 commits

Author	SHA1	Message	Date
cc9cii	057982b1f8	Fix Subview interface clutter by keeping a map of Scenewidgets.	2014-11-01 08:29:08 +11:00
cc9cii	e51d532795	Show drag movements of objects in multiple scene managers.	2014-11-01 07:39:58 +11:00
cc9cii	d6e67b248f	Fix deleting objects and scenewidgets.	2014-11-01 07:29:16 +11:00
cc9cii	ade7f09203	Keep track of terrain in physics engine. Should resolve crash exiting after opening multiple subviews of the same cell.	2014-11-01 00:03:09 +11:00
cc9cii	ac7acb2c22	Disable more debug code.	2014-10-31 22:21:24 +11:00
cc9cii	aa7b693a13	Remove debug settings and minor cleanup.	2014-10-31 22:04:10 +11:00
cc9cii	fbadaf55ee	Multiple SceneManagers per physics engine now working.	2014-10-31 21:50:57 +11:00
cc9cii	a2ac4c7650	Allow multiple scene managers per physics engine. Compiles but does not work properly.	2014-10-31 08:18:15 +11:00
cc9cii	0515159b74	Fix typo.	2014-10-29 23:38:19 +11:00
cc9cii	1741043f20	Revert to storing Scene Node names as the key in RigidBody. Allow moving objects up/down using scroll wheel or touchpad while dragging. Cleanup code a little.	2014-10-29 23:02:38 +11:00
cc9cii	792fbd119f	Resolve incorrect merge issues.	2014-10-29 10:43:55 +11:00
cc9cii	c990ed4335	Merge branch 'mouse-picking-state' into mouse-picking ... Conflicts: apps/opencs/view/render/pagedworldspacewidget.cpp apps/opencs/view/render/pagedworldspacewidget.hpp	2014-10-29 09:33:48 +11:00
cc9cii	8e2a0ea90a	Implemented moving objects around x-y plane.	2014-10-29 08:13:13 +11:00
cc9cii	68b7532383	Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported.	2014-10-29 00:50:48 +11:00
cc9cii	5afaa0083f	Minimise false detection of grab & drag operation.	2014-10-28 06:42:33 +11:00
cc9cii	a01a921644	Experimental mouse event state machine for 3d editing, starting with drag & drop objects.	2014-10-28 06:01:19 +11:00
cc9cii	6c8320a638	More cleanup.	2014-10-27 12:09:20 +11:00
cc9cii	c2c33eac0f	Minor cleanup.	2014-10-27 08:26:01 +11:00
cc9cii	0b63ba5727	Move debug rendering code out of PhysicsSystem.	2014-10-27 08:08:33 +11:00
cc9cii	fb0f85c8db	Report terrain position on cursor position.	2014-10-26 21:15:47 +11:00
cc9cii	8b0dc88db8	Use the correct name for deleting objects.	2014-10-26 08:15:18 +11:00
cc9cii	b46df4034d	Cleanup bullet objects in the destructors.	2014-10-26 07:56:51 +11:00
cc9cii	9337d6533a	Add terrain collision. Support visibility mask for objects and terrain.	2014-10-25 22:09:19 +11:00
cc9cii	cc0acec64c	Add settings to enable/disable debug rendering of mouse picking.	2014-10-25 21:02:40 +11:00
cc9cii	dd9208afeb	Merge remote-tracking branch 'upstream/master' into mouse-picking	2014-10-25 10:59:17 +01:00
cc9cii	54a6897df8	Use QString rather than std::to_string	2014-10-24 20:43:29 +10:00
cc9cii	e5dd8d06a0	Store object reference id to RigidBody instead of scene node handles.	2014-10-24 21:18:29 +11:00
cc9cii	cb53e714f7	Convert PhysicsSystem to a singleton.	2014-10-24 19:14:02 +10:00
cc9cii	98ff3e7307	No physics or mouse picking for object preview.	2014-10-24 07:57:29 +11:00
cc9cii	39cd89a9af	Make gcc happy.	2014-10-23 18:51:31 +11:00
cc9cii	cca6d0a024	Fixed issue with mouse picking accuracy.	2014-10-23 12:43:06 +11:00
cc9cii	fdee3fd919	Added debug lines to show ray hit position. Added highlighting the Entity hit by the ray. Incorporated user setting far clip distance.	2014-10-23 06:59:14 +11:00
cc9cii	4b53b8658b	Debug rendering toggled by double clicking the right mouse button. Raycasting works, but inaccurate.	2014-10-22 07:11:04 +11:00
Marc Zinnschlag	94ae222f0e	Merge branch 'settings'	2014-10-19 13:44:15 +02:00
cc9cii	8bcd415cca	Fix duplicate calls to OEngine. Use correct position, rotation and scale. Debug draw not working.	2014-10-19 07:25:54 +11:00
cc9cii	03a30c3f1d	Experimental, compiles but does not work.	2014-10-18 06:16:48 +11:00
Marc Zinnschlag	994159fafd	fixed broken iterator	2014-10-17 14:23:37 +02:00
Marc Zinnschlag	8a05c0e5c0	fixed overlay singleton	2014-10-17 14:23:27 +02:00
Marc Zinnschlag	4b921c3876	user settings cleanup	2014-10-17 13:49:33 +02:00
cc9cii	094f046087	Convert OverlaySystem to a OpenCS style singleton.	2014-10-16 07:29:46 +11:00
cc9cii	1d0ac3b4df	Delete Ogre::OverlaySystem before Ogre::Root	2014-10-15 07:02:19 +11:00
cc9cii	8cebfc411b	Minor visual improvements.	2014-10-14 17:34:10 +11:00
cc9cii	994420aa57	Singleton wrapper for Ogre OverlaySystem.	2014-10-14 13:21:43 +11:00
cc9cii	57b337d368	Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much.	2014-10-14 11:43:56 +11:00
cc9cii	961867e39f	Hide overlay if off screen.	2014-10-13 20:58:07 +11:00
cc9cii	43838ccf01	Remove override (c++11)	2014-10-13 16:42:50 +11:00
cc9cii	e58e5c2bf5	Update overlays independently from multiple viewports.	2014-10-13 15:57:01 +11:00
cc9cii	47c5bc9a19	Set bounding box on manual objects rather than creating meshes.	2014-10-13 07:42:43 +11:00
cc9cii	758ce0ed98	Various fixes as per feedback comments.	2014-10-12 21:15:50 +11:00
cc9cii	809b8c6d5b	Conflicts: ... apps/opencs/view/render/pagedworldspacewidget.cpp	2014-10-12 05:54:21 +11:00