Skip to content

Commit

Permalink
Begin jolt physics
Browse files Browse the repository at this point in the history
  • Loading branch information
luboslenco committed Aug 2, 2024
1 parent a60ebb5 commit 2537d96
Show file tree
Hide file tree
Showing 16 changed files with 567 additions and 2,817 deletions.
1 change: 0 additions & 1 deletion armorforge/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ else if (flags.ios) {

if (flags.physics) {
project.addDefine("arm_physics");
project.addAssets("assets/plugins/ammo/*", { destination: "data/plugins/{name}" });
}

if (flags.raytrace) {
Expand Down
965 changes: 0 additions & 965 deletions armorpaint/assets/plugins/ammo/ammo.js

This file was deleted.

15 changes: 13 additions & 2 deletions armorpaint/plugins/project.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
let project = new Project('plugins');

// project.addFile('sources/**'); ////
// project.addFile('sources/**');
project.addFile('sources/plugins.cpp');

project.addDefine('TINYUSDZ_NO_STB_IMAGE_IMPLEMENTATION');

project.flatten();
if (platform === "windows") {
project.addLib('sources/phys_jolt/win32/jolt');
}
else if (platform === "linux") {
process.env.LIBRARY_PATH = project.basedir + "/sources/phys_jolt/linux";
project.addLib('jolt');
}
else if (platform === "macos") {
project.addLib('sources/phys_jolt/macos/libjolt.a');
}

return project;
7 changes: 7 additions & 0 deletions armorpaint/plugins/sources/phys_jolt/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright 2021 Jorrit Rouwe

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2 changes: 2 additions & 0 deletions armorpaint/plugins/sources/phys_jolt/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Jolt Physics revision 4084c13b676a2e7ebf9662b47dcb949179b8c4a1.
https://github.com/jrouwe/JoltPhysics
Binary file not shown.
Loading

0 comments on commit 2537d96

Please sign in to comment.