Skip to content

Commit

Permalink
Merge pull request #112 from cerberusxdev/develop
Browse files Browse the repository at this point in the history
Version v2021-05-16
  • Loading branch information
MikeHart66 committed May 25, 2021
2 parents 2a65fb6 + 80cebf7 commit b5e2536
Show file tree
Hide file tree
Showing 62 changed files with 8,956 additions and 6,662 deletions.
37 changes: 31 additions & 6 deletions VERSIONS.TXT
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
***** v2021-05-16 *****

FIX: [brl.requesters] Fixed compiling error on Linux. (Author: MikeHart)
FIX: [brl.filesystem] Fixed CreateDir not being able to use cerberus://internal file paths. (Author: MikeHart)
FIX: [docs] Corrected Latest new stuff section on the homepage. (Author: MikeHart)
FIX: [docs/mojo.app] Typo correction. (Author: Phil7)
FIX: [mojo2] Fixed Canvas.ReadPixels only reading the last framebuffer it was rendered to. (Author: MikeHart)
FIX: [mojo/mojo2] Fixed Font.TextHeight returning the values without Glyph.yoffset. (Author: MikeHart)
FIX: [mojo] Fixed mojo.colornames throwing a "blocks nested to deeply" error on MSVC. (Author: MikeHart)
FIX: [html5] "Clear console" Button was still visible when Console was hidden. (Author: MikeHart)
MOD: [mojo/mojo2] Changed DrawText to use TextHeight("") when being y-aligned. (Author: MikeHart)
MOD: [GLFW/MSVC] Upgraded the solution to use MSVC 2019 and SDK 10.x. (Author: MikeHart)
MOD: [agk/buildtarget] Added fixes for TGCs Android template. (Author: MikeHart)
MOD: [CURL] Only copy Windows DLLs to the exe, when the brl.httprequest module is imported. (Author: MikeHart)
MOD: [CURL] Updated to version 7.75. (Author: MikeHart)
NEW: [mojo.input] Added KEY_ALT to the usable key codes. (Author: MikeHart)
NEW: [TRANSCC] Added #GLFW_GCC_SRC_OPTS to compile more source files. (Author: MikeHart)
NEW: [TRANSCC] Added #GLFW_GCC_VPATH_OPTS to add more paths to source files. (Author: MikeHart)
NEW: [TRANSCC/Android] Added bundleRelease to create Android app bundle. (Author: MikeHart)
NEW: [TRANSCC/GLFW] Copy dlls into the build folder (Takes care of the OpenAl dlls). (Author: MikeHart)
NEW: [mojo/Android] Added new soundpool constructor to replace the depreciated one. (Author: MikeHart)
NEW: [HTML5] Added #HTML5_CANVAS_ALPHA to enable the canvas' background alpha channel. (Author: Holzchopf)
NEW: [GLFW/MSVC] Added the ability to create 32 and 64bit apps via #GLFW_GCC_MSIZE_WINNT and MSVC. Will create a new app config setting to cover GCC and MSVC later on. (Author: MikeHart)
NEW: [brl.ini] Added a new Ini handler module, based on Martin Leidel's initial work. (Martin, 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-12-05 *****

FIX: [MOJO/MOJO2] Another try at fixing apps that don't scale right on retina displays. (Author: Phil7)
Expand All @@ -6,12 +37,6 @@ MOD: [MOJO/MOJO2] Renamed #GLFW_HIGH_DPI_ENABLED constant, to #GLFW_MACOS_RETINA
NEW: [MOJO/MOJO2] Added DeviceWindowWidth:Int() and DeviceWindowHeight:Int() to retrieve to retrieve the size of a windows in desktop unit sizes. (Author: Phil7)
NEW: [MOJO/MOJO2] Added DrawImageRect:Void( image:Image,tx:Float,ty:Float,sourceX:Int,sourceY:Int,sourceWidth:Int,sourceHeight:Int,rz:Float=0,sx:Float=1,sy:Float=1 ) (Author: Martin)


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-11-15 *****

FIX: [TRANSCC] With the GLFW target and MingW, you can build 32bit again. (Author: MikeHart)
Expand Down
27 changes: 14 additions & 13 deletions docs/cerberusdoc/Home.cerberusdoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@

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.
>> Latest new stuff

* New config setting *#HTML5_CANVAS_ALPHA* to enable the canvas' background alpha channel.
* New config setting *#GLFW_GCC_SRC_OPTS* to compile more source files with MingW.
* New config setting *#GLFW_GCC_VPATH_OPTS* to add more paths to source files with MingW.
* Added the ability to create 32 and 64bit apps via *#GLFW_GCC_MSIZE_WINNT* and MSVC. Will create a new app config setting to cover GCC and MSVC later on.
* New *[[../html/Modules_brl.ini.html|Ini]]* module, to handle ini files.
* Added key code *KEY_ALT*.
* Added bundleRelease to create Android app bundle.

>>>> Previous release (v2020-12-05)

* New [[../html/Modules_mojo.app.html#DeviceWindowWidth()|DeviceWindowWidth]] and [[../html/Modules_mojo.app.html#DeviceWindowHeight()|DeviceWindowHeight]] commands to returns the width or height of the application's device window in desktop units.
* New [[../html/Modules_mojo2.graphics_DrawList.html#DrawImageRect(Image,Float,Float,Int,Int,Int,Int,[Float],[Float],[Float])|DrawImageRect]] which let you scale and rotate your image rect inside mojo2 now.


>> Introduction
Expand Down
4 changes: 4 additions & 0 deletions docs/cerberusdoc/Programming/App config settings.cerberusdoc
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ The following app config settings are currently supported:
#HTML5_CANVAS_WIDTH=640 'Set the width of the canvas.
#HTML5_CANVAS_HEIGHT=480 'Set the height of the canvas.
#HTML5_CANVAS_RESIZE_MODE=1 '0=locked, 1=stretch, 2=resize
#HTML5_CANVAS_ALPHA=False 'Set to true to enable the canvas' background alpha channel, a prerequisite for transparent canvasses.
#HTML5_CONSOLE_SHOW=True 'Set it to False to hide the splitter and console DIV in your file.
#HTML5_WEBAUDIO_ENABLED=True 'Set to false to disable webaudio support for mojo audio, and to use older multimedia audio system instead.

Expand All @@ -47,10 +48,13 @@ The following app config settings are currently supported:
#GLFW_USE_MINGW=True 'Set to false on Windows to use MSVC instead of MinGW to build glfw apps. Needs at least VS 2015 installed.
#GLFW_GCC_MSIZE_WINNT="64" 'When building glfw apps with mingw/gcc, controls whether 32 or 64 bit apps are generated.
'Set to "64" to force 64 bit builds on Windows (needs mingw64), or "" to use compiler default.
'Currently that also works for MSVC!!!
#GLFW_GCC_MSIZE_LINUX="" 'Ditto for Linux.
#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_GCC_SRC_OPTS="" 'Pass additional source files to be build.
#GLFW_GCC_VPATH_OPTS="" 'Pass additional virtual paths to look into when building.
#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!

Expand Down
1 change: 1 addition & 0 deletions docs/cerberusdoc/Programming/Key codes.cerberusdoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ KEY_ESCAPE
KEY_SPACE
KEY_SHIFT
KEY_CONTROL
KEY_ALT
KEY_PAGEUP
KEY_PAGEDOWN
KEY_END
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Desktop apps use the OpenGL API for graphics rendering and the OpenAL API for au

>> Windows Requirements

* [MinGW 4.9.2](https://www.cerberus-x.com/downloads/tdm-gcc-64.zip) or [Visual Studio Community 2017 for Windows Desktop](https://visualstudio.microsoft.com/vs/older-downloads/).
* [MinGW 4.9.2](https://www.cerberus-x.com/downloads/tdm-gcc-64.zip) or [Visual Studio Community 2019 for Windows Desktop](https://visualstudio.microsoft.com/de/thank-you-downloading-visual-studio/?sku=Community&rel=16).

* [OpenAL Windows Drivers](https://www.cerberus-x.com/downloads/oalinst.zip).

Expand Down
18 changes: 18 additions & 0 deletions examples/ini/ReadIni/ReadIni.cxs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Strict

Import brl.ini

Function Main:Int()

Local ini:IniHandler = New IniHandler
ini.Load("setup.ini")


ini.WriteStringArray("zArray","string",["entry#1","entry#2","entry#3"])
ini.WriteIntArray("zArray","int",[1,2,33])
ini.WriteFloatArray("zArray","float",[1.0,2.0,33,5.123])
ini.WriteBoolArray("zArray","bool",[True,False,False,True])

Print ini.SaveToString()
Return 0
End
13 changes: 13 additions & 0 deletions examples/ini/ReadIni/ReadIni.data/setup.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This is a test

[config]
installpath=C:\install.txt
screenwidth=1024
ShowDialog=True

# Now another section

[runtime]
growfactor=10.24
Level=2
name=Michael Hartlef
Loading

0 comments on commit b5e2536

Please sign in to comment.