mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-23 21:23:53 +00:00
Code Issues Releases Wiki Activity
32163 commits 108 branches 66 tags 133 MiB
Commit graph

829 commits

Author SHA1 Message Date
Evil Eye
a64979e25d Replace empty std::string assignments 2022-05-04 22:33:39 +02:00
Vidi_Aquam
035fe778b2 Temporary workaround for angle snapping 
Made the angle snap only apply to an object when the drag is finished, which is much more usable until the rotation system can be fixed completely
 2022-04-11 08:12:38 -05:00
Vidi_Aquam
abf0c8048e Change reading of settings and add missing logic to mouse wheel drag 2022-04-03 09:04:12 -05:00
Vidi_Aquam
6d7c8f25fc Implement grid snapping and angle snapping in OpenMW-CS 
Adds configurable snap settings for instance movement, rotation and scaling, used with the secondary edit button
 2022-04-02 19:25:57 -05:00
Bret Curtis
74e7cfc023 remove unused includes: part1 
remove unused imports: part2

revert one tidy we will keep for c++20
 2022-01-23 17:30:25 +01:00
Bret Curtis
cdbab2325f rename esmterrain to esm3terrain 2022-01-23 17:19:30 +01:00
Bret Curtis
d1fb854521 move most of the files from esm to esm3, keep common code in esm; this is make space for a future with esm4 
esm typo

esm typo
 2022-01-23 17:04:48 +01:00
Cody Glassman
8ec0a52605 Toggable day night switch (#5928) 2022-01-11 09:34:19 +00:00
Alexei Dobrohotov
7a0c13fcf8 Make better use of std::clamp 2021-11-06 08:47:32 +03:00
Bo Svensson
c9c8d02332
fixes a crash (#3183) 
This PR fixes a crash caused by the improperly ensured lifetime of RigGeometry::mSourceGeometry. mSourceGeometry was not adequate to ensure mSourceGeometry would outlive mGeometry because we extend mGeometrys lifetime beyond this lifetime by passing mGeometry to the draw traversal instead of this.
In addition,

We add important comments.
We detect and prevent generally unsafe operations in high level code.
We add a sprinkling of const to help clarify intentions.
 2021-10-23 10:31:46 +02:00
unelsson
14c4bba4a3 Remove unused include 2021-10-15 21:54:00 +03:00
unelsson
28278e9a82 Drawing duplicate lines is faster than iterating through big containers 2021-10-15 21:54:00 +03:00
unelsson
55456a19fc Only iterate through temporary selection when using toggle 2021-10-15 21:54:00 +03:00
unelsson
46960825ef Various terrain selection and editmode dragging fixes 2021-10-15 21:54:00 +03:00
unelsson
89a20b6ea5 Call dragEnded instead of pressed also after aborted operation 2021-10-15 21:54:00 +03:00
unelsson
3df9ceda03 Remove measurement code 2021-10-15 21:54:00 +03:00
unelsson
7602d677fa Terrain selection optimizations, measurements, renderBin change 2021-10-15 21:54:00 +03:00
Matjaž Lamut
1c9f06f742 Minor UI tweaks all around OpenMW-CS 2021-10-03 19:13:51 +00:00
psi29a
e2e5161d81 Merge branch 'optimizebrushdraw' into 'master' 
Optimize terrain editing brush drawing performance

Closes #6285

See merge request OpenMW/openmw!1226
 2021-09-26 15:14:55 +00:00
Evil Eye
831055f878 Merge branch 'OpenCS-fix-modify' into 'master' 
OpenCS - Re-implement the fix for Issue #6067.

See merge request OpenMW/openmw!1173
 2021-09-19 19:23:30 +00:00
unelsson
70e210735a Optimize terrain editing brush drawing performance 2021-09-18 15:57:00 +03:00
elsid
6b7434ca69
Pass std::string_view instead of const std::string& 
* Starting with Actor::getBodyPartMesh and ending with
  Misc::StringUtils::ciEqual.
* Add tests for Misc::StringUtils::ciEqual.
 2021-09-09 18:39:50 +02:00
psi29a
6170971ea3 Merge branch 'bettermoveinstance' into 'master' 
Set instance movement based on camera zoom

See merge request OpenMW/openmw!1186
 2021-09-06 09:48:30 +00:00
elsid
a8c16071dc
Fix -Wreturn-local-addr warning 
/home/elsid/dev/openmw/apps/opencs/model/world/actoradapter.cpp: In member function ‘const string& CSMWorld::ActorAdapter::ActorData::getPart(ESM::PartReferenceType) const’:
/home/elsid/dev/openmw/apps/opencs/model/world/actoradapter.cpp:142:20: error: returning reference to temporary [-Werror=return-local-addr]
  142 |             return "";
      |                    ^~
 2021-09-04 18:04:45 +02:00
unelsson
f876ff2c14 Clear temporary movement data at the end of the drag 2021-09-01 02:04:04 +03:00
unelsson
53d315c862 XYZ-locking, mouse wheel move fix 2021-09-01 02:04:04 +03:00
unelsson
23fe3d74ab Use floats, not doubles 2021-09-01 02:04:04 +03:00
unelsson
840e7615f5 Store object origins and move difference 2021-09-01 02:04:04 +03:00
unelsson
0d511da615 Test of basic mouse-plane use 2021-09-01 02:04:04 +03:00
cc9cii
b0d5ca386d Update original cell column and do not modify the refnum when moving a reference to another cell with 3D editing. 2021-08-28 16:12:40 +10:00
psi29a
716eebe616 Merge branch 'terrainselectioncrashfix' into 'openmw-47' 
Fix terrain selection crash

See merge request OpenMW/openmw!1165

(cherry picked from commit ec4e3b04a7)

b84e41bd Avoid storing ref, dynamic cast worldspacewidget for safety
d62ddc00 Use QPointer to detect object existence, less verbose debug messages
cb42b528 Remove friend, make getEditMode public to allow editmode testing.
4b148180 Restucture code
08f7c73e Fix text
 2021-08-22 19:22:54 +00:00
elsid
8d2cdedc87
Show number of pathgrid node in a tooltip 
To allow users faster understand what node it is.
 2021-06-28 00:34:49 +02:00
Atahualpa
3a1243a5d0 Rebased branch, reduced code duplication, added comments, adjusted formatting. 2021-05-18 17:53:00 +02:00
Atahualpa
ca80aeaaea Fix vertex calculation for cell-border drawing. 2021-05-18 15:05:26 +02:00
Atahualpa
356efa15a2 Fixes #6035 (circle brush selects outside of circle) and #6036 (some corner vertices not selected). 2021-05-18 15:04:01 +02:00
Atahualpa
7be891b440 Directly use Geometry instead of Geode; fix for loop; add size_t type-cast. 2021-05-18 14:56:03 +02:00
Atahualpa
6c49074765 Remove old references to Cell class. 2021-05-18 14:56:03 +02:00
Atahualpa
008bf64dd9 Second step toward fixing terrain selection issues. 2021-05-18 14:56:03 +02:00
Atahualpa
18ea4d8eb2 First step toward fixing terrain selection issues. 2021-05-18 14:56:02 +02:00
psi29a
3944648f0b Merge branch 'opencs_remove_inclde' into 'master' 
Remove some superfluous includes in the opencs

See merge request OpenMW/openmw!829
 2021-05-14 13:33:06 +00:00
jvoisin
06ae26037f Remove some superfluous includes in the opencs 2021-05-14 10:57:31 +02:00
Thunderforge
339d347aea Fixing performance-faster-string-find issues 
This addresses the Clang Tidy check [performance-faster-string-find](https://clang.llvm.org/extra/clang-tidy/checks/performance-faster-string-find.html).
 2021-05-10 22:44:07 -05:00
Andrei Kortunov
2d869ca9ff Fix node masks signed/unsigned mismatch 2021-04-20 10:52:51 +04:00
Andrei Kortunov
9647b670e4 Do not declare unused variables 2021-04-19 15:43:00 +04:00
Andrei Kortunov
0cadc97fb3 Fix double -> float conversions 2021-04-19 15:36:58 +04:00
uramer
ee2f0e7eb3 Fix inconsistent argument name 2021-01-28 23:47:38 +01:00
uramer
eca0d8b7ea Fix typo in DropMode enum 2021-01-28 22:40:44 +01:00
uramer
edc6d5c3e7 Fix a typo in separate drop binds 2021-01-28 22:22:48 +01:00
uramer
36cd818155 Fix separate drop, refactor for code reuse 2021-01-28 22:10:33 +01:00
Bret Curtis
a735bbe9a5
Merge pull request #3040 from akortunov/pvs 
Fix some issues, found by PVS Studio
 2021-01-10 12:58:17 +01:00
Nelsson Huotari
313e895912 [OpenMW-CS] Cube and sphere instance selection 2021-01-09 21:35:07 +00:00
Andrei Kortunov
ad101de733 Merge declaration and initialization 2021-01-09 22:58:54 +04:00
Andrei Kortunov
7fc4c9f3f6 Avoid dead code 2021-01-09 13:52:01 +04:00
Coleman Smith
3b9db41346 removing unneeded variable 2020-12-10 17:03:10 -08:00
Coleman Smith
842ea9d6ed simplifying a bit 
- attaching gradient camera directly to the main camera
- using Vec4ub
 2020-12-10 21:36:46 +00:00
Andrei Kortunov
8084a336b5 Replace zeroes and nulls by nullptrs 2020-11-29 11:14:07 +04:00
Alexei Dobrohotov
53f91a3aa5
Merge pull request #3018 from akortunov/emplace 
Use emplace_back instead of push_back
 2020-11-01 01:58:56 +03:00
Bret Curtis
5a824d0333 components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues 2020-10-22 23:57:53 +02:00
Andrei Kortunov
065ed5138e Use emplace_back instead of push_back 2020-10-18 10:27:35 +04:00
Andrei Kortunov
8ca3c3b123 Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
elsid
40ad87bc4d
Replace OpenThreads by std types 2020-06-25 22:16:09 +02:00
Andrei Kortunov
c8d5d421d9 Do not use deprecated mouse wheel movement angle 2020-06-22 18:46:45 +04:00
Andrei Kortunov
2b4274bca8 Use modern Qt flag declarations 2020-06-22 18:46:45 +04:00
Bret Curtis
61a5c6125d #5480: Drop Qt4 support and require Qt 5.12 or later. 2020-06-22 12:17:06 +02:00
Bret Curtis
68549828b4 create static functions to set/get hidden node mask; compromise on magic numbers to make things easier to understand 2020-04-22 13:34:19 +02:00
Bret Curtis
8a8107e837 as it says; revert vismask and uncomplicate openmw 2020-04-20 20:57:38 +02:00
Nelsson Huotari
42c7ec8f1c Minor fix to calculation of mLandSizeFactor (-1) 2020-04-07 16:56:47 +03:00
Andrei Kortunov
023c51ad0e Fix int/float conversions in the CSVRender::BrushDraw 2020-04-07 13:56:03 +04:00
Bret Curtis
7fda65e7bb
Merge pull request #2692 from unelsson/opencsbrushdraw 
Editor: Implement brush outlines
 2020-04-05 20:52:45 +02:00
Andrei Kortunov
a68d9aed4c Fix issues, found by CoverityScan 2020-04-04 17:45:26 +04:00
Nelsson Huotari
66fba7cc51 Remove unneeded constructors, only initialize in cpp, minor fixes 2020-03-26 18:06:33 +02:00
Nelsson Huotari
ec2ff2a9b0 Fix if oneliners 2020-03-26 14:47:40 +02:00
Nelsson Huotari
18cdd3bd7c rebase-related fixes 2020-03-26 13:25:33 +02:00
Nelsson Huotari
da0add904b Fix and simplify brush outlines and coordinate calculations 2020-03-26 13:25:33 +02:00
Nelsson Huotari
8f625474fd Hotfix terraintexturemode circle brush radius calculations 2020-03-26 13:25:33 +02:00
Nelsson Huotari
e14c390a9b Fix crash 2020-03-26 13:25:33 +02:00
Nelsson Huotari
731e5b57f5 Tool outline for terraintexturemode and square shape. Various fixes. 2020-03-26 13:25:33 +02:00
Nelsson Huotari
24c8b32d4c Implement brush outline for terrainshapemode 2020-03-26 13:25:33 +02:00
Nelsson Huotari
793ea8566f Fix typo 2020-03-19 12:14:10 +02:00
Nelsson Huotari
17cb3414d8 clean-up, improve formatting 2020-03-19 11:18:54 +02:00
Nelsson Huotari
75f6577f61 Remove unneeded include 2020-03-18 11:26:11 +02:00
Nelsson Huotari
41aa90bfa7 Add helper class for safer mask handling 2020-03-18 11:18:18 +02:00
Nelsson Huotari
af434cffba fix numeric limits min() to lowest(), fix correct drop height 2020-03-18 11:18:18 +02:00
Nelsson Huotari
035d5205d9 Use collision boxes to calculate dropping height, variable naming 2020-03-18 11:18:18 +02:00
Nelsson Huotari
54738e1e32 Handle mask disabling better 2020-03-18 11:17:22 +02:00
Nelsson Huotari
711dc59f09 Implement four different functions for dropping 2020-03-18 11:17:22 +02:00
Nelsson Huotari
f063eeb36e Drop objects with a keyboard shortcut 2020-03-18 11:17:22 +02:00
Nelsson Huotari
198a75b8e6 Delete selected instances with a hotkey 2020-02-19 11:44:55 +02:00
Andrei Kortunov
84979fa8b7 Move VisMask to components 2020-02-16 16:03:35 +04:00
AnyOldName3
73722eedf3 Add default font releaseGLObjects workaround for OSG <3.65 
This resolves https://gitlab.com/OpenMW/openmw/issues/4704

I've not compiled this or anything and I'm going off my memory from
around ten or eleven months ago, so if this fails CI or causes more
problems, that's why. The most likely issue is that we'll need to make
the context current before releasing the program.
 2020-01-30 23:12:54 +00:00
Bret Curtis
7dfbeff049
Merge pull request #2677 from unelsson/fixcsrotation 
Editor: Convert radians to degrees when rotating objects
 2020-01-28 11:55:56 +01:00
Nelsson Huotari
032513ae18 Convert radians to degrees 2020-01-28 11:33:44 +02:00
capostrophic
89055f1c6c Generate WNAM upon saving terrain 2020-01-11 02:42:04 +03:00
bzzt
f09125fc93 perf regression fix 2019-11-20 13:37:00 +00:00
Bret Curtis
454b9f1964
Merge pull request #2597 from akortunov/coverity 
CoverityScan fixes, part 2
 2019-11-14 21:08:03 +01:00
Alexei Dobrohotov
b5992b380e
Merge pull request #2586 from unelsson/allowselectionalledges 
Allow selecting cell edges everywhere
 2019-11-14 17:25:48 +03:00
Andrei Kortunov
b210e99abc Avoid divizion by zero 2019-11-14 17:43:21 +04:00
Nelsson Huotari
120583f443 optimize isInCellSelection calls 2019-11-14 11:28:49 +02:00
Andrei Kortunov
238dcdbbd4 Fix copy-paste error 2019-11-13 15:14:30 +04:00
Andrei Kortunov
079c77ff22 Avoid zero division 2019-11-13 14:57:22 +04:00