Updated to Newton2 and angelscript 2.22.0#3
Updated to Newton2 and angelscript 2.22.0#3Naddiseo wants to merge 22 commits intoFrictionalGames:masterfrom
Conversation
- Added find ALUT/OGG/Vorbis, taken from osgaudio
Collisions are OK, however interaction with objects in Penumbra is broken.
…nto any object results in instant death. XD
- Tried to make cPhysicsMaterialNewton::ProcessContactCallback work with newton2 - Add virtual qualifiers to some destructors
Conflicts: sources/impl/SqScript.cpp
Conflicts: sources/impl/scriptbuilder.cpp sources/impl/scripthelper.cpp sources/impl/scriptstring.cpp sources/impl/stdstring.cpp
|
Are you sure it's working with Newton 2 in the pull request? The titles for two of the commits don't give me much faith that they are: "Port to Newton 2 API. Collision code is currently broken as walking into any object results in instant death." and "Collisions are OK, however interaction with objects in Penumbra is broken." It's unclear what "Newton fix" fixes in this case. Does it fix both of the above two? Just one? Or is it unrelated to these? |
|
Merging the two branches that were porting to newton 2 seems to fix both those issues. I only played to the storage room, so the interaction and collision works to at least there. And obviously, no instant death. The only issue I saw is the one I mentioned in the original comment, there are likely others, but I'm not familiar enough with either codebase to understand where and why it happens. This pull request is basically just a "I got it to compile and work" kind-of thing. |
sources/impl/LowLevelSystemSDL.cpp
Outdated
| sMess +=_W("\n\n"); | ||
| sMess += text; | ||
| fl_alert("%ls\n\n%ls",asCaption,text); | ||
| fprintf(stderr, "%ls\n\n%ls",asCaption,text); |
There was a problem hiding this comment.
Really this should be replaced with the SDL2 dialog code.
7 participants
I've built upon previous branches done by others in effort to port to Newton2 and a newer version of angelscript.
List of changes in this branch:
Things still TODO:
Let me know if I can clean up the patches better.