mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 08:19:56 +00:00
Code Issues Releases Wiki Activity
17753 commits 38 branches 54 tags 122 MiB
Commit graph

524 commits

Author SHA1 Message Date
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
d8fa3fd1de Added orbit "center on selection" shortcut. 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
3409d8a922 Change pathgrid node movement to be visually consistent, some 
renaming
 2016-06-04 12:38:17 -04:00
Aesylwinn
83c86cd1be Implement context-select functionality. 2016-05-29 13:26:48 -04:00
Aesylwinn
b83f522ecd Changes to color scheme, slight change to drag indicator, 
change tooltip description.
 2016-05-29 13:26:29 -04:00
Aesylwinn
90620081c7 Fix handling of deleted pathgrids. 2016-05-27 13:15:35 -04:00
Aesylwinn
d0ef95a1e1 Make adjustments to pathgrid modification code. 2016-05-26 22:13:47 -04:00
Aesylwinn
239727531f Revert "Fix data corruption issues." 
This reverts commit 6199663bd8.
 2016-05-25 22:53:17 -04:00
Aesylwinn
9a567b3712 Revert "Fix editor undo for nested data." 
This reverts commit 774e1497b6.
 2016-05-25 22:52:41 -04:00
Aesylwinn
ec90da731c Redo slight change to pathgrid editing controls, lost in revert 2016-05-25 22:52:02 -04:00
Aesylwinn
bb81e89c08 Revert "Cleanup and slight change to pathgrid editing controls." 
This reverts commit cc4655e9c7.
 2016-05-25 22:48:43 -04:00
Aesylwinn
cc4655e9c7 Cleanup and slight change to pathgrid editing controls. 
Now that there is a drag indicator, it is easy to tell if an
operation is active or not.
 2016-05-24 18:19:05 -04:00
Aesylwinn
5eaaed05fc Improve mouse pick culling. 2016-05-24 17:31:00 -04:00
Aesylwinn
774e1497b6 Fix editor undo for nested data. 2016-05-23 15:51:36 -04:00
Aesylwinn
6199663bd8 Fix data corruption issues. 
- Point connection count not being set
- Nested undo not restoring table (for pathgrid scene editing, editor
    nested undo is still broken)
 2016-05-21 18:59:43 -04:00
Aesylwinn
799ed300ea Use cell coordinates class, fix undo description. 2016-05-21 14:36:07 -04:00
Aesylwinn
b86250036c Add ability to add pathgrids. 2016-05-19 18:33:15 -04:00
Aesylwinn
1781aaaa27 Drag indicator. 2016-05-18 12:17:26 -04:00
Aesylwinn
e8e915bcde Share selection functionality with instance editing mode. 2016-05-18 10:46:25 -04:00
Aesylwinn
ae0d2c3b9c Refactor edit mode. Remove essentially duplicate function. 2016-05-17 21:24:16 -04:00
Aesylwinn
13c2161b27 Fix memory leak, remove empty if statement, change dynamic_cast 
to static_cast
 2016-05-17 16:14:23 -04:00
Aesylwinn
5a7ebab694 Fix forward declaration. 2016-05-16 23:06:36 -04:00
Aesylwinn
9d02286592 Remove unused forward declaration. 2016-05-16 22:17:03 -04:00
Aesylwinn
a3363bc098 Fix and simplify pathgrid update handling, only recreate geometry 
once per frame, and a few naming changes.
 2016-05-16 21:06:55 -04:00
Aesylwinn
d2d22e2f23 Clamp node positions in exterior cells. 2016-05-16 19:03:40 -04:00
Aesylwinn
cd3b96b3e8 Change interaction mask back to original and place required masks in 
PathgridMode.
 2016-05-16 17:59:52 -04:00
Aesylwinn
aea2380c2b Add raytrace to dragCompleted. Implement node drag connection, 
node and edge removal, and some fixes.
 2016-05-16 17:25:02 -04:00
Aesylwinn
6fbc10dbba Add ability to get cell, pathgrid, and ability to add nodes. 
Also missing include.
 2016-05-16 17:20:07 -04:00
Aesylwinn
9f7c8d559c Add focus requirement for context menu. 2016-05-16 17:16:15 -04:00
Aesylwinn
f0bbe2c633 Add context menu for pathgrid editor. 2016-05-16 17:06:40 -04:00
Aesylwinn
8b6cb73369 Add ability to invert selection. 2016-05-16 17:03:00 -04:00
Aesylwinn
55656d68ef Cleanup, put duplicated code in function 2016-05-16 17:00:58 -04:00
Aesylwinn
da6a742beb Add control description to tooltip. 2016-05-16 16:50:02 -04:00
Aesylwinn
f8b43b2a64 Rename cryptic variables. 2016-05-13 12:55:35 -04:00
Aesylwinn
32ba5bf8b8 Initial pathgrid editting, support for selection and movement. 2016-05-12 19:35:49 -04:00
Aesylwinn
9645d0cc8a Pass more mouse pick information in scene view editor. 2016-05-12 18:21:43 -04:00
Aesylwinn
14ae232938 Remove now unnecessary factory class. 
It was originally used for storing normals, but that functionality
was removed.
 2016-05-03 16:13:23 -04:00
Aesylwinn
1f902ff069 Remove code duplication. 2016-05-03 16:13:11 -04:00
Aesylwinn
642b1d0273 Add mask. 2016-05-03 03:29:39 -04:00
Aesylwinn
8d95b63180 Add pathgrid rendering to opencs 2016-05-02 22:10:43 -04:00
Aesylwinn
7fbcc47b15 Add pathgrid modified signals. 2016-05-02 22:08:49 -04:00
Aesylwinn
933504dbd0 Revert "Pathgrid rendering v2" 
This reverts commit 4dee9604bb.
 2016-05-02 15:37:08 -04:00
Aesylwinn
4dee9604bb Pathgrid rendering v2 2016-05-02 06:29:56 -04:00
Marc Zinnschlag
091e1bf25d improved scene element visibility buttons 2016-04-23 13:54:19 +02:00
Marc Zinnschlag
60509875e8 Merge remote-tracking branch 'aesylwinn/editor_camera' 2016-04-05 08:54:23 +02:00
Aesylwinn
b111febfc9 Add pitch constraint for first person camera. 2016-04-04 20:56:13 -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
ec25998b12 Cleanup, use setTraversalMask instead of setNodeMaskOverride 2016-04-03 18:19:20 -04:00
Aesylwinn
0ef7c778e0 Cleanup, isModified was a remnant of an old design and is only used in the first person camera mode. 2016-04-03 17:26:34 -04:00
Aesylwinn
6c471349f0 Add context menu for orbit camera. 2016-04-03 16:32:07 -04:00
Aesylwinn
4ef9981544 Add ability to set orbit camera center outside of class. 2016-04-03 16:30:50 -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
7d9dddfa38 Place camera farther away, improves preview camera placement. 2016-03-31 23:34:47 -04:00
Aesylwinn
09bce73c33 Fix starting distance not being correctly set. 2016-03-26 14:42:33 -04:00
Aesylwinn
35ff4ec4b1 Normalize default camera controls so that is appears as if the camera is 
the object being moved. Also, allow mouse inversion for secondary movement.
 2016-03-26 14:15:07 -04:00
Aesylwinn
fbe9177f5d Better center picking for the Orbit Camera. 2016-03-26 00:51:19 -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
dede171886 Fix the secondary navigation method for OrbitCameraController. 2016-03-25 21:35:34 -04:00
Aesylwinn
3c83128abc Add more customization. 2016-03-25 20:47:18 -04:00
Aesylwinn
3a676fc456 Revert "Create a visual representation of the center of the orbit camera." 
This reverts commit 2c894acd98.

# Conflicts:
#	apps/opencs/view/render/cameracontroller.cpp
#	apps/opencs/view/render/cameracontroller.hpp
 2016-03-25 18:20:04 -04:00
Marc Zinnschlag
1774f6d9bf moved ref num assingment from instance creation to save procedure 2016-03-24 11:12:05 +01:00
Aesylwinn
342d31de76 More fixes to the orbit manipulator 2016-03-18 16:56:40 -04:00
Aesylwinn
2903271331 Correct the center position for the orbit camera controller 2016-03-18 16:07:15 -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
7009355baf Remove unused variable 2016-03-18 14:46:53 -04:00
Aesylwinn
4374f69a60 Reduce mouse sensitivity 2016-03-18 14:43:13 -04:00
Aesylwinn
2b72a04e7a Update 1st person up axis ASAP. 2016-03-18 14:02:55 -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
59f59a3385 Fix indentation 2016-03-14 00:45:36 -04:00
Aesylwinn
08fe914ba1 Preliminary editor camera 2016-03-14 00:45:18 -04:00
Aesylwinn
2cff2cd643 Remove unnecessary override. 2016-03-14 00:45:08 -04:00
Aesylwinn
9ed2cf6581 Fix callback being skipped 2016-03-14 00:44:56 -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
900378a31e changed 'not implemented' warning message for object movement 2016-03-12 13:26:33 +01:00
Marc Zinnschlag
d6b8033b46 handle cell transitions when moving objects 2016-03-12 13:19:51 +01:00
Marc Zinnschlag
fa9689c5e7 delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on) 2016-03-11 14:04:47 +01:00
Marc Zinnschlag
6a2fe564ef Merge branch 'master' into move 2016-03-11 12:47:33 +01:00
Marc Zinnschlag
b2181fae20 safer handling of command macros 2016-03-08 10:48:44 +01:00
Marc Zinnschlag
b5005f7812 keep sub mode over mode changes 2016-03-05 11:41:42 +01:00
Marc Zinnschlag
a63453846b properly clear drag mode at the end of a drag 2016-03-05 11:14:08 +01:00
Marc Zinnschlag
51a4e3fa7d properly abort drags from outside the worldspace widget (code was leaving unclean dragging flags behind) 2016-03-05 10:56:54 +01:00
Marc Zinnschlag
70745487f3 cancel instance move on editing lock becoming active 2016-03-05 10:44:46 +01:00
Marc Zinnschlag
b1fb64bf68 added missing drag mode resets 2016-03-04 16:25:30 +01:00
Marc Zinnschlag
dd564daba0 do not start move drags while the document is locked for editing 2016-03-04 16:24:02 +01:00
Marc Zinnschlag
1726393963 cancel instance move on edit mode change 2016-03-04 15:31:50 +01:00
Marc Zinnschlag
25effc4222 cancel instance move on sub mode change 2016-03-04 15:30:28 +01:00