Skip to content

Commit

Permalink
a1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
oblerion committed Jun 5, 2024
1 parent 3d1139b commit ebec91e
Show file tree
Hide file tree
Showing 75 changed files with 1,196 additions and 664 deletions.
44 changes: 44 additions & 0 deletions .kdev4/egba.kdev4
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[Buildset]
BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x08\x00e\x00g\x00b\x00a)

[CustomBuildSystem]
CurrentConfiguration=BuildConfig0

[CustomBuildSystem][BuildConfig0]
BuildDir=file:///home/desnot/GD/c_raylib/egba
Title=perso

[CustomBuildSystem][BuildConfig0][ToolBuild]
Arguments=
Enabled=true
Environment=
Executable=file:./make
Type=0

[CustomBuildSystem][BuildConfig0][ToolClean]
Arguments=
Enabled=false
Environment=
Executable=
Type=3

[CustomBuildSystem][BuildConfig0][ToolConfigure]
Arguments=
Enabled=false
Environment=
Executable=
Type=1

[CustomBuildSystem][BuildConfig0][ToolInstall]
Arguments=
Enabled=false
Environment=
Executable=
Type=2

[CustomBuildSystem][BuildConfig0][ToolPrune]
Arguments=
Enabled=false
Environment=
Executable=
Type=4
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"configurations": [
{
"name" : "compile",
"command" : "make",
"command" : "compilator",
"type" : "node-terminal",
"request": "launch"
}
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"files.associations": {
"raymath.h": "c"
}
},
"C_Cpp.errorSquiggles": "disabled"
}
78 changes: 43 additions & 35 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,46 @@ DOBJ=build/linux64/obj
DEXEC=build/linux64
EXEC=main

all: link run

link: main.o ui.o ui_mainbar.o kbd_layout.o Palette.o Sprite.o ui_palette.o ui_sprite.o
if [ -f $(EXEC) ];then rm -rf $(EXEC) ;fi
$(CC) $(DOBJ)/main.o $(DOBJ)/ui.o $(DOBJ)/ui_mainbar.o $(DOBJ)/kbd_layout.o $(DOBJ)/Palette.o $(DOBJ)/Sprite.o $(DOBJ)/ui_palette.o $(DOBJ)/ui_sprite.o -g -Wall -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 -o $(EXEC)

main.o: ${DSRC}/main.c
$(CC) -c $(DSRC)/main.c -Isrc -Wall -o $(DOBJ)/main.o

Palette.o: $(DSRC)/Palette.c
$(CC) -c $(DSRC)/Palette.c -Isrc -Wall -o $(DOBJ)/Palette.o

Sprite.o: $(DSRC)/Sprite.c
$(CC) -c $(DSRC)/Sprite.c -Isrc -Wall -o $(DOBJ)/Sprite.o

ui_palette.o: $(DSRC)/ui_palette.c
$(CC) -c $(DSRC)/ui_palette.c -Isrc -Wall -o $(DOBJ)/ui_palette.o

ui_sprite.o: $(DSRC)/ui_sprite.c
$(CC) -c $(DSRC)/ui_sprite.c -Isrc -Wall -o $(DOBJ)/ui_sprite.o

ui_mainbar.o: $(DSRC)/ui_mainbar.c
$(CC) -c $(DSRC)/ui_mainbar.c -Isrc -Wall -o $(DOBJ)/ui_mainbar.o

ui.o: $(DSRC)/ui.c
$(CC) -c $(DSRC)/ui.c -Isrc -Wall -o $(DOBJ)/ui.o

kbd_layout.o: $(DSRC)/kbd_layout.c
$(CC) -c $(DSRC)/kbd_layout.c -Isrc -Wall -o $(DOBJ)/kbd_layout.o

run:
if [ -f $(EXEC) ];then ./$(EXEC) ;fi

clean:
rm -rf $(DOBJ)/*.o
all:
./make
# link run
#
# link: main.o atlas.o ui.o ui_runner.o ui_mainbar.o kbd_layout.o Palette.o Sprite.o ui_palette.o ui_sprite.o
# if [ -f $(EXEC) ];then rm -rf $(EXEC) ;fi
# $(CC) $(DOBJ)/main.o $(DOBJ)/atlas.o $(DOBJ)/ui.o $(DOBJ)/ui_runner.o $(DOBJ)/ui_mainbar.o $(DOBJ)/kbd_layout.o $(DOBJ)/Palette.o $(DOBJ)/Sprite.o $(DOBJ)/ui_palette.o $(DOBJ)/ui_sprite.o -g -Wall -llua -lraylib -lGL -lm -lpthread -ldl -lrt -lX11 -o $(EXEC)
#
# main.o: ${DSRC}/main.c
# $(CC) -c $(DSRC)/main.c -Isrc -Wall -o $(DOBJ)/main.o
#
# Palette.o: $(DSRC)/Palette.c
# $(CC) -c $(DSRC)/Palette.c -Isrc -Wall -o $(DOBJ)/Palette.o
#
# Sprite.o: $(DSRC)/Sprite.c
# $(CC) -c $(DSRC)/Sprite.c -Isrc -Wall -o $(DOBJ)/Sprite.o
#
# ui_palette.o: $(DSRC)/ui_palette.c
# $(CC) -c $(DSRC)/ui_palette.c -Isrc -Wall -o $(DOBJ)/ui_palette.o
#
# ui_sprite.o: $(DSRC)/ui_sprite.c
# $(CC) -c $(DSRC)/ui_sprite.c -Isrc -Wall -o $(DOBJ)/ui_sprite.o
#
# ui_mainbar.o: $(DSRC)/ui_mainbar.c
# $(CC) -c $(DSRC)/ui_mainbar.c -Isrc -Wall -o $(DOBJ)/ui_mainbar.o
#
# ui_runner.o: $(DSRC)/ui_runner.c
# $(CC) -c $(DSRC)/ui_runner.c -Isrc -Wall -o $(DOBJ)/ui_runner.o
#
# ui.o: $(DSRC)/ui.c
# $(CC) -c $(DSRC)/ui.c -Isrc -Wall -o $(DOBJ)/ui.o
#
# kbd_layout.o: $(DSRC)/kbd_layout.c
# $(CC) -c $(DSRC)/kbd_layout.c -Isrc -Wall -o $(DOBJ)/kbd_layout.o
# atlas.o: $(DSRC)/atlas.c
# $(CC) -c $(DSRC)/atlas.c -Isrc -Wall -o $(DOBJ)/atlas.o
# clua.o: $(DSRC)/clua.c
# $(CC) -c $(DSRC)/clua.c -Isrc -Wall -o $(DOBJ)/clua.o
# run:
# if [ -f $(EXEC) ];then ./$(EXEC) ;fi
#
# clean:
# rm -rf $(DOBJ)/*.o
27 changes: 23 additions & 4 deletions WIP.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@

## projects browser
- [ ] icon lua/sprite/egba
- [x] icon lua/sprite/egba
- [x] button add/delete project
- [x] timer
## project menu
- [ ] button run debug/build egba/export bin/import
- [ ] loading error script/png
## project viewer
- [x] button run debug/build egba
- [x] palette/sprite load uisprite
- [x] button export bin
- [x] import lua/script <- egba
- [x] fix log message
- [x] button view sprite/script
- [x] ui timer fix
- [x] egba data wrong

- [x] pix function
- [x] pal function

- [x] lock system
- [x] sprite load error

- [x] btn id 4 5 -> x c
- [x] lua api rename print -> text
## lua/egba save-load static data
- [ ] data to egba
- [ ] .sav file for lua
- [ ] function get data
- [ ] function set data
Binary file removed asset/comand_ship.png
Binary file not shown.
Binary file added asset/egba.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added asset/lua.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added asset/spr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed build/linux64/obj/Palette.o
Binary file not shown.
Binary file removed build/linux64/obj/PaletteManager.o
Binary file not shown.
Binary file removed build/linux64/obj/Sprite.o
Binary file not shown.
Binary file removed build/linux64/obj/SpriteManager.o
Binary file not shown.
Binary file removed build/linux64/obj/atlas.o
Binary file not shown.
Binary file removed build/linux64/obj/clua.o
Binary file not shown.
Binary file removed build/linux64/obj/kbd_layout.o
Binary file not shown.
Binary file removed build/linux64/obj/main.o
Binary file not shown.
Binary file removed build/linux64/obj/ui.o
Binary file not shown.
Binary file removed build/linux64/obj/ui_mainbar.o
Binary file not shown.
Binary file removed build/linux64/obj/ui_palette.o
Binary file not shown.
Binary file removed build/linux64/obj/ui_runner.o
Binary file not shown.
Binary file removed build/linux64/obj/ui_script.o
Binary file not shown.
Binary file removed build/linux64/obj/ui_sprite.o
Binary file not shown.
Binary file added build/web/index.data
Binary file not shown.
27 changes: 27 additions & 0 deletions build/web/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>

<body>

<!-- Create the canvas that the C++ code will draw into -->
<canvas id="canvas" oncontextmenu="event.preventDefault()"></canvas>

<!-- Allow the C++ to access the canvas element -->
<script type='text/javascript'>
var Module = {
canvas: (function() { return document.getElementById('canvas'); })()
};
</script>

<!-- Add the javascript glue code (index.js) as generated by Emscripten -->
<script src="index.js"></script>

</body>

</html>

1 change: 1 addition & 0 deletions build/web/index.js

Large diffs are not rendered by default.

Binary file added build/web/index.wasm
Binary file not shown.
Binary file removed build/win86/obj/JsonObject.o
Binary file not shown.
Binary file removed build/win86/obj/Palette.o
Binary file not shown.
Binary file removed build/win86/obj/PaletteManager.o
Binary file not shown.
Binary file removed build/win86/obj/Sprite.o
Binary file not shown.
Binary file removed build/win86/obj/SpriteManager.o
Binary file not shown.
Binary file removed build/win86/obj/atlas.o
Binary file not shown.
Binary file removed build/win86/obj/clua.o
Binary file not shown.
Binary file removed build/win86/obj/kbd_layout.o
Binary file not shown.
Binary file removed build/win86/obj/main.o
Binary file not shown.
Binary file removed build/win86/obj/ui.o
Binary file not shown.
Binary file removed build/win86/obj/ui_mainbar.o
Binary file not shown.
Binary file removed build/win86/obj/ui_palette.o
Binary file not shown.
Binary file removed build/win86/obj/ui_runner.o
Binary file not shown.
Binary file removed build/win86/obj/ui_script.o
Binary file not shown.
Binary file removed build/win86/obj/ui_sprite.o
Binary file not shown.
Binary file added cimg
Binary file not shown.
32 changes: 32 additions & 0 deletions cimg.h

Large diffs are not rendered by default.

Binary file modified egba
100644 → 100755
Binary file not shown.
Binary file modified egba.exe
100644 → 100755
Binary file not shown.
60 changes: 60 additions & 0 deletions egba.geany
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
[editor]
line_wrapping=false
line_break_column=72
auto_continue_multiline=true

[file_prefs]
final_new_line=true
ensure_convert_new_lines=false
strip_trailing_spaces=false
replace_tabs=false

[indentation]
indent_width=4
indent_type=1
indent_hard_tab_width=8
detect_indent=false
detect_indent_width=false
indent_mode=2

[project]
name=egba
base_path=/home/desnot/GD/c_raylib/egba
description=
file_patterns=

[long line marker]
long_line_behaviour=1
long_line_column=72

[files]
current_page=5
FILE_NAME_0=900;C;0;EUTF-8;1;1;0;%2Fhome%2Fdesnot%2FGD%2Fc_raylib%2Fegba%2Fsrc%2Fmain.c;0;4
FILE_NAME_1=2476;C++;0;EUTF-8;1;1;0;%2Fhome%2Fdesnot%2FGD%2Fc_raylib%2Fegba%2Fsrc%2Fmain.h;0;4
FILE_NAME_2=0;C;0;EUTF-8;1;1;0;%2Fhome%2Fdesnot%2FGD%2Fc_raylib%2Fegba%2Fsrc%2Fclua.c;0;4
FILE_NAME_3=0;C++;0;EUTF-8;1;1;0;%2Fhome%2Fdesnot%2FGD%2Fc_raylib%2Fegba%2Fsrc%2Fclua.h;0;4
FILE_NAME_4=0;C++;0;EUTF-8;1;1;0;%2Fusr%2Flocal%2Finclude%2Fraylib.h;0;4
FILE_NAME_5=472;Markdown;0;EUTF-8;1;1;0;%2Fhome%2Fdesnot%2FGD%2Fc_raylib%2Fegba%2FWIP.md;0;4
FILE_NAME_6=0;Markdown;0;EUTF-8;1;1;0;%2Fhome%2Fdesnot%2FBureau%2FAdvanceStar%2FREADME.md;0;4
FILE_NAME_7=0;Markdown;0;EUTF-8;1;1;0;%2Fhome%2Fdesnot%2FBureau%2FAdvanceStar%2FWIP.md;0;4

[VTE]
last_dir=/home/desnot

[build-menu]
EX_00_LB=_Execute
EX_00_CM=cd .. && ./egba
EX_00_WD=
ShFT_00_LB=Build
ShFT_00_CM=cd %d && make
ShFT_00_WD=
filetypes=Sh;C;
NF_01_LB=Make Custom _Target…
NF_01_CM=make
NF_01_WD=
CFT_00_LB=Build
CFT_00_CM=cd .. && make
CFT_00_WD=
CFT_01_LB=_Build+
CFT_01_CM=gcc -Wall -o "%e" "%f"
CFT_01_WD=
4 changes: 4 additions & 0 deletions egba.kdev4
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[Project]
CreatedFrom=
Manager=KDevCustomBuildSystem
Name=egba
Binary file added egba_manual_a1.5.odt
Binary file not shown.
Binary file added egba_manual_a1.5.pdf
Binary file not shown.
Binary file removed main
Binary file not shown.
2 changes: 1 addition & 1 deletion make
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DSRC="src/"
LUALINUX="/home/desnot/GD/lua-5.4.2/lua_linux"
LUAWIN="/home/desnot/GD/lua-5.4.2/lua_win"
LUAWEB="/home/desnot/GD/lua-5.4.2/lua_web"
CC=clang
CC=gcc
CFLAGS="-g -Wall -L${LUALINUX}/lib -llua -lraylib -lGL -lm -lpthread -ldl -lrt -lX11"
INC="-I${LUALINUX}/include"
EXEC="egba"
Expand Down
94 changes: 0 additions & 94 deletions make.sh

This file was deleted.

Binary file added new.egba
Binary file not shown.
5 changes: 5 additions & 0 deletions new.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
function EGBA()
-- code run 60/seconds
cls(0)
text("hello world",100,50,2,20)
end
Binary file added new.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions new1.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
function EGBA()
-- code run 60/seconds
cls(0)
text("hello world",100,50,1,20)
end
Binary file added new1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions new2.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
function EGBA()
-- code run 60/seconds
cls(0)
text("hello world",100,50,1,20)
end
Binary file added new2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added other/icon-export-export.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
Binary file removed raylib_cheatsheet_v4.5.pdf
Binary file not shown.
Binary file added raylib_cheatsheet_v5.0.pdf
Binary file not shown.
Binary file removed save
Binary file not shown.
Binary file removed save.dat
Binary file not shown.
Binary file modified save.egba
Binary file not shown.
Loading

0 comments on commit ebec91e

Please sign in to comment.