-
-
Notifications
You must be signed in to change notification settings - Fork 463
Add LOD management functions #3831
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Fernando-A-Rocha
wants to merge
52
commits into
multitheftauto:master
from
Fernando-A-Rocha:add-lod-model-func
Closed
Changes from 7 commits
Commits
Show all changes
52 commits
Select commit
Hold shift + click to select a range
6f7c6c6
add shared func getObjectLODModel(int objectModel)
Fernando-A-Rocha f182db2
Merge branch 'master' into add-lod-model-func
Fernando-A-Rocha cb928f1
refactor 1
Fernando-A-Rocha 93251bd
new arg parser
Fernando-A-Rocha d0419a3
Merge branch 'master' into add-lod-model-func
Fernando-A-Rocha 62cb6e8
rename to GetObjectLODOfModel
Fernando-A-Rocha c648cbb
add getObjectModelOfLOD
Fernando-A-Rocha 405ad8d
refactors
Fernando-A-Rocha 51e8967
refactor
Fernando-A-Rocha 21e7b28
test @TracerDS
Fernando-A-Rocha 6244ebb
fix OBJ_LOD_MODELS array @TracerDS
Fernando-A-Rocha 73a4252
constexpr
Fernando-A-Rocha 832c6bd
Update CLodModels.cpp
Fernando-A-Rocha be36dc5
Update CLodModels.cpp
Fernando-A-Rocha 765f7aa
rename GetObjectLowLODOfModel and GetObjectHighLODOfModel
Fernando-A-Rocha c3613f3
Merge branch 'add-lod-model-func' of github.com:Fernando-A-Rocha/mtas…
Fernando-A-Rocha 71fb7f5
incomplete lod array sorted WIP
Fernando-A-Rocha 26f980e
comment
Fernando-A-Rocha 81c971a
Fixed LOD table WIP
Fernando-A-Rocha 1e223ab
funcs refactor
Fernando-A-Rocha 4225df7
uselesss include
Fernando-A-Rocha caec9d7
del getObjectCustomLowLODModel
Fernando-A-Rocha a6466f5
Merge branch 'master' into add-lod-model-func
Fernando-A-Rocha a43f1ad
Merge branch 'master' into add-lod-model-func
Fernando-A-Rocha 9a1fece
Update Shared/mods/deathmatch/logic/CLodModels.h
Fernando-A-Rocha 0b771df
Update Shared/mods/deathmatch/logic/CLodModels.h
Fernando-A-Rocha 9c117fd
optimize lookups
Fernando-A-Rocha 1f3ddc6
comments
Fernando-A-Rocha e563d71
Merge branch 'master' into add-lod-model-func
Fernando-A-Rocha 50e282e
Merge branch 'master' into add-lod-model-func
Fernando-A-Rocha 70809d5
Merge branch 'master' into add-lod-model-func
Fernando-A-Rocha 5af6b06
rename funcs, add isValidModel WIP
Fernando-A-Rocha 93c98c8
.
Fernando-A-Rocha cbad928
.
Fernando-A-Rocha ab63086
isValidModel update
Fernando-A-Rocha b03ea49
wip
Fernando-A-Rocha e8150c1
Merge branch 'master' into add-lod-model-func
Fernando-A-Rocha 80604f0
Merge branch 'master' into add-lod-model-func
Fernando-A-Rocha ba04a9c
Add missing entries
lotsofs 6168d02
Add additional HLODs that each map to the same LLOD CLodModels.cpp
lotsofs 304f6de
Add multiple LLODs for 1 HLOD to CLodModels.cpp
lotsofs c104f40
Update LLOD that covers multiple HLODs in CLodModels.cpp
lotsofs d9d5d51
Fix one entry in CLodModels.cpp
lotsofs 20b1d37
Fix entry 5945 in CLodModels.cpp
lotsofs 49259f7
Merge pull request #1 from lotsofs/patch-1
Fernando-A-Rocha 9e4ca81
Merge pull request #2 from lotsofs/patch-2
Fernando-A-Rocha 5cd469f
Merge pull request #3 from lotsofs/patch-3
Fernando-A-Rocha b7f0a9c
Merge pull request #4 from lotsofs/patch-4
Fernando-A-Rocha a1b3f86
Merge pull request #5 from lotsofs/patch-5
Fernando-A-Rocha 404cd79
Merge pull request #6 from lotsofs/patch-6
Fernando-A-Rocha d7eeea5
Merge branch 'master' into add-lod-model-func
Fernando-A-Rocha 8b32c87
Merge branch 'master' into add-lod-model-func
Dutchman101 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
/***************************************************************************** | ||
* | ||
* PROJECT: Multi Theft Auto v1.0 | ||
Fernando-A-Rocha marked this conversation as resolved.
Show resolved
Hide resolved
|
||
* (Shared logic for modifications) | ||
* LICENSE: See LICENSE in the top level directory | ||
* FILE: mods/shared_logic/CLodModels.h | ||
* | ||
*****************************************************************************/ | ||
#pragma once | ||
|
||
#include <map> | ||
#include <memory> | ||
#include <cstdint> | ||
|
||
class CLodModels | ||
{ | ||
public: | ||
static std::uint32_t GetObjectLODOfModel(std::uint32_t objectID); | ||
static std::uint32_t GetObjectModelOfLOD(std::uint32_t lodID); | ||
Fernando-A-Rocha marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
private: | ||
// Static pointer to a map that is initialized in the .cpp file | ||
static std::unique_ptr<const std::map<std::uint32_t, std::uint32_t>> LOD_MODELS; | ||
Fernando-A-Rocha marked this conversation as resolved.
Show resolved
Hide resolved
Fernando-A-Rocha marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.