diff --git a/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/BasicExample.java b/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/GameScreen.java similarity index 99% rename from examples/SamplesApp/core/src/main/java/jolt/example/samples/app/BasicExample.java rename to examples/SamplesApp/core/src/main/java/jolt/example/samples/app/GameScreen.java index 970c321..53f6fc0 100644 --- a/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/BasicExample.java +++ b/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/GameScreen.java @@ -23,7 +23,7 @@ import static jolt.EMotionType.EMotionType_Static; import static jolt.jolt.physics.EActivation.EActivation_Activate; -public class BasicExample extends ScreenAdapter { +public class GameScreen extends ScreenAdapter { // Object layers static int LAYER_NON_MOVING = 0; diff --git a/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/InitScreen.java b/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/InitScreen.java index c29959c..f729cf0 100644 --- a/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/InitScreen.java +++ b/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/InitScreen.java @@ -22,7 +22,7 @@ public void show() { public void render(float delta) { if(init) { init = false; - game.setScreen(new BasicExample()); + game.setScreen(new GameScreen()); } } } diff --git a/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/SamplesApp.java b/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/SamplesApp.java new file mode 100644 index 0000000..56fe8a5 --- /dev/null +++ b/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/SamplesApp.java @@ -0,0 +1,12 @@ +package jolt.example.samples.app; + +public class SamplesApp { + + public void startTest(Class testClass) { + + } + + public void nextTest() { + + } +} \ No newline at end of file diff --git a/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/Test.java b/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/Test.java new file mode 100644 index 0000000..894544b --- /dev/null +++ b/examples/SamplesApp/core/src/main/java/jolt/example/samples/app/Test.java @@ -0,0 +1,15 @@ +package jolt.example.samples.app; + +import jolt.DebugRendererEm; +import jolt.jolt.core.TempAllocator; +import jolt.jolt.physics.PhysicsSystem; +import jolt.jolt.physics.body.BodyInterface; + +public abstract class Test { + + PhysicsSystem mPhysicsSystem = null; + BodyInterface mBodyInterface = null; + DebugRendererEm mDebugRenderer = null; + TempAllocator mTempAllocator = null; + +} diff --git a/jolt/jolt-build/src/main/cpp/jolt.idl b/jolt/jolt-build/src/main/cpp/jolt.idl index 5c2a179..1f819a9 100644 --- a/jolt/jolt-build/src/main/cpp/jolt.idl +++ b/jolt/jolt-build/src/main/cpp/jolt.idl @@ -3542,4 +3542,14 @@ interface JoltInterface { ObjectVsBroadPhaseLayerFilter GetObjectVsBroadPhaseLayerFilter(); // static unsigned long long sGetTotalMemory(); // static unsigned long long sGetFreeMemory(); +}; + +interface TempAllocatorImpl { + void TempAllocatorImpl(unsigned long inSize); + +}; + +interface JobSystemThreadPool { + void JobSystemThreadPool(unsigned long inMaxJobs, unsigned long inMaxBarriers, optional long inNumThreads); + }; \ No newline at end of file diff --git a/jolt/jolt-build/src/main/java/Build.java b/jolt/jolt-build/src/main/java/Build.java index a0f44b2..ad46823 100644 --- a/jolt/jolt-build/src/main/java/Build.java +++ b/jolt/jolt-build/src/main/java/Build.java @@ -7,6 +7,7 @@ import com.github.xpenatan.jparser.builder.tool.BuildToolListener; import com.github.xpenatan.jparser.builder.tool.BuildToolOptions; import com.github.xpenatan.jparser.builder.tool.BuilderTool; +import com.github.xpenatan.jparser.idl.IDLHelper; import com.github.xpenatan.jparser.idl.IDLReader; import java.util.ArrayList; @@ -17,6 +18,14 @@ public static void main(String[] args) { String modulePrefix = "jolt"; String basePackage = "jolt"; String sourceDir = "/build/jolt"; + + IDLHelper.cppConverter = idlType -> { + if(idlType.equals("unsigned long long")) { + return "uint64"; + } + return null; + }; + BuildToolOptions op = new BuildToolOptions(modulePrefix, libName, basePackage, sourceDir, args); BuilderTool.build(op, new BuildToolListener() { @Override