80 commits

Author	SHA1	Message	Date
cc9cii	ac7acb2c22	Disable more debug code.	2014-10-31 22:21:24 +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	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	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	39cd89a9af	Make gcc happy.	2014-10-23 18:51:31 +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
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
cc9cii	8cebfc411b	Minor visual improvements.	2014-10-14 17:34:10 +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	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
cc9cii	3e5027abbb	Incorporate terrain height to labels and camera.	2014-10-10 13:36:16 +11:00
cc9cii	406135ee96	Merge remote-tracking branch 'upstream/master' into terrain	2014-10-09 23:47:30 +01:00
cc9cii	13f028e27b	Avoid out of range exceptions.	2014-10-09 07:01:18 +11:00
cc9cii	b3ef7a71e2	Different implementation of update overlay fix.	2014-10-09 05:56:44 +11:00
cc9cii	5d8022bdc5	Update overlay upon control elements button signal.	2014-10-08 21:22:12 +11:00
cc9cii	e1197e75bc	Handle change of names or regions to dynamically update the overlay.	2014-10-08 07:54:22 +11:00
cc9cii	7836ee9ab6	Fixed crash exiting internal cells. Better starting camera position for external cells.	2014-10-07 21:18:32 +11:00
cc9cii	0cccdfd114	Added description below the cell id (name if exists, or region)	2014-10-07 19:35:28 +11:00
cc9cii	7640875f9d	More cleanup.	2014-10-07 10:34:30 +11:00
cc9cii	f48f841d31	Add full path for Ogre Overlay headers (workaround for osx).	2014-10-07 06:40:28 +11:00
cc9cii	b3e09cce00	Remove mouse picking code.	2014-10-06 22:29:45 +11:00
cc9cii	972c789060	Add Ogre Overlay path to cmake.	2014-10-06 20:25:09 +11:00
cc9cii	cc6153eb8e	Removed temporary key bindings.	2014-10-06 14:21:44 +11:00
cc9cii	e38417e662	Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide. ... The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag. No idea what is causing this.	2014-10-06 13:55:36 +11:00
cc9cii	dbb2781817	Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default.	2014-10-06 08:20:09 +11:00
cc9cii	85d93807c5	Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented.	2014-10-05 19:25:37 +11:00
cc9cii	5ffb740120	Fix silly mistake (thanks scrawl for picking that up)	2014-10-01 07:19:15 +10:00
cc9cii	a9745cce1e	Suppress some compiler warnings.	2014-09-30 21:02:31 +10:00
cc9cii	dee090355f	Changes to compile on Ubuntu 14.04.	2014-09-30 19:23:19 +10:00
cc9cii	687b62dfd3	Revert some changes (mostly iostream adds)	2014-09-30 18:46:26 +10:00