Merge pull request #104 from cerberusxdev/develop

Version 2020-11-15

VERSIONS.TXT

@@ -1,6 +1,43 @@
+***** v2020-11-15 *****
+
+FIX: [TRANSCC] With the GLFW target and MingW, you can build 32bit again.    (Author: MikeHart) 
+FIX: [TRANSCC] Fixed copying sub directories with the INCLUDE statement.    (Author: MikeHart)
+FIX: [TRANSCC] Fixed TRANSCC to change canvas sizes, title, scale mode and canvas flag every time you build your app.    (Author: MikeHart)
+FIX: [TRANSCC] Added check for space chars in source filename to avoid weird errors regarding global vars.    (Author: Phil7) 
+FIX: [rebuild script] Changed minimum version on OSX for building TRANS via the rebuildall script.    (Author: dawlane) 
+FIX: [HTTPREQUEST] Fixed some flaws in the glfw target.    (Author: Github user NEOJAW)  
+FIX: [MOJO2] fix in image.loadframes.    (Author: Rich) 
+FIX: [DOCS] FIXED example in httprequest.cerberusdoc    (Author: Holzchopf)
+FIX: [MOJO/MOJO2] Fixed apps don't scale right on retina displays.    (Author: Phil7)
+MOD: [TRANSCC] With the GLFW target, resource files are now compiled everytime, so a change will be always taken in.    (Author: MikeHart)
+MOD: [MOJO/MOJO2] Font.TextHeight will return the actual height of the string now if one is given.    (Author: MikeHart)
+MOD: [brl.filesystem] CreateDir now creates paths automatically, that includes more than one sub directory.    (Author: MikeHart)
+MOD: [MOJO/MOJO2] Removed an extra call to retrieve the window size on GLFW BeginRender. Only the size of the framebuffer is relevant now.    (Author: MikeHart)
+MOD: [MAKEDOCS] CHANGED makedocs now resolves links for json output    (Author: Holzchopf)
+MOD: [IOS] Changed using a launch image to a launch screen storyboard so you get the full resolution on all IOS devices.   (Author: Phil7)
+MOD: [IOS] Changed minimum IOS version to 9.0.  (Author: Phil7)
+MOD: [DESKTOP] Updated GLFW to version 3.3.2  (Author: MikeHart)
+NEW: [TRANSCC] New config setting #GLFW_COPY_LIBS_32 to copy 32bit DLLs into the GCC build.    (Author: MikeHart)
+NEW: [TRANSCC] Added TARGETPATH option to specify more target directories.    (Author: MikeHart)
+NEW: [TRANSCC] Added custom targets with cxbuild.txt script.    (Author: MikeHart)
+NEW: [TARGETS] AGK Android (Google).    (Author: MikeHart)
+NEW: [examples] mojo2/2Din3D.    (Author: MikeHart)  
+NEW: [examples] mojo2/asyncimageloading.    (Author: MikeHart)
+NEW: [HTML5] Added mousewheel event on the html5 target - MouseZ() works now.    (Author: Github user NEOJAW)  
+NEW: [MAKEDOCS] Added export of decls.json to makedocs.    (Author: Holzchopf)
+NEW: [MAKEDOCS] Added index entry decls CHANGED json builder now transforms markdown    (Author: Holzchopf)
+NEW: [MOJO] Added DrawTextBox:Void( textLines:String[],x:Float,y:Float,width:Float,height:Float,xhandle:Float=0.0,yhandle:Float=0.0 )    (Author: MikeHart)
+NEW: [MOJO2] Added DrawList.DrawTextBox:Void( textLines:String[],x:Float,y:Float,width:Float,height:Float,xhandle:Float=0.0,yhandle:Float=0.0 )    (Author: MikeHart)
+NEW: [MOJO/MOJO2] Added #GLFW_HIGH_DPI_ENABLED=1 constant, so GLFW apps can use the full high DPI resolution.    (Author: Phil7)
+NEW: [Modules] Added the new brl.timer module.    (Author: MikeHart)
+
+KNOWN ISSUES: 
+- Window dragging in 32 bit Release mode still crashes, need to figure out why that is.
+- GLFW_APP_ICON doesn't work with OSX and Linux.
+
 ***** v2020-05-09 *****
 
-FIX: [DOCS/brl] Fixed missing entry for the admob, cerberusstore, gamecenter, fielpath, filesystem, url, tween, pool, process and markdown modules.    (Author: MikeHart)
+FIX: [DOCS/brl] Fixed missing entry for the admob, cerberusstore, gamecenter, filepath, filesystem, url, tween, pool, process and markdown modules.    (Author: MikeHart)
 FIX: [DOCS/brl.databuffer] Fixed some typos.    (Author: MikeHart)
 FIX: [DOCS/cerberus] Fixed missing entry for the deque module.    (Author: MikeHart)
 FIX: [DOCS/cerberus.stack] Fixed some typos.    (Author: MikeHart)
@@ -11,7 +48,7 @@ FIX: [mojo2] Fixed padded parameter in Image.LoadFrames:Image[]( path:String,cel
 FIX: [examples] Fixed mak/bbgametest -> missing z parameter in MouseEvent call.    (Author: MikeHart)
 FIX: [examples] Fixed mak/dynamicimage -> faulty fullscreen switch.    (Author: MikeHart)
 Fix: [TRANSCC] Fixed TRANSCC not being able to install on an Android device when creating a release build on Linux and OSX.    (Author: Phil7) 
-Fix: [TRANSCC] Fixed TRANSCC not reporting the correct line number in certain cases when preprocessor statements were used..    (Author: dawlane) 
+Fix: [TRANSCC] Fixed TRANSCC not reporting the correct line number in certain cases when preprocessor statements were used.    (Author: dawlane) 
 
 MOD: [cerberusstore] updated the underlying code to support the newest Google version.    (Author: Rich) 
 MOD: [DOCS/interpolate] Fixed and added some images.    (Author: Holzchopf) 
@@ -46,68 +83,68 @@ NEW: [HTML5] Added #HTML5_APP_TITLE to be able to set the title of the browser t
 NEW: [HTML5] Added #HTML5_CANVAS_WIDTH and #HTML5_CANVAS_HEIGHT control the size of the html5 canvas.    (Author: MikeHart)
 NEW: [HTML5] Added #HTML5_APP_FILENAME to set the output filename.    (Author: MikeHart)
 NEW: [HTML5] Added #HTML5_CANVAS_RESIZE_MODE to be able to set the CANVAS resize mode.    (Author: MikeHart)
-NEW: [HTML5] Added #HTML5_CONSOLE_SHOW to be able to hide the splitter and console area.    (Author: MikeHart) 
+NEW: [HTML5] Added #HTML5_CONSOLE_SHOW to be able to hide the splitter and console area.    (Author: MikeHart)
 NEW: [rebuildall_macos.sh] New script to build CX on OSX right from the github repository.    (Author: dawlane)
 
 ***** v2019-10-13b *****
 
-MOD: [REQUESTER] Requester dialogs now work on Linux, thanks to tinyfiledialogs    (Author: MikeHart) 
-FIX: [GLFW] Added missing stb_write_image.h file on Linux    (Author: MikeHart) 
-FIX: [TED] Was still using the old PrefsDialog on Linux    (Author: MikeHart) 
+MOD: [REQUESTER] Requester dialogs now work on Linux, thanks to tinyfiledialogs.    (Author: MikeHart)
+FIX: [GLFW] Added missing stb_write_image.h file on Linux.    (Author: MikeHart)
+FIX: [TED] Was still using the old PrefsDialog on Linux.    (Author: MikeHart)
 
 ***** v2019-10-13 *****
 
 FIX: [ANDROID] change file permission of gradlew in template.    (Author: dawlane)
-MOD: [ANDROID] added 64bit libs to the target, to support Googles changes in August 2019.    (Author: MikeHart) 
+MOD: [ANDROID] added 64bit libs to the target, to support Googles changes in August 2019.    (Author: MikeHart)
 FIX: [TRANS] Fixed CopyFile for Linux to preserve file permissions.    (Author: dawlane)
 FIX: [TED] Fixed symlinks opening a second file when DebugStop is used.    (Author: dawlane)
-MOD: [TED] Another attempt at fixing the capitalization of the API.     (Author: MikeHart) 
-MOD: [TED] Moved Open Project from the BUILD menu to the FILE menu.     (Author: MikeHart) 
+MOD: [TED] Another attempt at fixing the capitalization of the API.    (Author: MikeHart)
+MOD: [TED] Moved Open Project from the BUILD menu to the FILE menu.    (Author: MikeHart)
 MOD: [TED] Replaced Options dialog with a similar one like from dawlane's version of TED.     (Author: dawlane) 
            This dialog is much smaller and so can be displayed on small screens two.
-FIX: [TED] CTRL+PgDown and CTRL+PgUP now works on Linux to switch between open code tabs.    (Author: MikeHart) 
-MOD: [TRANS/GLFW] On Windows you can add an app icon (.ico file) now via the new #GLFW_APP_ICON preprocessor setting.    (Author: MikeHart) 
-FIX: [OSX] Recompiled the launcher as a 64bit app, so it is compatible with OSX Catalina (10.15.x).    (Author: MikeHart) 
+FIX: [TED] CTRL+PgDown and CTRL+PgUP now works on Linux to switch between open code tabs.    (Author: MikeHart)
+MOD: [TRANS/GLFW] On Windows you can add an app icon (.ico file) now via the new #GLFW_APP_ICON preprocessor setting.    (Author: MikeHart)
+FIX: [OSX] Recompiled the launcher as a 64bit app, so it is compatible with OSX Catalina (10.15.x).    (Author: MikeHart)
 FIX: [MOJO1] Fixed missing usage of frame parameter in DrawImage9P.    (Author: Rich)
-MOD: [WIN8/WINPHONE8] Depreciated these targets. 
+MOD: [WIN8/WINPHONE8] Depreciated these targets.     (Author: MikeHart)
                       If you need them, move them out of the targets/depreciated folder.
-MOD: [TRANS/ANDROID] Reactivated logcat filtering.    (Author: MikeHart) 
-NEW: [Examples/MOJO2] DrawPrimitives2 shows how to use the DrawPrimitives method to draw several images at once. 
+MOD: [TRANS/ANDROID] Reactivated logcat filtering.    (Author: MikeHart)
+NEW: [Examples/MOJO2] DrawPrimitives2 shows how to use the DrawPrimitives method to draw several images at once.    (Author: MikeHart)
 
 
 ***** v2019-05-05 *****
 
-MOD: [ANDROID] Changed MIN_SDK back to 16 like it was before.    (Author: MikeHart) 
+MOD: [ANDROID] Changed MIN_SDK back to 16 like it was before.    (Author: MikeHart)
 MOD: [DOCS] Added A-Z shortcuts on top of indexes.    (Author: Holzchopf)
-MOD: [Trans/ANDROID] Release builds are installed automatically now.    (Author: MikeHart) 
-FIX: [AGK] Fixed docs creation to be compatible with the latest MakeDocs.    (Author: MikeHart) 
+MOD: [Trans/ANDROID] Release builds are installed automatically now.    (Author: MikeHart)
+FIX: [AGK] Fixed docs creation to be compatible with the latest MakeDocs.    (Author: MikeHart)
 FIX: [MAKEDOCS] Fixed brl.markdown bug.    (Author: Holzchopf)
 FIX: [TED] Fixed fixed displaying an iframe element in the docs.    (Author: dawlane)
-FIX: [TED] Fixed scaling issues when displaying images.    (Author: MikeHart) 
-NEW: [TED] Added overwrite mode. Just press the insert key to toggle it.    (Author: MikeHart) 
-NEW: [MOJO2] Added Image.LoadFrames:Image[]( path:String,cellWidth:Int,cellHeight:Int,padded:Bool=False,xhandle:Float=.5,yhandle:Float=.5,flags:Int=Image.Filter|Image.Mipmap,shader:Shader=Null ).    (Author: MikeHart) 
-NEW: [MOJO.APP] Added SetDeviceWindowIcon( _path:String ).    (Author: MikeHart) 
-NEW: [MOJO.APP] Added SetDeviceWindowTitle( _title:String ).    (Author: MikeHart) 
-NEW: [MOJO.APP] Added SetDeviceWindowSize( _width:Int, _height:Int ).    (Author: MikeHart) 
-NEW: [MOJO.APP] Added SetDeviceWindowPosition( _x:Int, _y:Int ).    (Author: MikeHart) 
-NEW: [MOJO.APP] Added SetDeviceWindowSizeLimits:Void( _minWidth:Int, _minHeight:Int, _maxWidth:Int, _maxHeight:Int )    (Author: MikeHart) 
-NEW: [MOJO.INPUT] Added SetMousePos:Void( _x:Int, _y:Int ).    (Author: MikeHart) 
-NEW: [MOJO.INPUT] Added SetClipboard:Void( _text:String ).    (Author: MikeHart) 
-NEW: [MOJO.INPUT] Added GetClipboard:String().    (Author: MikeHart) 
+FIX: [TED] Fixed scaling issues when displaying images.    (Author: MikeHart)
+NEW: [TED] Added overwrite mode. Just press the insert key to toggle it.    (Author: MikeHart)
+NEW: [MOJO2] Added Image.LoadFrames:Image[]( path:String,cellWidth:Int,cellHeight:Int,padded:Bool=False,xhandle:Float=.5,yhandle:Float=.5,flags:Int=Image.Filter|Image.Mipmap,shader:Shader=Null ).    (Author: MikeHart)
+NEW: [MOJO.APP] Added SetDeviceWindowIcon( _path:String ).    (Author: MikeHart)
+NEW: [MOJO.APP] Added SetDeviceWindowTitle( _title:String ).     (Author: MikeHart)
+NEW: [MOJO.APP] Added SetDeviceWindowSize( _width:Int, _height:Int ).    (Author: MikeHart)
+NEW: [MOJO.APP] Added SetDeviceWindowPosition( _x:Int, _y:Int ).     (Author: MikeHart)
+NEW: [MOJO.APP] Added SetDeviceWindowSizeLimits:Void( _minWidth:Int, _minHeight:Int, _maxWidth:Int, _maxHeight:Int ).    (Author: MikeHart)
+NEW: [MOJO.INPUT] Added SetMousePos:Void( _x:Int, _y:Int ).    (Author: MikeHart)
+NEW: [MOJO.INPUT] Added SetClipboard:Void( _text:String ).    (Author: MikeHart)
+NEW: [MOJO.INPUT] Added GetClipboard:String().    (Author: MikeHart)
 NEW: [CERBERUS.INTERPOLATE] New module.    (Author: Holzchopf) 
 NEW: [MOJO.COLOR] New module.    (Author: Holzchopf)
 
 ***** v2018-12-30 *****
 
-FIX: [AGK_IOS] Fixed AGK_IOS target showing up on non OSX platforms.    (Author: MikeHart) 
-FIX: [ANDROID] Fixed MIN_SDK, TARGET and TOOLS version.    (Author: MikeHart) 
-FIX: [brl.requesters] Fixed RequestFile not working with a set path.    (Author: MikeHart) 
-FIX: [TED] Fixed selecting a help topic in the toolbar didn't show up the help file directly.    (Author: MikeHart) 
+FIX: [AGK_IOS] Fixed AGK_IOS target showing up on non OSX platforms.    (Author: MikeHart)
+FIX: [ANDROID] Fixed MIN_SDK, TARGET and TOOLS version.    (Author: MikeHart)
+FIX: [brl.requesters] Fixed RequestFile not working with a set path.    (Author: MikeHart)
+FIX: [TED] Fixed selecting a help topic in the toolbar didn't show up the help file directly.    (Author: MikeHart)
 MOD: [example] Various changes to sample scripts     (Author: Paul59)
 FIX: [TED] Fixed "Open on Desktop" on Linux.    (Author: dawlane)
-MOD: [TED] If text is selected in the editor, it will be pre set in the Find dialog.    (Author: MikeHart) 
+MOD: [TED] If text is selected in the editor, it will be pre set in the Find dialog.    (Author: MikeHart)
 MOD: [DOCS/MAKEDOCS] Numerous changes to the docs and MakeDocs itself.    (Author: Holzchopf) 
-FIX: [GLFW/GLFW-ANGLE] Fixed returning MouseZ resets MouseX and MouseY to zero.    (Author: MikeHart) 
+FIX: [GLFW/GLFW-ANGLE] Fixed returning MouseZ resets MouseX and MouseY to zero.    (Author: MikeHart)
 MOD: [TED] Bigger changes so TED uses the QT5 webengine now and needs QT5.9.2 to compile.    (Author: dawlane)
 
 ***** v2018-08-10 *****

bin/config.macos.txt

@@ -7,6 +7,14 @@
 MODPATH="${CERBERUSDIR}/modules;${CERBERUSDIR}/modules_ext"
 '--------------------
 
+'--------------------
+'Cerberus targets path
+'
+'Can be overriden via transcc cmd line
+'
+TARGETPATH="${CERBERUSDIR}/targets;${CERBERUSDIR}/targets_ext;D:\CerberusX\CerberusTargets"
+'--------------------
+
 '--------------------
 'HTML player path.
 '

bin/config.winnt.txt

@@ -4,7 +4,15 @@
 '
 'Can be overriden via transcc cmd line
 '
-MODPATH="${CERBERUSDIR}/modules;${CERBERUSDIR}/modules_ext;D:\CerberusX\CerberusModulesx"
+MODPATH="${CERBERUSDIR}/modules;${CERBERUSDIR}/modules_ext;D:\CerberusX\CerberusModules"
+'--------------------
+
+'--------------------
+'Cerberus targets path
+'
+'Can be overriden via transcc cmd line
+'
+TARGETPATH="${CERBERUSDIR}/targets;${CERBERUSDIR}/targets_ext;D:\CerberusX\CerberusTargets"
 '--------------------
 
 '--------------------
@@ -28,6 +36,9 @@ HTML_PLAYER="${CERBERUSDIR}\bin\cserver_winnt.exe"
 
 '***** 64 bit mingw *****
 MINGW_PATH="D:\TDM-GCC-64"
+'MINGW_PATH="D:\TDM-GCC-64_92"
+'MINGW_PATH="D:\BlitzMax\MinGW32x64"
+'MINGW_PATH="${CERBERUSDIR}/3rdparty/x86_64-8.1.0-release-posix-seh-rt_v6-rev0/mingw64"
 '--------------------
 
 '--------------------
@@ -53,7 +64,7 @@ ANDROID_PATH="D:\Program Files\Android\Android Studio"
 '
 'Must be set to a valid dir for ANDROID NDK target support
 '
-'ANDROID_NDK_PATH="D:\Program Files\Android\Android Studio\ndk-bundle"
+ANDROID_NDK_PATH="C:\Users\mike\AppData\Local\Android\Sdk\ndk\21.1.6352462"
 '--------------------
 
 '--------------------

bin/macdeployqt-5.9.2.command

@@ -5,7 +5,7 @@
 cd `dirname $0`
 #cd ../../bin
 #macdeployqt-4.8 Ted.app
-/Users/michaelhartlef/Qt/5.9.2/clang_64/bin/macdeployqt Ted.app -verbose=2 -always-overwrite
+~/Qt/5.9.2/clang_64/bin/macdeployqt Ted.app -verbose=2 -always-overwrite
 cd Ted.app/Contents/PlugIns
 rm -r -f audio
 rm -r -f bearer

docs/cerberusdoc/Home.cerberusdoc

@@ -2,6 +2,21 @@
 
 This is the ultimate guide to Cerberus X.
 
+>> New stuff
+
+* [[../../examples/mojo/mikehart/FileDrop/FileDrop.cxs|Drag 'n' Drop example]]    for Mojo
+* [[../../examples/mojo2/2Din3D/2Din3D.cxs|2D in 3D example]]    for Mojo2
+* [[../html/Modules_mojo.graphics.html#DrawTextBox(String[],Float,Float,Float,Float,[Float],[Float])|DrawTextBox]]    for Mojo
+* [[../html/Modules_mojo2.graphics_DrawList.html#DrawTextBox(String[],Float,Float,Float,Float,[Float],[Float])|DrawList.DrawTextBox]]    for Mojo2
+* [[../html/Modules_mojo.input.html#MouseZ()|MouseZ()]] works now in HTML5
+* [[../html/Modules_brl.timer.html|Timer]] module, to fire and react on timed events.
+* [[The Custom target|Custom targets]]
+* [[../../tools/build_agk/BuildTargets.cxs|Support for AppGameKit Classic - Android platform]]
+* TARGETPATH option to specify more target directories
+* New config setting #GLFW_COPY_LIBS_32 to copy 32bit DLLs into the build
+* New config setting #GLFW_HIGH_DPI_ENABLED so retina apps can use the full high dpi resolution.
+
+
 >> Introduction
 
 * [[Tutorials/Getting started]] - If you're new to Cerberus X, this is what you're looking for

docs/cerberusdoc/Programming/App config settings.cerberusdoc

@@ -51,10 +51,11 @@ The following app config settings are currently supported:
 #GLFW_GCC_CC_OPTS=""					'Pass compiler options to GCC type compilers
 #GLFW_GCC_LD_OPTS=""					'Pass linker options to GCC type compilers
 #GLFW_GCC_LIB_OPTS=""				    'Pass additional libraries to link against for GCC type compilers.
-#GLFW_COPY_LIBS=""						'Copy external libraries to build directory. Windows GCC only for now!
+#GLFW_COPY_LIBS=""						'Copy 64bit external libraries to build directory. Windows GCC only for now!
+#GLFW_COPY_LIBS_32=""					'Copy 32bit external libraries to build directory. Windows GCC only for now!
 
 #GLFW_WINDOW_TITLE="Cerberus X Game"
-#GLFW_WINDOW_WIDTH=640					'Set this and HEIGHT to 0 for a 'windowless' glfw app
+#GLFW_WINDOW_WIDTH=640					
 #GLFW_WINDOW_HEIGHT=480	
 #GLFW_WINDOW_RESIZABLE=False
 #GLFW_WINDOW_FULLSCREEN=False

docs/cerberusdoc/Samples.cerberusdoc

@@ -53,7 +53,9 @@ Samples for the base game framework.
 >> Michael Hartlef
 * [[../../examples/mojo/mikehart/DrawImage9P/DrawImage9Patch.cxs|Drawing 9-Patch image test]]
 * [[../../examples/mojo/mikehart/BitmapFont/BitmapFont.cxs|DrawText with bitmap font test]]
+* [[../../examples/mojo/mikehart/FileDrop/FileDrop.cxs|Drag 'n' Drop example]]
 * [[../../examples/mojo/mikehart/PubNub/PubNub.cxs|Using the services of PubNub with their REST api]]
+* [[../../examples/mojo/mikehart/Timer/Timer.cxs|Using the timer module to fire timed events]]
 
 >> James Boyd
 

docs/cerberusdoc/Target SDKs.cerberusdoc

@@ -11,8 +11,8 @@ Please refer to the following installation guides:
 * [[The Desktop target]]
 * [[The Stdcpp target]]
 * [[The HTML5 target]]
-* [[The Flash target]]
+* [[The Flash target]]    (depreciated)
 * [[The Android target]]
 * [[The iOS target]]
-* [[The WinRT target]]
-* [[The AppGameKit target]]
+* [[The WinRT target]]    (depreciated)
+* [[The Custom target]]