diff --git a/rcbasic_build/rcbasic_build.layout b/rcbasic_build/rcbasic_build.layout index 4b38859..5d20d2b 100755 --- a/rcbasic_build/rcbasic_build.layout +++ b/rcbasic_build/rcbasic_build.layout @@ -2,29 +2,44 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -35,29 +50,14 @@ - - - - - - + - - - - - - - - - - - + diff --git a/rcbasic_runtime/main.cpp b/rcbasic_runtime/main.cpp index dd21d5b..8e3f6bc 100755 --- a/rcbasic_runtime/main.cpp +++ b/rcbasic_runtime/main.cpp @@ -4403,7 +4403,7 @@ int main(int argc, char * argv[]) } #ifdef RCBASIC_DEBUG - rc_filename = "debug.cbc"; + //rc_filename = "debug.cbc"; #endif // RCBASIC_DEBUG //DEBUG START @@ -4452,7 +4452,7 @@ int main(int argc, char * argv[]) //ogles2 test #ifdef RC_TESTING - rc_intern_dirChange("/home/n00b/Programs/RCBasic_v401_Linux64/examples/Simple_3D_Platformer/"); + rc_intern_dirChange("/home/n00b/test/Special Materials/"); //rc_intern_dirChange(""); rc_filename = "main.cbc"; #endif diff --git a/rcbasic_runtime/rc_gfx.h b/rcbasic_runtime/rc_gfx.h index b1e7047..0940f27 100644 --- a/rcbasic_runtime/rc_gfx.h +++ b/rcbasic_runtime/rc_gfx.h @@ -2467,7 +2467,7 @@ void rc_deleteImage(int img_id) if(rc_image[img_id].image) { - rc_image[img_id].image->drop(); + VideoDriver->removeTexture(rc_image[img_id].image); rc_image[img_id].image = NULL; rc_image[img_id].alpha = 255; } diff --git a/rcbasic_runtime/rc_mesh.h b/rcbasic_runtime/rc_mesh.h index 2a681d8..22e1ee3 100644 --- a/rcbasic_runtime/rc_mesh.h +++ b/rcbasic_runtime/rc_mesh.h @@ -187,7 +187,12 @@ void rc_deleteMesh(int mesh_id) return; if(rc_mesh[mesh_id].mesh) - rc_mesh[mesh_id].mesh->drop(); + { + if(rc_mesh[mesh_id].mesh->getReferenceCount() > 0) + { + SceneManager->getMeshCache()->removeMesh(rc_mesh[mesh_id].mesh); + } + } rc_mesh[mesh_id].mesh = NULL; rc_mesh[mesh_id].mesh_type = 0; diff --git a/rcbasic_runtime/rc_os_defines.h b/rcbasic_runtime/rc_os_defines.h index 093fff9..c28846f 100755 --- a/rcbasic_runtime/rc_os_defines.h +++ b/rcbasic_runtime/rc_os_defines.h @@ -2,7 +2,7 @@ #define RC_OS_DEFINES_H_INCLUDED //USED FOR TESTING ONLY -//#define RC_TESTING +#define RC_TESTING //I am checking Android first since I think it also defines __linux__ diff --git a/rcbasic_runtime/rcbasic_runtime.depend b/rcbasic_runtime/rcbasic_runtime.depend index 164f58e..c841e61 100755 --- a/rcbasic_runtime/rcbasic_runtime.depend +++ b/rcbasic_runtime/rcbasic_runtime.depend @@ -1,5 +1,5 @@ # depslib dependency file v1.0 -1744343721 source:/home/n00b/Projects/RCBASIC4/rcbasic_runtime/main.cpp +1744470357 source:/home/n00b/Projects/RCBASIC4/rcbasic_runtime/main.cpp "rc_os_defines.h" @@ -33,7 +33,7 @@ "rc_func130_cases.h" -1744343669 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_os_defines.h +1744470357 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_os_defines.h 1744330643 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_defines.h @@ -1248,7 +1248,7 @@ 1734372058 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/RealisticWater.h -1744257792 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_gfx.h +1744470508 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_gfx.h "SDL.h" @@ -2534,7 +2534,7 @@ 1734372966 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_constraint.h -1738504435 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_mesh.h +1744478025 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_mesh.h 1734372058 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_particles.h @@ -2576,6 +2576,7 @@ 1744345468 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/ProjectiveTextures.h -1744345176 source:/home/n00b/Projects/RCBASIC4/rcbasic_runtime/ProjectiveTextures.cpp +1744345468 source:/home/n00b/Projects/RCBASIC4/rcbasic_runtime/ProjectiveTextures.cpp "ProjectiveTextures.h" + diff --git a/rcbasic_runtime/rcbasic_runtime.layout b/rcbasic_runtime/rcbasic_runtime.layout index 0239952..d528a06 100755 --- a/rcbasic_runtime/rcbasic_runtime.layout +++ b/rcbasic_runtime/rcbasic_runtime.layout @@ -2,85 +2,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -90,39 +22,34 @@ - + - + - + - + - + - + - + - + - + - + - + - - - - - - + @@ -130,12 +57,35 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + @@ -145,77 +95,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - + @@ -223,14 +115,132 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +