From 2a78f8cf811bc82a57063a011c6f1e3b251f15f4 Mon Sep 17 00:00:00 2001 From: n00b Date: Sat, 30 Nov 2024 22:45:20 -0500 Subject: [PATCH] Removed box2d world from clone canvas --- rcbasic_build/main.rc_asm | 58 ++++++++++++++++++++++++++++++ rcbasic_build/main.rc_data | 14 ++++---- rcbasic_build/rcbasic.dbgs | 5 +++ rcbasic_build/rcbasic_build.depend | 2 +- rcbasic_runtime/rc_gfx.h | 7 ---- 5 files changed, 71 insertions(+), 15 deletions(-) diff --git a/rcbasic_build/main.rc_asm b/rcbasic_build/main.rc_asm index 0dcf450..051aeae 100644 --- a/rcbasic_build/main.rc_asm +++ b/rcbasic_build/main.rc_asm @@ -319,6 +319,11 @@ mov !6 n6 func !174 pop n7 mov !31 n7 +mov n0 !31 +mov n1 0 +mov !0 n0 +mov !1 n1 +func !191 mov n0 10 mov !0 n0 func !634 @@ -591,6 +596,59 @@ mov !12 n0 push n0 gosub @cam_control pop n0 +mov n0 !30 +mov !0 n0 +func !181 +func !173 +mov n0 !36 +mov n1 !43 +mov n2 !44 +mov n3 !45 +mov !0 n0 +ptr !1 n1 +ptr !2 n2 +ptr !3 n3 +func !646 +pop_ptr !3 +mov n0 !43 +mov n1 !44 +mov n2 !45 +mov n3 !46 +mov n4 !47 +mov !0 n0 +mov !1 n1 +mov !2 n2 +ptr !3 n3 +ptr !4 n4 +func !858 +pop_ptr !2 +mov n0 !31 +mov !0 n0 +func !181 +func !185 +mov n0 0 +mov n1 0 +mov n2 200 +mov !0 n0 +mov !1 n1 +mov !2 n2 +func !208 +pop n3 +mov !0 n3 +func !203 +mov n0 !46 +mov n1 10 +mov n2 !47 +mov n3 10 +mov n4 20 +mov n5 20 +sub n0 n1 +sub n2 n3 +mov !0 n0 +mov !1 n2 +mov !2 n4 +mov !3 n5 +func !206 func !128 jmp @main.#WHILE:1 label main.#WEND:1 diff --git a/rcbasic_build/main.rc_data b/rcbasic_build/main.rc_data index 9b977f7..e8385c4 100644 --- a/rcbasic_build/main.rc_data +++ b/rcbasic_build/main.rc_data @@ -5,7 +5,7 @@ 0 0 0 -43 +48 3 2 22 @@ -25,9 +25,9 @@ ENDIF:3 2298 1 ELSE:4->CONDITION:0 2942 1 ELSE:4->CONDITION:1 3355 1 ENDIF:4 3355 1 -main.#WHILE:0 4587 0 -main.#WEND:0 4725 0 -main.#WHILE:1 4725 0 -ELSE:5->CONDITION:0 4924 0 -ENDIF:5 4924 0 -main.#WEND:1 5003 0 +main.#WHILE:0 4664 0 +main.#WEND:0 4802 0 +main.#WHILE:1 4802 0 +ELSE:5->CONDITION:0 5001 0 +ENDIF:5 5001 0 +main.#WEND:1 5885 0 diff --git a/rcbasic_build/rcbasic.dbgs b/rcbasic_build/rcbasic.dbgs index 5eec72c..4a7bbda 100644 --- a/rcbasic_build/rcbasic.dbgs +++ b/rcbasic_build/rcbasic.dbgs @@ -29,3 +29,8 @@ N main sphere_gy 39 N main sphere_gz 40 N main ground_sphere_constraint 41 N main t 42 +N main.#WHILE:1 sx 43 +N main.#WHILE:1 sy 44 +N main.#WHILE:1 sz 45 +N main.#WHILE:1 vx 46 +N main.#WHILE:1 vy 47 diff --git a/rcbasic_build/rcbasic_build.depend b/rcbasic_build/rcbasic_build.depend index e48e6c0..42c127c 100755 --- a/rcbasic_build/rcbasic_build.depend +++ b/rcbasic_build/rcbasic_build.depend @@ -1,5 +1,5 @@ # depslib dependency file v1.0 -1732562668 source:/home/n00b/Projects/RCBASIC4/rcbasic_build/main.cpp +1733023376 source:/home/n00b/Projects/RCBASIC4/rcbasic_build/main.cpp diff --git a/rcbasic_runtime/rc_gfx.h b/rcbasic_runtime/rc_gfx.h index f928a67..3128fda 100644 --- a/rcbasic_runtime/rc_gfx.h +++ b/rcbasic_runtime/rc_gfx.h @@ -1295,13 +1295,6 @@ int rc_cloneCanvas(int origin_canvas_id, int mode) canvas.color_mod = irr::video::SColor(255,255,255,255).color; - //2D Physics World - b2Vec2 gravity(0, -9.8); - canvas.physics2D.world = new b2World(gravity); - canvas.physics2D.timeStep = 1/20.0; //the length of time passed to simulate (seconds) - canvas.physics2D.velocityIterations = 8; //how strongly to correct velocity - canvas.physics2D.positionIterations = 3; //how strongly to correct position - switch(mode) {