Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to 5.5 #61

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ mac_task:
image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
env:
RAYLIB_PLATFORM: macosx-arm64
RAYLIB_VERSION: 5.0.0-0
RAYLIB_VERSION: 5.5.0-0
setup_script:
- brew update
- brew install java11
Expand Down Expand Up @@ -34,7 +34,7 @@ pi_task:
RAYLIB_VERSION: 5.0.0-0
setup_script:
- apt update
- apt -y install openjdk-11-jdk cmake libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev
- apt -y install openjdk-11-jdk cmake libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev
build_raylib_script:
- git submodule update --init --recursive
- cd raylib
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
workflow_dispatch:

env:
RAYLIB_VERSION: 5.0.0-0
RAYLIB_VERSION: 5.5.0-0

jobs:
build-linux:
Expand All @@ -33,7 +33,7 @@ jobs:
- name: Build raylib
run: |
sudo apt update
sudo apt install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev
sudo apt install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev
cd raylib
mkdir build
cd build
Expand Down
25 changes: 15 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# New!
# News

Take a look at [Jaylib-FFM](https://github.com/electronstudio/jaylib-ffm) a Java FFM Raylib binding.
* Take a look at [Jaylib-FFM](https://github.com/electronstudio/jaylib-ffm) a Java FFM Raylib binding.

# Jaylib - JNI bindings for [Raylib](https://github.com/raysan5/raylib/) 5.0 + RLGL + Raymath + Physac + RayGui
* The `com.raylib.Jaylib` class has been removed because it seemed to confuse people and IDE
autocompletion. Use `com.raylib.Raylib` instead. The Colors are now in `com.raylib.Colors`.
If you don't like the fluent constructor syntax of JavaCPP, use the methods in `com.raylib.Helpers`
to create structs.

# Jaylib - JNI bindings for [Raylib](https://github.com/raysan5/raylib/) 5.5 + RLGL + Raymath + Physac + RayGui

JNI is the fastest kind of native binding for Java 8+, but is difficult to write. Therefore
we are using [JavaCPP](https://github.com/bytedeco/javacpp) to automatically generate the bindings.
Expand Down Expand Up @@ -49,7 +54,7 @@ Download [the Gradle example project](https://github.com/electronstudio/jaylib-e
```

dependencies {
implementation 'uk.co.electronstudio.jaylib:jaylib:5.0.+'
implementation 'uk.co.electronstudio.jaylib:jaylib:5.5.+'
}

```
Expand All @@ -62,7 +67,7 @@ dependencies {
<dependency>
<groupId>uk.co.electronstudio.jaylib</groupId>
<artifactId>jaylib</artifactId>
<version>[5.0.0,5.1)</version>
<version>[5.5.0,5.6)</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -109,19 +114,19 @@ public class Demo {

Compile it:

javac -cp jaylib-5.0.0-0.jar Demo.java
javac -cp jaylib-5.5.0-0.jar Demo.java

Run it:

java -cp jaylib-5.0.0-0.jar:. Demo
java -cp jaylib-5.5.0-0.jar:. Demo

On MacOS you need this additional option:

java -XstartOnFirstThread -cp jaylib-5.0.0-0.jar:. Demo
java -XstartOnFirstThread -cp jaylib-5.5.0-0.jar:. Demo

On weirdy Windows you use semi-colons:

java -cp jaylib-5.0.0-0.jar;. Demo
java -cp jaylib-5.5.0-0.jar;. Demo

## Known issues

Expand All @@ -147,7 +152,7 @@ JavaCPP does not generate constructors. The recommended JavaCPP way to initiali

var vec = new Vector3().x(1).y(2).z(3);

Some people do not like this. For discussion of other ways, [see here](https://github.com/electronstudio/jaylib/issues/1#issuecomment-873485303).
Some people do not like this. You can use helper functions, e.g. `com.raylib.Helpers.createVector3(1,2,3)`. For discussion [see here](https://github.com/electronstudio/jaylib/issues/1#issuecomment-873485303).

### Arrays

Expand Down
3 changes: 3 additions & 0 deletions build-docs.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash
rm -rf doc
sed -i 's/<->//g' gen/com/raylib/Raylib.java
sed -i 's/->//g' gen/com/raylib/Raylib.java
sed -i 's/> Use//g' gen/com/raylib/Raylib.java
javadoc -d doc -sourcepath gen:src com.raylib -classpath javacpp.jar:jaylib-${RAYLIB_VERSION}.jar
jar cf jaylib-${RAYLIB_VERSION}-javadoc.jar -C doc .
jar cf jaylib-${RAYLIB_VERSION}-sources.jar -C gen .
4 changes: 3 additions & 1 deletion generate-checksums.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ jar xf jaylib-natives-windows-x86_64-*.jar
rm jaylib-natives-windows-x86_64-*.jar
jar xf jaylib-natives-linux-armhf-*.jar
rm jaylib-natives-linux-armhf-*.jar
jar uf jaylib-5.0.0-0.jar com
jar xf jaylib-natives-linux-arm64-*.jar
rm jaylib-natives-linux-arm64-*.jar
jar uf jaylib-5.5.0-0.jar com

rm -rf com META-INF
cp ~/IdeaProjects/jaylib/*.pom .
Expand Down
2 changes: 1 addition & 1 deletion jaylib-5.0.0-0.pom → jaylib-5.5.0-0.pom
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>uk.co.electronstudio.jaylib</groupId>
<artifactId>jaylib</artifactId>
<version>5.0.0-0</version>
<version>5.5.0-0</version>
<packaging>jar</packaging>

<name>jaylib</name>
Expand Down
2 changes: 1 addition & 1 deletion raygui
Submodule raygui updated 51 files
+1 −1 LICENSE
+45 −4 README.md
+4 −3 examples/Makefile
+14 −14 examples/animation_curve/animation_curve.c
+1 −12 examples/animation_curve/gui_curve_editor.h
+2 −4 examples/controls_test_suite/controls_test_suite.c
+ examples/controls_test_suite/controls_test_suite.png
+71 −0 examples/controls_test_suite/gui_value_box_float.c
+1 −1 examples/custom_file_dialog/custom_file_dialog.c
+1 −1 examples/custom_file_dialog/gui_window_file_dialog.h
+7 −44 examples/custom_input_box/custom_input_box.c
+1 −1 examples/custom_sliders/custom_sliders.c
+148 −0 examples/floating_window/floating_window.c
+1 −1 examples/image_exporter/image_exporter.c
+1 −1 examples/image_importer_raw/image_importer_raw.c
+1 −1 examples/portable_window/portable_window.c
+1 −1 examples/property_list/property_list.c
+1 −1 examples/scroll_panel/scroll_panel.c
+39 −30 examples/style_selector/style_selector.c
+609 −0 examples/styles/style_amber.h
+578 −0 examples/styles/style_ashes.h
+359 −94 examples/styles/style_bluish.h
+589 −0 examples/styles/style_candy.h
+617 −0 examples/styles/style_cherry.h
+408 −157 examples/styles/style_cyber.h
+391 −149 examples/styles/style_dark.h
+600 −0 examples/styles/style_enefete.h
+2 −2 examples/styles/style_jungle.h
+2 −2 examples/styles/style_lavanda.h
+616 −0 examples/styles/style_sunny.h
+383 −147 examples/styles/style_terminal.h
+2 −1 projects/CMake/CMakeLists.txt
+535 −299 src/raygui.h
+5 −2 styles/README.md
+33 −0 styles/amber/README.md
+ styles/amber/hello-world.ttf
+ styles/amber/screenshot.png
+606 −0 styles/amber/style_amber.h
+ styles/amber/style_amber.png
+ styles/amber/style_amber.rgs
+1 −1 styles/ashes/style_ashes.h
+1 −1 styles/bluish/style_bluish.h
+1 −1 styles/candy/style_candy.h
+1 −1 styles/cherry/style_cherry.h
+1 −1 styles/cyber/style_cyber.h
+1 −1 styles/dark/style_dark.h
+1 −1 styles/enefete/style_enefete.h
+1 −1 styles/jungle/style_jungle.h
+1 −1 styles/lavanda/style_lavanda.h
+1 −1 styles/sunny/style_sunny.h
+1 −1 styles/terminal/style_terminal.h
2 changes: 1 addition & 1 deletion raylib
Submodule raylib updated 394 files
3 changes: 1 addition & 2 deletions src/com/raylib/RaylibConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ public void map(InfoMap infoMap) {
.linePatterns("// NOTE: Custom raylib color palette for amazing visuals on WHITE background",
"// Structures Definition").skip()))
.put(new Info("MOUSE_LEFT_BUTTON","MOUSE_RIGHT_BUTTON","MOUSE_MIDDLE_BUTTON","FormatText",
"SubText", "ShowWindow", "LoadText", "SpriteFont", "GetExtension").cppTypes().annotations())

"SubText", "ShowWindow", "LoadText", "SpriteFont", "GetExtension", "GetMouseRay").cppTypes().annotations())
.put(new Info("defined(RLGL_STANDALONE)").define(false))
//.put(new Info("defined(GRAPHICS_API_OPENGL_ES2)").define(false))
.put(new Info("defined(GRAPHICS_API_OPENGL_11)").define(false))
Expand Down
Loading