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 |
|