-
-
Couldn't load subscription status.
- Fork 496
Refactor all post 1.5.7 funcs to use the new parser #1454
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
Refactor all post 1.5.7 funcs to use the new parser #1454
Conversation
I know there are a few messed up commits. Im sorry.
Seems like we either move
{"resetBlurLevel", CLuaDefs::ArgumentParser<CLuaFunctionDefs::ResetBlurLevel>}, to LuaDefs.World(Somehow, because CLuaManager loads all the defs from where) or we make CLuaDefs::ArgumentParser functions public or we do a private CLuaDefs to CLuaManager which would be dumb.
I also refactored the non OOP functions in ColShapeDefs to return numbers instead of vector(s)
There you go.
The build doesnt compile.
I need someone who could answer my previous question,
Seems like we either move
{"resetBlurLevel", CLuaDefs::ArgumentParserCLuaFunctionDefs::ResetBlurLevel}, to LuaDefs.World(Somehow, because CLuaManager loads all the defs from where) or we make CLuaDefs::ArgumentParser functions public or we do a private CLuaDefs to CLuaManager which would be dumb.
also, DxDrawWiredSphere has const SColorARGB color, how should we deal with that?
240b8d3 to
2e2c68d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Annotated each suggested change with the name of the commit it should be melded into, so try and batch matching names if you accept the changes.
#1454 (comment)
@qaisjp
I cant comment on the issue, but no, its I've deleted the old function, and added the new, one liner(CStaticFDs was always returning true, so there was no need for that check)
Its still not compiling because we need to resolve the dxDrawWiredSphere argument SColorARGB. What should we do with that? Should I revert that commit? Or we implement SColorARGB?
@sbx320 I think I need your opinion here as well. I've asked about it before, but we didnt resolve it.
Implement SColor in a separate PR the same way the old parser works.
e437363 to
abbaf65
Compare
Alright, alright, there we go.
I did it this time.
Also, I didn't mention it earlier when I worked with you on the rebase since I didn't want to spend too much time with you watching rewords, but you need to reword every commit to be more clear.
"Refactor X" is not clear enough - someone must be able to read the commit message and know exactly what change was made.
It should be "Refactor X to use new Lua arg parser", and if there are other changes, include those in the commit descriptions.
Okay, no problem.
Ill do it tomorrow.
.... Resolves the given variant to a modelID
...includes to cluaenginedefs.h
...lveD3DXFont to accept std::variant, also move the old definition of it into CStaticFDs.h
...layerScriptDebugLevel from CStaticFunc
abbaf65 to
964af05
Compare
3261f1f, 6ed8668, 629e84e are messed up. I'm not quite sure how to fix it. I've googled it up, but the instructions on StackOverflow aren't totally clear to me, so if you could please explain it to me how could I change the contents of those commits, so they aren't totally messed up?
What I have in mind is to just cherry pick those 3 commits into a separate branch, there you can then separately commit each change (there a feature in VSC where you can select the lines, and make a commit out of the selected lines), and then just merge that branch back into this one.
if that makes sense.
Actually i could just go to another branch, squash merge the whole branch, and stage-commit changes line-by-line, so every commit would be perfect.
If theres a way to merge without having a 'merged branch..' commit automatically added?
Im not quite sure whats up with the new parser?
Please take a look at the build logs
All refactors have been moved to other PRs.
Uh oh!
There was an error while loading. Please reload this page.
I've talked with Qais, and he said it would be a big help to refactor all these new functions.
Also, the not done list:
std::vector<std::pair<const char*, Type*>>, or with string_view.Also, maybe its not the best place to discuss: I think adding the ability to return
std::optionalto the new parser would be dope. Theres a function in the col shape file, where I've left aTODOcomment, because its ugly and we need a refactor.