Marc Zinnschlag
|
2cb106f6ad
|
added missing flagAsModified calls
|
2015-09-29 16:06:55 +02:00 |
|
Marc Zinnschlag
|
319e3f24a3
|
on edit mode change clear selection of elements that are not affected by current edit mode (only support for instance for now since we do not have selection for other elements yet)
|
2015-09-29 13:48:04 +02:00 |
|
scrawl
|
12b8fcf0bf
|
OpenCS: Fix camera position retrieval in WorldspaceWidget
|
2015-09-23 23:37:09 +02:00 |
|
scrawl
|
67bd6cd708
|
Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
|
2015-08-18 23:06:12 +02:00 |
|
scrawl
|
e3bfbcb44b
|
OpenCS: connect navigation button to OSG camera manipulators
|
2015-03-26 00:55:58 +01:00 |
|
scrawl
|
72400747f2
|
OpenCS: preliminary port of cell rendering to OSG
|
2015-03-25 23:35:10 +01:00 |
|
scrawl
|
aedafe651a
|
OpenCS: delete physicssystem, will be replaced with OSG picking
|
2015-03-25 19:08:09 +01:00 |
|
scrawl
|
34d503017a
|
OpenCS: Set up an osgQt GraphicsWindow in SceneWidget
|
2015-03-20 16:22:33 +01:00 |
|
scrawl
|
49c2da27b3
|
OpenCS compiles and runs again (no rendering)
|
2015-03-19 17:21:15 +01:00 |
|
Marc Zinnschlag
|
f771b95a15
|
Merge remote-tracking branch 'cc9cii/master'
|
2014-12-04 20:04:19 +01:00 |
|
Marc Zinnschlag
|
406cf2b981
|
disable element visibility buttons that do not apply to the respective cell type
|
2014-12-02 11:17:39 +01:00 |
|
cc9cii
|
3b5cd286f6
|
Do not destroy overlay if it was never created (e.g. due to an Ogre exception).
|
2014-12-01 14:09:22 +11:00 |
|
cc9cii
|
2720e5ea9d
|
Remove PhysicsManager singleton and use shared_ptr instead. Resolves the issue where sometimes destructors were called in an unexpected sequence resulting in a crash while exiting the application.
|
2014-12-01 06:44:12 +11:00 |
|
Marc Zinnschlag
|
5eb9fd81e1
|
use placeholder icons in OpenCS when no proper icon is available
|
2014-11-13 12:09:10 +01:00 |
|
Marc Zinnschlag
|
a60e4c036f
|
Merge branch 'mode'
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.hpp
|
2014-11-13 11:12:20 +01:00 |
|
Marc Zinnschlag
|
b7f8f848a8
|
added edit modes for exteriors
|
2014-11-13 10:45:59 +01:00 |
|
Marc Zinnschlag
|
b50fcd403b
|
renamed getElementMask to getVisibilityMask
|
2014-11-09 11:29:45 +01:00 |
|
cc9cii
|
b328aa1fb9
|
Multiple document support.
|
2014-11-01 18:57:39 +11:00 |
|
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 |
|