From 1c27658641fa2b55202e64da70046d842bc37068 Mon Sep 17 00:00:00 2001 From: kin-fuyuki Date: Sun, 22 Feb 2026 22:15:45 -0300 Subject: [PATCH] wont use lua lol --- engine/CMakeLists.txt | 19 ++++++++++++--- engine/noisedev/cloud.lua | 0 engine/noisedev/main.cpp | 17 +++++++++---- engine/noisedev/noise.h | 40 +++++++++++++++++++++++++++++++ engine/noisedev/noises/random.cpp | 10 ++++++++ engine/noisedev/scripts.tdf | 11 +++++---- engine/src/graph/noise.cpp | 2 ++ engine/src/graph/noise.h | 18 ++++++++++---- engine/test.cpp | 6 ++--- include/luajit/lauxlib.h | 1 - include/luajit/lua.h | 1 - include/luajit/lua.hpp | 1 - include/luajit/luaconf.h | 1 - include/luajit/lualib.h | 1 - lib/luajit | 1 - 15 files changed, 102 insertions(+), 27 deletions(-) delete mode 100644 engine/noisedev/cloud.lua create mode 100644 engine/noisedev/noise.h create mode 100644 engine/noisedev/noises/random.cpp delete mode 120000 include/luajit/lauxlib.h delete mode 120000 include/luajit/lua.h delete mode 120000 include/luajit/lua.hpp delete mode 120000 include/luajit/luaconf.h delete mode 120000 include/luajit/lualib.h delete mode 160000 lib/luajit diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index 0d39f1e..573b1e3 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -21,11 +21,17 @@ set_target_properties(enginend PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/link/${CURRPLATFORM}" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/link/${CURRPLATFORM}" ) +target_include_directories(enginend PUBLIC + ${CMAKE_SOURCE_DIR}/include + +) + add_executable(test test.cpp) + set_target_properties(test PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/engine/test" ) @@ -39,7 +45,14 @@ target_link_libraries(test PRIVATE target_include_directories(test PUBLIC ${CMAKE_SOURCE_DIR}/include ) -target_include_directories(enginend PUBLIC - ${CMAKE_SOURCE_DIR}/include - +add_executable(noisemake test.cpp) +set_target_properties(noisemake PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/engine/noisedev" ) +target_include_directories(noisemake PUBLIC + ${CMAKE_SOURCE_DIR}/include +) +target_link_libraries(noisemake PRIVATE + enginend + raylib +) \ No newline at end of file diff --git a/engine/noisedev/cloud.lua b/engine/noisedev/cloud.lua deleted file mode 100644 index e69de29..0000000 diff --git a/engine/noisedev/main.cpp b/engine/noisedev/main.cpp index 8aa9af5..de8f79d 100644 --- a/engine/noisedev/main.cpp +++ b/engine/noisedev/main.cpp @@ -1,6 +1,5 @@ #include #include -#include #include @@ -18,7 +17,9 @@ public: std::vector scripts; const char* CONF()override{return "scripts.tdf";} Image noiseout; + std::string erroredscript=""; noiserenderer(){ + enginend::DEFAULT->text={255,0,0,255}; config=new tiny::TDF_FILE; config->filepath=(char*)this->CONF(); config->read(); @@ -40,18 +41,24 @@ public: this->tickrate=3; this->framerate=3; } - void tick() override{} - void draw() override { + void tick() override { + (*(dynamic_cast((*gui)[1]))).content=this->erroredscript; + (*(dynamic_cast((*gui)[0]))).tick(); + (*(dynamic_cast((*gui)[1]))).tick(); } + void draw() override { + (*(dynamic_cast((*gui)[0]))).draw(); + (*(dynamic_cast((*gui)[1]))).draw(); + } void exit() override{} ~noiserenderer() {}; }; void refreshstuf(noiserenderer *program,char *refreshtdf,char *refreshnoise); - int main() { + noiserenderer program; program.boot(); struct timespec peepy; @@ -115,4 +122,4 @@ void refreshstuf(noiserenderer *program,char *refreshtdf,char *refreshnoise){ delete tocheck; } -} \ No newline at end of file +} diff --git a/engine/noisedev/noise.h b/engine/noisedev/noise.h new file mode 100644 index 0000000..3ab4bcc --- /dev/null +++ b/engine/noisedev/noise.h @@ -0,0 +1,40 @@ +#pragma once + +struct buffer { + char**pixel;//rgba format +}; + + +enum NOISETYPE { + CLOUD, + RANDOM, + +}; +enum DIMENSION { + ONE,TWO,THREE,FOUR +}; + +class noise { + public: + int freq; + int octave; + int amp; + NOISETYPE type; + DIMENSION dims; + + noise(int freq,int octave, int amp, NOISETYPE type, DIMENSION dims): + freq(freq), octave(octave), amp(amp), type(type),dims(dims) { + + } +/// to explain the image generator +/// \param x int +/// \param y int +/// ^ these here is the position the noise will start rendering +/// \param w +/// \param h +/// these are the image width and height. PLEASE DO NOT GET CONFUSED + buffer* gen(short w, short h,int x, int y); +}; + +buffer* cloud(noise* noise,short w, short h,int x, int y); +buffer* random(noise* noise, short w, short h,int x, int y); \ No newline at end of file diff --git a/engine/noisedev/noises/random.cpp b/engine/noisedev/noises/random.cpp new file mode 100644 index 0000000..0ec31c6 --- /dev/null +++ b/engine/noisedev/noises/random.cpp @@ -0,0 +1,10 @@ +#include "../noise.h" + +class noiserandom:public noise { + +}; + +noiserandom* createnoise() { + noiserandom* neo=new noiserandom(); + return neo; +} diff --git a/engine/noisedev/scripts.tdf b/engine/noisedev/scripts.tdf index fb403c3..ffb210f 100644 --- a/engine/noisedev/scripts.tdf +++ b/engine/noisedev/scripts.tdf @@ -1,7 +1,8 @@ -{ lua -" CLOUD cloud.lua -" NOISE noise.lua -} i refreshsecs 3 i tdfrefresh 5 -i imagesize 512 \ No newline at end of file +i imagesize 512 + +{ lua +" CLOUD cloud +" NOISE noise +} \ No newline at end of file diff --git a/engine/src/graph/noise.cpp b/engine/src/graph/noise.cpp index 50cb03a..843da5e 100644 --- a/engine/src/graph/noise.cpp +++ b/engine/src/graph/noise.cpp @@ -2,6 +2,8 @@ #include + + Image* noise::gen(short w, short h, int x, int y) { switch (this->type) { case CLOUD: diff --git a/engine/src/graph/noise.h b/engine/src/graph/noise.h index d3f8478..3ab4bcc 100644 --- a/engine/src/graph/noise.h +++ b/engine/src/graph/noise.h @@ -1,5 +1,10 @@ #pragma once -#include "window.h" + +struct buffer { + char**pixel;//rgba format +}; + + enum NOISETYPE { CLOUD, RANDOM, @@ -16,8 +21,11 @@ class noise { int amp; NOISETYPE type; DIMENSION dims; + noise(int freq,int octave, int amp, NOISETYPE type, DIMENSION dims): - freq(freq), octave(octave), amp(amp), type(type),dims(dims) {} + freq(freq), octave(octave), amp(amp), type(type),dims(dims) { + + } /// to explain the image generator /// \param x int /// \param y int @@ -25,8 +33,8 @@ class noise { /// \param w /// \param h /// these are the image width and height. PLEASE DO NOT GET CONFUSED - Image* gen(short w, short h,int x, int y); + buffer* gen(short w, short h,int x, int y); }; -Image* cloud(noise* noise,short w, short h,int x, int y); -Image* random(noise* noise, short w, short h,int x, int y); \ No newline at end of file +buffer* cloud(noise* noise,short w, short h,int x, int y); +buffer* random(noise* noise, short w, short h,int x, int y); \ No newline at end of file diff --git a/engine/test.cpp b/engine/test.cpp index fce4c43..d5895af 100644 --- a/engine/test.cpp +++ b/engine/test.cpp @@ -13,10 +13,10 @@ public: InitWindow(500,500,"test"); SetTargetFPS(GetMonitorRefreshRate(GetCurrentMonitor())); this->tickrate=GetMonitorRefreshRate(GetCurrentMonitor()); - s.nodes=std::list{ + s.nodes=std::vector{ - new nodes::colored(Color{255,255,255,255},0,0,500,500), - new nodes::textfield(nullptr,enginend::DEFAULT + new nodes::twod::colored(Color{255,255,255,255},0,0,500,500), + new nodes::twod::textfield(nullptr,enginend::DEFAULT ,100,100,220,32,32, "welcome to enginend!\n" "hehe" diff --git a/include/luajit/lauxlib.h b/include/luajit/lauxlib.h deleted file mode 120000 index 9b90d8d..0000000 --- a/include/luajit/lauxlib.h +++ /dev/null @@ -1 +0,0 @@ -../../lib/luajit/inc/lauxlib.h \ No newline at end of file diff --git a/include/luajit/lua.h b/include/luajit/lua.h deleted file mode 120000 index d8a9d9a..0000000 --- a/include/luajit/lua.h +++ /dev/null @@ -1 +0,0 @@ -../../lib/luajit/inc/lua.h \ No newline at end of file diff --git a/include/luajit/lua.hpp b/include/luajit/lua.hpp deleted file mode 120000 index 04539d8..0000000 --- a/include/luajit/lua.hpp +++ /dev/null @@ -1 +0,0 @@ -../../lib/luajit/inc/lua.hpp \ No newline at end of file diff --git a/include/luajit/luaconf.h b/include/luajit/luaconf.h deleted file mode 120000 index 0f62f1a..0000000 --- a/include/luajit/luaconf.h +++ /dev/null @@ -1 +0,0 @@ -../../lib/luajit/inc/luaconf.h \ No newline at end of file diff --git a/include/luajit/lualib.h b/include/luajit/lualib.h deleted file mode 120000 index c65cbfe..0000000 --- a/include/luajit/lualib.h +++ /dev/null @@ -1 +0,0 @@ -../../lib/luajit/inc/lualib.h \ No newline at end of file diff --git a/lib/luajit b/lib/luajit deleted file mode 160000 index 5db4b03..0000000 --- a/lib/luajit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5db4b03aeaf0f72eb817b468461b896466f820fd