Aesylwinn
f251c3867d
Redesigned shortcut handler to be capable of dealing with child and
...
parent widgets. This should be the final design change. Also, some
various bug fixes.
2016-07-23 21:23:02 -04:00
Aesylwinn
1b5273f2b7
Finally re-added rendering stats, refactored some functions
...
to better fit new input structure, removed unneeded shortcut
declarations in headers, and changed the cell marker
interaction to use primary/secondary select instead of
shift + primary/secondary edit.
2016-07-20 15:00:00 -04:00
Aesylwinn
faa84e0a35
- Further extended usage of new shortcut class
...
- Refactored camera classes to take advantage of Qt's reference counting
- Removed some of the old implementation
2016-07-20 08:25:11 -04:00
Aesylwinn
e8626e588a
Changes in shortcut design.
...
- Handle input in centralized class for potential conflict resolution.
- Remove wrapper class for QShortcut; it should be unnecessary.
- Added customizable shortcut usage to orbit camera mode.
2016-07-20 08:25:11 -04:00
Aesylwinn
40297701d0
Base key config/shortcut implementation
2016-07-20 08:25:11 -04:00
Aesylwinn
2f39a6e20d
Fix camera input not being reset when focus for widget is lost.
2016-06-08 13:25:47 -04:00
Aesylwinn
7657684dad
Fix mouse tracking to fix tooltip behavior. Also hide tooltips
...
when the mouse is moved.
2016-06-07 13:22:39 -04:00
Aesylwinn
e07687ee01
Add button for camera mouse inversion in user preferences, and separate the
...
sensitivity settings for orbit and free cameras.
2016-04-04 18:42:57 -04:00
Aesylwinn
e127c691e2
Cleanup, remove some unused includes
2016-04-03 18:23:06 -04:00
Aesylwinn
99e9017242
Cleanup, externalize mask used to pick center
2016-04-02 13:59:57 -04:00
Aesylwinn
a4cc891383
Cleanup, move setup to CameraController class
2016-04-02 13:36:12 -04:00
Aesylwinn
efa2ec21ff
Cleanup, no need to inherit and override osg::ComputeBoundsVisitor
2016-04-02 13:14:46 -04:00
Aesylwinn
1e30891891
Broaden selection mask for getting scene bounds if nothing is found.
2016-03-31 23:54:20 -04:00
Aesylwinn
a0fb242bf8
Slight improvement to camera placement.
2016-03-25 23:47:05 -04:00
Aesylwinn
bee8977e45
Add camera control customization options.
2016-03-25 22:19:44 -04:00
Aesylwinn
3a676fc456
Revert "Create a visual representation of the center of the orbit camera."
...
This reverts commit 2c894acd98
2016-03-25 18:20:04 -04:00
Aesylwinn
2c894acd98
Create a visual representation of the center of the orbit camera.
...
For debugging purposes.
2016-03-18 16:06:35 -04:00
Aesylwinn
c8bae38a8e
Remove trackball mode
2016-03-18 14:53:10 -04:00
Aesylwinn
999869da24
Position camera above, near, and looking at the scene.
2016-03-18 14:02:24 -04:00
Aesylwinn
fcccacc0fa
Define a constant for the World Up vector
2016-03-18 13:57:48 -04:00
Aesylwinn
08fe914ba1
Preliminary editor camera
2016-03-14 00:45:18 -04:00
Aesylwinn
ebdc212886
Moved selectNavigationMode to SceneWidget class, centralized camera selection.
2016-03-14 00:44:46 -04:00
Aesylwinn
9afb0e0f90
Input restructuring.
2016-03-14 00:42:15 -04:00
Aesylwinn
f4f7afb53b
Removed now unnecessary installation of event filter.
2016-03-14 00:41:57 -04:00
Aesylwinn
38059593a7
Removed workaround for OSG input handling in RenderWidget.
2016-03-14 00:41:04 -04:00
Marc Zinnschlag
dececf6c38
instance moving via drag in 3D scenes
2016-02-16 16:02:29 +01:00
scrawl
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
2016-02-15 15:16:48 +01:00
scrawl
458a305bff
OpenCS: add lighting mask
2016-01-11 23:14:43 +01:00
scrawl
7f967153ef
OpenCS: create light sources
2016-01-11 23:10:16 +01:00
scrawl
e7bb8878f3
OpenCS: add a mask for particle systems
2016-01-11 23:10:16 +01:00
scrawl
ad2145b463
OpenCS: use a separate enum for the toggle buttons
2016-01-11 23:10:16 +01:00
Marc Zinnschlag
c646533448
removed old user settings system
2015-12-15 12:49:55 +01:00
scrawl
1402a16702
SceneWidget: change the threading model to DrawThreadPerContext
...
Performs much better because we can break frame early, running cull in parallel with last frame's draw.
2015-11-13 21:00:51 +01:00
Marc Zinnschlag
1d4f8b2595
send mouse wheel input to active EditMode during drag operations
2015-10-01 13:19:48 +02:00
scrawl
dac3b33efb
OpenCS: Pass events from the QGLWidget to the RenderWidget
2015-09-18 18:30:48 +02:00
scrawl
169fc6a61b
OpenCS: Remove margin around the render window
2015-09-18 18:29:22 +02:00
Marc Zinnschlag
1aa926c7e0
restored T-shortcut (focus toolbar) in scene widget
2015-09-17 12:41:56 +02:00
scrawl
58720e6a28
Fix the OpenCS rendering crash on exit ( Fixes #2735 )
2015-07-18 03:52:48 +02:00
scrawl
412e001edb
Fix simulation time reset in OpenCS when opening a new view
2015-06-14 19:19:23 +02:00
scrawl
1ba3fa4169
Remove leftovers of the old OpenCS navigation
2015-06-03 18:11:34 +02:00
scrawl
cd47dff196
Minor cleanup
2015-06-03 03:03:16 +02:00
scrawl
00deacc27e
OpenCS: lighting modes
2015-03-28 21:26:16 +01:00
scrawl
232e34bddd
OpenCS: port lighting toolbar, fix multiple context GL objects issue
2015-03-28 20:15:17 +01:00
scrawl
bb32c761df
*very* early texture manager, need a lot more thought to design this properly
2015-03-28 02:27:59 +01:00
scrawl
1edccdbe55
OpenCS: apply visibility flags to osg node
2015-03-26 00:27:39 +01:00
scrawl
72400747f2
OpenCS: preliminary port of cell rendering to OSG
2015-03-25 23:35:10 +01:00
scrawl
d6dea31b88
OpenCS: Use a CompositeViewer with multiple views instead of multiple viewers
...
Fixes the rendering glitches, turns out that multiple osgViewers were never an intended use case.
2015-03-23 15:55:57 +01:00
scrawl
15f9c1ddcf
NiBSPArrayController works
2015-03-21 23:10:52 +01:00
scrawl
af27a10b0c
OpenCS: preliminary port of PreviewWidget to OSG
2015-03-20 16:22:33 +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
cc9cii
b328aa1fb9
Multiple document support.
2014-11-01 18:57:39 +11:00
cc9cii
057982b1f8
Fix Subview interface clutter by keeping a map of Scenewidgets.
2014-11-01 08:29:08 +11:00
cc9cii
d6e67b248f
Fix deleting objects and scenewidgets.
2014-11-01 07:29:16 +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
dd9208afeb
Merge remote-tracking branch 'upstream/master' into mouse-picking
2014-10-25 10:59:17 +01:00
cc9cii
cb53e714f7
Convert PhysicsSystem to a singleton.
2014-10-24 19:14:02 +10: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
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
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
994420aa57
Singleton wrapper for Ogre OverlaySystem.
2014-10-14 13:21:43 +11:00
cc9cii
e58e5c2bf5
Update overlays independently from multiple viewports.
2014-10-13 15:57:01 +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
Thoronador
ab364c9440
fix some more uninitialized class member fields
2014-10-11 00:50:32 +02:00
cc9cii
7836ee9ab6
Fixed crash exiting internal cells. Better starting camera position for external cells.
2014-10-07 21:18:32 +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
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
6d687993b8
Remove C++11 stuff.
2014-10-06 14:08:35 +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
Marc Zinnschlag
9fd82212b3
Merge remote-tracking branch 'cc9cii/opencs-settings'
2014-10-03 13:11:05 +02:00
cc9cii
7675df60ba
Fix far clip distance (again), workaround for broken settings minimum value.
2014-09-29 08:17:51 +10:00
cc9cii
f0c739b763
Apply camera setting changes immediately. Remove current value check for shader setting changes.
2014-09-29 06:27:54 +10:00
cc9cii
6e8977348a
Check the FSAA setting of windows rather than system value.
2014-09-28 19:43:26 +10:00
cc9cii
303b0ee8c6
Update scenewidget when antialiasing settings change.
2014-09-28 15:43:33 +10:00
cc9cii
8a0ff17c22
Update SceneWidget when relevant user settings change.
2014-09-28 14:08:14 +10:00
cc9cii
a25cffc242
Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights.
2014-09-28 10:17:54 +10:00
scrawl
7252cb63a6
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
cc9cii
61bab6b1f1
Sanitised version. Some settings are only accessible via manually editing the config file.
2014-09-25 08:15:07 +10:00
cc9cii
67503c93b2
Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed.
2014-09-23 22:33:49 +10:00
Marc Zinnschlag
439ba57d46
added visual element selector toolbar button
2014-07-31 14:06:04 +02:00
Marc Zinnschlag
4421e7a5cc
added lighting mode toolbar icons
2014-07-25 11:15:04 +02:00
Marc Zinnschlag
17fc570e38
new keyboard shortcut (T): move focus from toolbar to scene widget
2014-07-14 13:49:55 +02:00
Marc Zinnschlag
92af093856
new keyboard shortcut (T): move focus from scene widget to toolbar
2014-07-14 11:19:59 +02:00
Marc Zinnschlag
c2ea8f3f0a
added self-adjusting tooltips to the top-level toolbar buttons
2014-07-13 14:21:50 +02:00
Marc Zinnschlag
490442cf62
added lighting mode tooltips
2014-07-10 13:18:24 +02:00
Marc Zinnschlag
930f782bc5
SceneWidget::setLighting was missing an update call
2014-07-10 10:09:21 +02:00
Marc Zinnschlag
03f67cd6bd
moved low level widgets from CSVWorld into a separate namespace/directory
2014-07-08 12:39:12 +02:00
Marc Zinnschlag
2fe2def64c
added cell rendering in paged worldspaces
2014-06-29 16:00:06 +02:00
slothlife
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
2014-06-23 01:13:30 -05:00
