87 Commits
Author SHA1 Message Date
Bret Curtis 4addabaf95 Let the resource cache be told what it stores, and free its values from OSG
GenericObjectCache stored osg::ref_ptr<osg::Object>, so everything cached had to
derive from osg::Object whether that meant anything or not: NifFileHolder and
BgsmFileHolder existed for no other reason, Resource::BulletShape and
ESMTerrain::LandObject carried META_Object and a CopyOp constructor nothing ever
called, and every getter paid a static_cast on the way out. The cache and
MultiObjectCache now take their value type as a template parameter, ask "is
anything else holding this?" through a useCount overload rather than a base class
method, and constrain accept and releaseGLObjects so a value type with neither is
not an error. Both holders are deleted; BulletShape, BulletShapeInstance and
LandObject become plain classes held by std::shared_ptr across physics,
pathfinding, navmeshtool and terrain storage; MWPhysics::HeightField's
type-erased osg::Object keep-alive becomes the LandObject it was always holding;
every remaining manager names the type it actually caches through the
NodeResourceManager alias, which removes eight static_casts and stops
clang-format wrapping the declarations. The preloader needs two keep-alive sets
for now, because the render-owned entries are still osg::Object; they merge once
those move behind the render backend.
2026-09-18 16:10:18 +02:00
elsid 11150f5758 Use ESM::Path for ESM::LandTexture::mTexture 2026-06-20 15:13:22 +02:00
Alexei Kotov 274b93b2d9 Fix ESM4 base terrain layer opacity overflow
std::max specializations cast the argument to the type, so the layer opacity subtraction result would turn positive and cause bright spots
2026-04-02 08:38:43 +03:00
Evil Eye ebb4ccdd95 Merge branch 'sciencecompelsustoflipthesun' into 'master'
Change the texture asset origin convention to top-left (#6885)

See merge request OpenMW/openmw!5135
2026-02-25 16:31:36 +00:00
elsid 142acadce6 Use normalized path in Storage::getTextureSetLayerInfo 2026-02-15 22:43:32 +01:00
elsid 28b226740e Use normalized path in Storage::getLayerInfo 2026-02-15 22:43:32 +01:00
Alexei Kotov a357dcc1b1 Change the texture asset convention to top-left (#6885)
This is basically a MR description but this commit covers a lot of things so I'll include it so you don't have to look at the MR:

This allows us to use BC6H and BC7 textures as is, provided the used OSG revision and hardware support them
DDS images are unflipped by default, non-DDS bottom-left convention images are flipped (TGA, BMP, PNG, JPG)
3D DDS images always used top-left convention if they were used in post-processing

Numerous things flipped in this commit to guarantee the same visual results are:
- Terrain UV and blend maps
- Water UV, normal map and simple water ripple alignment

- NiTriShapeData and BSTriShape UV (unflipped), NiUVController vertical offset
- NIF particles are NOT flipped, they remain flipped for Morrowind compatibility

- GUI widget texture UV and convention
- Cursor
- Character preview inventory doll and race menu head UV and display
- Loading screen scene image UV
- Local and global map UVs (fog of war, unexplored and explored maps)
- Saved game screenshot UV
- Video widget UV

- Rain particle alignment
- Sun and moon UV

- Tangent space handedness (bitangent direction)
- Parallax vertical offset

Things where this is a breaking change
- Collada geometry UV (Example Suite and anything else affected must adopt the changes)
- Compressed non-S3TC images that should but can't be flipped (this is KTX which we don't technically support yet)
- Any forward pass shader replacements that currently still use the original tangent space handedness and parallax convention
2026-02-05 21:05:35 +03:00
elsid b5196b2fd1 Use normalized path for correctResourcePath and related functions 2025-12-08 20:38:15 +01:00
Evil Eye cb82d37992 Address remaining conversion warnings in components 2025-09-20 11:39:31 +02:00
elsid d121b606b6 Fix and enforce local variable naming 2025-08-05 21:27:48 +02:00
Petr Mikheev 0b5c8271e0 ESM4 landscape textures 2025-08-01 18:45:24 +02:00
Evil Eye ca6baed366 Fix LTEX overriding and allow deletion 2024-06-03 16:42:27 +02:00
Evil Eye 6a10311ae5 Use more appropriate types in terrain storage 2024-05-23 18:48:54 +02:00
elsid 01166b1f26 Split ESM headers 2024-05-03 01:55:20 +02:00
Andrei Kortunov 87c9f395f1 Move local variables in components 2024-01-19 16:01:48 +04:00
elsid eba553821b Use std::vector for LandCache implementation 2023-08-27 01:32:36 +02:00
elsid bda29819cf Reduce include dependency for land records 2023-08-19 01:30:17 +02:00
elsid a027cd898b Use only cell position to detect cell change 2023-08-19 01:30:17 +02:00
elsid 28614730da Pass land reference to LandObject constructor 2023-08-19 01:30:17 +02:00
elsid e6f35373b5 Remove ESM::LandObject dependency on ESM::Land 2023-08-19 01:30:16 +02:00
elsid ce6ffba986 Move blendmap sampling logic into separate function 2023-08-12 02:45:09 +02:00
elsid 8e7fe44514 Support terrain sample size greater than cell size 2023-08-06 23:47:35 +02:00
elsid 2a49919b53 Move esm3terrain to esmterrain 2023-08-06 19:17:44 +02:00
Bret CurtisandBret Curtis cdbab2325f rename esmterrain to esm3terrain 2022-01-23 17:19:30 +01:00
Andrei Kortunov 8084a336b5 Replace zeroes and nulls by nullptrs 2020-11-29 11:14:07 +04:00
elsid 40ad87bc4d Replace OpenThreads by std types 2020-06-25 22:16:09 +02:00
Andrei Kortunov 1cdd33b434 Implement additional stringops to avoid Boost functions 2020-01-09 19:40:22 +04:00
bzzt f09125fc93 perf regression fix 2019-11-20 13:37:00 +00:00
Nelsson Huotari 0ce971c1bb Revert back to less aggressive component-level changes. 2019-10-22 21:26:55 +03:00
Nelsson Huotari 16138fc896 Transient land shape editing 2019-10-22 21:25:10 +03:00
bzztandAndrei Kortunov 528cda8032 Prevent layers duplication when a terrain chunk crosses plugin borders 2019-06-01 14:52:42 +04:00
Andrei Kortunov 1da012f6ee Optimize blendmap generation 2019-06-01 14:37:29 +04:00
Andrei Kortunov 7c53b99d31 Avoid possible data race during access to the static local variable 2019-05-24 08:03:45 +04:00
Capostrophic 786f3e5fc3 Remove unused and unfinished blendmap packing feature 2019-03-22 22:15:28 +03:00
bzztandCapostrophic b42ad0f610 Inline certain terrain storage functions 2019-03-17 07:27:27 +03:00
bzztandCapostrophic e131e6699c Match vertex colors data type to source 2019-03-17 07:24:22 +03:00
Andrei Kortunov 3032b177a1 Remove redundant includes 2019-02-23 08:02:12 +04:00
Andrei Kortunov e06f0b797a Replace all NULLs to nullptr 2018-10-09 10:21:12 +04:00
Andrei Kortunov 70ed8fd1a9 Use constants instead of widely used magic numbers (task #4645) 2018-09-17 19:22:50 +04:00
Andrei Kortunov 1452684d9e Use new logging system for components 2018-08-14 19:42:41 +04:00
Andrei Kortunov 12144de8ed Initialize missing variables 2018-08-01 20:18:37 +04:00
Andrei Kortunov 359e748c28 Initialize some missing fields in constructors 2018-06-25 09:35:42 +04:00
wareya 94f695cffc Fix #4452 and remove dead code 2018-06-12 21:04:27 -04:00
wareya 7344323b9e remove indentation from blank lines 2018-06-09 10:31:51 -04:00
wareya 8f45b0d53a remove unnecessary conditions 2018-06-09 10:11:43 -04:00
wareya 6277f5511c fix #3876 and #3993 2018-06-08 17:52:46 -04:00
tri4ng1eandscrawl d4d1703bcf Some PVS-Studio and cppcheck fixes
cppcheck:
[apps/esmtool/record.cpp:697]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1126]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1138]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/niftest/niftest.cpp:36]: (performance) Function parameter 'filename' should be passed by reference.
[apps/niftest/niftest.cpp:41]: (performance) Function parameter 'filename' should be passed by reference.
[apps/opencs/model/prefs/boolsetting.cpp:25]: (warning) Possible leak in public function. The pointer 'mWidget' is not deallocated before it is allocated.
[apps/opencs/model/prefs/shortcuteventhandler.cpp:52]: (warning) Return value of std::remove() ignored. Elements remain in container.
[apps/openmw/mwstate/quicksavemanager.cpp:5]: (performance) Variable 'mSaveName' is assigned in constructor body. Consider performing initialization in initialization list.

PVS-Studio:
apps/opencs/model/filter/parser.cpp  582  warn  V560 A part of conditional expression is always true: allowPredefined.
apps/opencs/view/world/referencecreator.cpp  67  warn  V547 Expression '!errors.empty()' is always false.
apps/opencs/view/world/referencecreator.cpp  74  warn  V547 Expression '!errors.empty()' is always false.
apps/opencs/view/doc/loader.cpp  170  warn  V560 A part of conditional expression is always true: !completed.
apps/opencs/view/doc/loader.cpp  170  warn  V560 A part of conditional expression is always true: !error.empty().
apps/opencs/model/tools/pathgridcheck.cpp  32  err  V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 32, 34.
apps/opencs/model/world/refidadapterimp.cpp  1376  err  V547 Expression 'subColIndex < 3' is always true.

apps/openmw/mwgui/widgets.hpp  318  warn  V703 It is odd that the 'mEnableRepeat' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:318, MyGUI_ScrollBar.h:179.
apps/openmw/mwgui/widgets.hpp  319  warn  V703 It is odd that the 'mRepeatTriggerTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:319, MyGUI_ScrollBar.h:180.
apps/openmw/mwgui/widgets.hpp  320  warn  V703 It is odd that the 'mRepeatStepTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:320, MyGUI_ScrollBar.h:181
apps/openmw/mwmechanics/actors.cpp  1425  warn  V547 Expression '!detected' is always true.
apps/openmw/mwmechanics/character.cpp  2155  err  V547 Expression 'mode == 0' is always true.
apps/openmw/mwmechanics/character.cpp  1192  warn  V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present.
apps/openmw/mwmechanics/character.cpp  521  warn  V560 A part of conditional expression is always true: (idle == mIdleState).
apps/openmw/mwmechanics/pathfinding.cpp  317  err  V547 Expression 'mPath.size() >= 2' is always true.
apps/openmw/mwscript/interpretercontext.cpp  409  warn  V560 A part of conditional expression is always false: rank > 9.
apps/openmw/mwgui/windowbase.cpp  28  warn  V560 A part of conditional expression is always true: !visible.
apps/openmw/mwgui/journalwindow.cpp  561  warn  V547 Expression '!mAllQuests' is always false.
apps/openmw/mwgui/referenceinterface.cpp  18  warn  V571 Recurring check. The '!mPtr.isEmpty()' condition was already verified in line 16.
apps/openmw/mwworld/scene.cpp  463  warn  V547 Expression 'adjustPlayerPos' is always true.
apps/openmw/mwworld/worldimp.cpp  409  err  V766 An item with the same key '"sCompanionShare"' has already been added.
apps/openmw/mwworld/cellstore.cpp  691  warn  V519 The 'state.mWaterLevel' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 689, 691.
apps/openmw/mwworld/weather.cpp  1125  warn  V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1123, 1125.
apps/openmw/mwworld/weather.cpp  1137  warn  V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1135, 1137.

apps/wizard/unshield/unshieldworker.cpp  475  warn  V728 An excessive check can be simplified. The '(A && B) || (!A && !B)' expression is equivalent to the 'bool(A) == bool(B)' expression.
apps/wizard/installationpage.cpp  163  warn  V735 Possibly an incorrect HTML. The "</p" closing tag was encountered, while the "</span" tag was expected.

components/fontloader/fontloader.cpp  427  err  V547 Expression 'i == 1' is always true.
components/nifosg/nifloader.cpp  282  warn  V519 The 'created' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 278, 282.
components/esm/loadregn.cpp  119  err  V586 The 'clear' function is called twice for deallocation of the same resource. Check lines: 112, 119.
components/esm/cellref.cpp  178  warn  V581 The conditional expressions of the 'if' statements situated alongside each other are identical. Check lines: 175, 178.
components/esmterrain/storage.cpp  235  warn  V560 A part of conditional expression is always true: colStart == 0.
components/esmterrain/storage.cpp  237  warn  V560 A part of conditional expression is always true: rowStart == 0.
2018-04-18 12:36:10 +00:00
Allofich 3780d94214 Cast LAND_SIZE to integer to avoid linking error 2017-03-28 01:57:31 +09:00
scrawl fd215caa02 Add local LandCache to cut down on store searches 2017-03-14 19:27:57 +01:00
scrawl 0756fc4ae6 Optimize getBlendmaps for the general case that most points are within the given cell 2017-03-14 19:27:55 +01:00