1 Commits

Author SHA1 Message Date
6794dada92 store id in DB 2026-02-16 23:07:22 +01:00
18 changed files with 362 additions and 201 deletions

View File

@@ -33,7 +33,7 @@ add_library(shared STATIC
shared/src/values/Similarity.cpp shared/src/values/Similarity.cpp
shared/src/TcpSocket.cpp shared/src/TcpSocket.cpp
shared/src/sql.cpp shared/src/sql.cpp
shared/src/timing.cpp shared/src/values/DnaDB.cpp
) )
add_executable(app add_executable(app
@@ -45,23 +45,21 @@ add_executable(app
target_include_directories(app PRIVATE app/inc) target_include_directories(app PRIVATE app/inc)
target_link_libraries(app PRIVATE shared) target_link_libraries(app PRIVATE shared)
# add_executable(server add_executable(server
# server/src/server.cpp server/src/server.cpp
# server/src/checker.cpp server/src/checker.cpp
# ) )
# target_include_directories(server PRIVATE server/inc) target_include_directories(server PRIVATE server/inc)
# target_link_libraries(server PRIVATE shared) target_link_libraries(server PRIVATE shared)
# add_executable(view add_executable(view
# view/src/main.cpp view/src/main.cpp
# view/src/Vapp.cpp view/src/Vapp.cpp
# ) )
# target_include_directories(view PRIVATE view/inc) target_include_directories(view PRIVATE view/inc)
# target_link_libraries(view PRIVATE shared) target_link_libraries(view PRIVATE shared)
# add_executable(slike add_executable(slike
# random/slike.cpp random/slike.cpp
# ) )
# target_link_libraries(slike PRIVATE shared) target_link_libraries(slike PRIVATE shared)
file(COPY CascadiaCode.ttf DESTINATION "res")

Binary file not shown.

View File

@@ -1,6 +1,7 @@
#include <array> #include <array>
#include "canvas/Canvas.hpp" #include "canvas/Canvas.hpp"
#include "DnaStore.hpp" #include "DnaStore.hpp"
class App class App
{ {
@@ -18,14 +19,30 @@ private:
int screenWidth, screenHeight; int screenWidth, screenHeight;
Canvas canvas; Canvas canvas;
RenderTexture2D canvasTexure = {0}; int pos = 0;
std::array<RenderTexture2D, 2> canvasTexure = {0};
float rotation = 0.0f;
Vector2 mouseStart;
bool validHit = false;
float len;
float ofset;
Liked topLiked = Liked::tbd;
Rectangle destA; Rectangle destA;
Rectangle destB;
Rectangle likeBox;
Rectangle disLikeBox;
UiUnit unit = {0}; std::array<UiUnit, 2> unit = {0};
DnaManagerData manager; DnaManagerData manager;
Rectangle likedTextBox;
Rectangle genTextBox;
Rectangle simTextBox;
float simil = 100.0f;
Color appColor = BLUE;
}; };

View File

@@ -2,6 +2,8 @@
namespace DnaStore namespace DnaStore
{ {
void init();
void deinit();
void load(DnaManagerData *data); void load(DnaManagerData *data);
void saveData(DnaManagerData *data); void saveData(DnaManagerData *data);
void saveVec(DnaManagerData *data); void saveVec(DnaManagerData *data);

View File

@@ -2,118 +2,242 @@
#include <cmath> #include <cmath>
#include "App.hpp" #include "App.hpp"
#include "timing.hpp"
#include <raylib.h> #include <raylib.h>
#include <raymath.h> #include <raymath.h>
Font fontTtf; #define TOP (1 - pos)
#define BOTTOM pos
void DrawTextB(const char *text, float posX, float posY, int fontSize, Color color) Rectangle TextInSpace(Rectangle box, float textH, float textW, float margin, bool topOrBottom, bool leftOrRigth)
{ {
DrawTextEx(fontTtf, text, (Vector2){ posX, posY }, fontSize, 1, color); float br = box.width / box.height;
float tr = textW / textH;
Rectangle ret = {0, 0, 0, 0};
float hm = box.height * margin;
float wm = box.width * margin;
ret.height = box.height - hm;
ret.width = box.width - wm;
if (br < tr)
{
// bolj kvadrat izracunaj visino iz sirine
ret.height = ret.width / tr;
}
else
{
// bolj podolgovat izracunaj sirino iz visine
ret.width = ret.height * tr;
}
if (topOrBottom)
{
ret.y = box.y + hm;
}
else
{
ret.y = box.y + box.height - hm - ret.height;
}
if (leftOrRigth)
{
ret.x = box.x + wm;
}
else
{
ret.x = box.x + box.width - wm - ret.width;
}
return ret;
} }
// Dimentions for font size 20
// DISLIKE 83
// LIKE 46
// GEN 9999: 999/999 -> 200
constexpr float textMargin = 0.02f;
void App::init(int screenWidth, int screenHeight) void App::init(int screenWidth, int screenHeight)
{ {
fontTtf = LoadFontEx("res/CascadiaCode.ttf", 32, 0, 0);
SetTextLineSpacing(16);
this->screenWidth = screenWidth; this->screenWidth = screenWidth;
this->screenHeight = screenHeight; this->screenHeight = screenHeight;
this->canvas.init(screenWidth); this->canvas.init(screenWidth);
DnaStore::init();
// int s = MeasureText("GEN 9999: 999/999", 20);
// TraceLog(LOG_INFO, "%d", s);
for (size_t i = 0; i < canvasTexure.size(); i++)
canvasTexure = LoadRenderTexture(screenWidth, screenWidth); {
canvasTexure[i] = LoadRenderTexture(screenWidth, screenWidth);
}
DnaStore::load(&manager); DnaStore::load(&manager);
simil = Similarity::calc_similarity(manager.vector);
upTex(Liked::tbd); upTex(Liked::tbd);
while (!canvas.tick(canvasTexure)) while (!canvas.tick(canvasTexure[TOP]))
{ {
// wait to finish drawing // wait to finish drawing
} }
pos = 1 - pos;
upTex(Liked::tbd);
while (!canvas.tick(canvasTexure[TOP]))
{
// wait to finish drawing
}
pos = 1 - pos;
float posY = (screenHeight - screenWidth) / 2.0f; float posY = (screenHeight - screenWidth) / 2.0f;
destA = {0, posY, (float)screenWidth, (float)screenWidth}; likedTextBox = TextInSpace({0,
0,
(float)screenWidth / 2.0f,
posY},
20.0f, 83.0f, textMargin, false, true);
genTextBox = TextInSpace({0,
posY + screenWidth,
(float)screenWidth,
posY},
20.0f, 200.0f, textMargin, true, true);
simTextBox = TextInSpace({(float)screenWidth / 2.0f,
likedTextBox.y,
(float)screenWidth / 2.0f,
likedTextBox.height},
20.0f, 60.0f, textMargin, false, false);
destB = {0, posY, (float)screenWidth, (float)screenWidth};
destA = destB;
float recPosX = screenWidth * 0.3f;
disLikeBox = {0, posY, (float)recPosX, (float)screenWidth};
likeBox = {screenWidth - recPosX, posY, (float)recPosX, (float)screenWidth};
if(!DnaStore::ping()){
appColor = RED;
}
} }
void App::upTex(Liked liked) void App::upTex(Liked liked)
{ {
if (liked != Liked::tbd) if (liked != Liked::tbd)
{ {
unit.liked = liked; unit[TOP].liked = liked;
bool ng = DnaManager::like(unit, &manager); bool ng = DnaManager::like(unit[TOP], &manager);
if (ng) if (ng)
{ {
DnaStore::saveGen(&manager); DnaStore::saveGen(&manager);
DnaManager::newGen(&manager); DnaManager::newGen(&manager);
DnaStore::saveVec(&manager); DnaStore::saveVec(&manager);
simil = Similarity::calc_similarity(manager.vector);
} }
DnaStore::saveData(&manager); DnaStore::saveData(&manager);
} }
unit = DnaManager::next(&manager); unit[TOP] = DnaManager::next(&manager);
if (unit.dna != nullptr) if (unit[TOP].dna != nullptr)
{ {
canvas.newGen(canvasTexure, unit.dna); canvas.newGen(canvasTexure[TOP], unit[TOP].dna);
return; return;
} }
BeginTextureMode(canvasTexure); BeginTextureMode(canvasTexure[TOP]);
ClearBackground(BLACK); ClearBackground(BLACK);
DrawText("NEXT GEN", 10, 10, screenWidth/10, WHITE); DrawText("NEXT GEN", 10, 10, screenWidth/10, WHITE);
EndTextureMode(); EndTextureMode();
} }
void App::update(){} void App::update()
{
bool isDone = canvas.tick(canvasTexure[BOTTOM]);
Vector2 mousePosition = GetMousePosition();
if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT))
{
mouseStart = mousePosition;
validHit = CheckCollisionPointRec(mouseStart, destA);
len = Vector2Distance(mouseStart, {destB.x, destB.y});
ofset = std::atan2(destB.x - mouseStart.x, destB.y - mouseStart.y);
}
enum class Rend_type{ if (IsMouseButtonDown(MOUSE_BUTTON_LEFT) && validHit)
every_frame, {
in_one_frame, float dist = mousePosition.x - mouseStart.x;
over_frames, float l = dist / screenWidth;
}; rotation = Lerp(45.0f, -45.0f, (l + 1) / 2);
constexpr Rend_type rend_type = Rend_type::over_frames; float angle = ((rotation)*PI) / 180.0f;
angle += ofset;
Vector2 newCenter = {.x = len * std::sin(angle), .y = len * std::cos(angle)};
destA.x = newCenter.x + mousePosition.x;
destA.y = newCenter.y + mousePosition.y;
if (CheckCollisionPointRec(mousePosition, disLikeBox))
{
topLiked = Liked::no;
}
else if (CheckCollisionPointRec(mousePosition, likeBox))
{
topLiked = Liked::yes;
}
else
{
topLiked = Liked::tbd;
}
}
if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT) && validHit)
{
if (isDone)
{
if (topLiked != Liked::tbd)
{
upTex(topLiked);
pos = 1 - pos; // switch bottom and top
}
}
rotation = 0.0f;
destA = destB;
topLiked = Liked::tbd;
}
}
void App::draw() void App::draw()
{ {
if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT)) ClearBackground(appColor);
{
TraceLog(LOG_INFO, "CLICK");
upTex(Liked::yes);
if constexpr (rend_type == Rend_type::in_one_frame){
while (!canvas.tick(canvasTexure))
{
// wait to finish drawing
}
}
}
if constexpr (rend_type == Rend_type::over_frames){
canvas.tick(canvasTexure);
}
ClearBackground(BLUE);
int fps = GetFPS();
const char* fpstext = TextFormat("%04d FPS", fps);
DrawTextB(fpstext, 10, 10, 36, BLACK);
const char* ctext = TextFormat("%04ld Circles", canvas.tree.circles);
DrawTextB(ctext, 10, 50, 36, BLACK);
Rectangle source = {0, 0, (float)screenWidth, (float)-screenWidth}; Rectangle source = {0, 0, (float)screenWidth, (float)-screenWidth};
Vector2 origin = {0.0f, 0.0f}; Vector2 origin = {0.0f, 0.0f};
if constexpr (rend_type == Rend_type::every_frame){
canvas.newGen(canvasTexure, unit.dna); DrawTexturePro(canvasTexure[BOTTOM].texture, source, destB, origin, 0.0f, WHITE);
while (!canvas.tick(canvasTexure))
{ DrawTexturePro(canvasTexure[TOP].texture, source, destA, origin, 360 - rotation, WHITE);
// wait to finish drawing
} const char *textGen = TextFormat("GEN %d: %d / %d", manager.generation, unit[TOP].index + 1, NUM_PER_GEN);
DrawText(textGen, genTextBox.x, genTextBox.y, genTextBox.height, BLACK);
const char *textProc = TextFormat("%.1f%%", simil);
DrawText(textProc, simTextBox.x, simTextBox.y, simTextBox.height, BLACK);
switch (topLiked)
{
case Liked::yes:
DrawText("LIKED", likedTextBox.x, likedTextBox.y, likedTextBox.height, BLACK);
break;
case Liked::no:
DrawText("DISLIKE", likedTextBox.x, likedTextBox.y, likedTextBox.height, BLACK);
break;
default:
break;
} }
DrawTexturePro(canvasTexure.texture, source, destA, origin, 360, WHITE);
} }
void App::deinit() void App::deinit()
{ {
UnloadRenderTexture(canvasTexure); for (size_t i = 0; i < canvasTexure.size(); i++)
UnloadFont(fontTtf); {
UnloadRenderTexture(canvasTexure[i]);
}
canvas.deinit(); canvas.deinit();
DnaStore::deinit();
} }

View File

@@ -9,6 +9,7 @@
#include "sys.hpp" #include "sys.hpp"
#include "DnaStore.hpp" #include "DnaStore.hpp"
#include "TcpSocket.hpp" #include "TcpSocket.hpp"
#include "values/DnaDB.hpp"
#include <raylib.h> #include <raylib.h>
@@ -17,19 +18,30 @@
#define VECTOR_FILE_NAME "VECTOR.bin" #define VECTOR_FILE_NAME "VECTOR.bin"
#define GEN_FILE_PATTRN "gen/%04d.bin" #define GEN_FILE_PATTRN "gen/%04d.bin"
#define HOST_NAME "localhost" #define HOST_NAME "localhost"
#define DB_NAME "data.db"
DnaDB dnaDB;
void DnaStore::init(){
const char* filename = sys::transformFilePath(DB_NAME);
dnaDB.init(filename);
}
void DnaStore::deinit(){
dnaDB.deinit();
}
void DnaStore::load(DnaManagerData *data) void DnaStore::load(DnaManagerData *data)
{ {
const char *dir = sys::transformFilePath("gen"); const char *dir = sys::transformFilePath("gen");
std::filesystem::create_directory(dir); std::filesystem::create_directory(dir);
if (sys::fileExists(ID_FILE_NAME))
{ std::vector<int64_t> ids = dnaDB.getUserIds();
sys::loadDataFromFile(ID_FILE_NAME, &data->id, sizeof(int64_t)); if(!ids.empty()){
} data->id = ids[0];
else }else{
{
data->id = time(nullptr); data->id = time(nullptr);
sys::saveDataToFile(ID_FILE_NAME, &data->id, sizeof(int64_t)); dnaDB.insertUser(data->id, 0);
} }
if (sys::fileExists(DATA_FILE_NAME)) if (sys::fileExists(DATA_FILE_NAME))

View File

@@ -1,6 +1,5 @@
#include <raylib.h> #include <raylib.h>
#include "App.hpp" #include "App.hpp"
#include "timing.hpp"
#if defined(PLATFORM_WEB) #if defined(PLATFORM_WEB)
#include <emscripten/emscripten.h> #include <emscripten/emscripten.h>
@@ -8,14 +7,12 @@
static App app; static App app;
Timer t;
void UpdateDrawFrame() void UpdateDrawFrame()
{ {
t.reset_and_start(); app.update();
BeginDrawing(); BeginDrawing();
app.draw(); app.draw();
EndDrawing(); EndDrawing();
t.stop_and_print("to draw frame");
} }
int main(void) int main(void)
@@ -37,7 +34,7 @@ int main(void)
#if defined(PLATFORM_WEB) #if defined(PLATFORM_WEB)
emscripten_set_main_loop(UpdateDrawFrame, 0, 1); emscripten_set_main_loop(UpdateDrawFrame, 0, 1);
#else #else
// SetTargetFPS(60); SetTargetFPS(60);
while (!WindowShouldClose()) while (!WindowShouldClose())
{ {
UpdateDrawFrame(); UpdateDrawFrame();

View File

@@ -13,6 +13,7 @@ public:
void newGen(RenderTexture2D &target, Dna *dna); void newGen(RenderTexture2D &target, Dna *dna);
bool tick(RenderTexture2D &target); bool tick(RenderTexture2D &target);
private:
BackGround backGround; BackGround backGround;
Tree tree; Tree tree;
}; };

View File

@@ -23,7 +23,6 @@ public:
void init(int size); void init(int size);
void draw(Dna *dna); void draw(Dna *dna);
bool tick(); bool tick();
uint64_t circles;
private: private:
Dna *m_dna; Dna *m_dna;
@@ -35,8 +34,7 @@ private:
void calculateBranch(); void calculateBranch();
void drawBranch_rlTriangle(Vector2 startPoint, Vector2 endPoint, Color startColor, Color endColor, float startThickness, float endThickness, float length); void drawBranch(Vector2 startPoint, Vector2 endPoint, Color startColor, Color endColor, float startThickness, float endThickness);
void drawBranch_circles(Vector2 startPoint, Vector2 endPoint, Color startColor, Color endColor, float startThickness, float endThickness, float length);
inline size_t getNumOfBranches(int dep); inline size_t getNumOfBranches(int dep);
inline Color getStartColor(DrawArgs &arg); inline Color getStartColor(DrawArgs &arg);
inline Color getEndColor(int dep, Color &start); inline Color getEndColor(int dep, Color &start);

View File

@@ -33,7 +33,7 @@ constexpr char DB_NAME[] = "data.db";
struct sqlite3; struct sqlite3;
struct sqlite3_stmt; struct sqlite3_stmt;
#define SQLITE_ROW 100 /* sqlite3_step() has another row ready */ #define SQLITE_ROW 100 /* sqlite3_step() has another row ready */
#define SQL_DONE 101 #define SQL_DONE 101
#define SQL_NULL 5 #define SQL_NULL 5
#define SQLITE_OK 0 #define SQLITE_OK 0
@@ -44,6 +44,7 @@ namespace sql
void init(); void init();
void shutdown(); void shutdown();
int open(const char *filename, sqlite3 **ppDb); int open(const char *filename, sqlite3 **ppDb);
int exec(sqlite3 *db, const char *sql, int (*callback)(void *, int, char **, char **), void *first_arg, char **errmsg);
int prepare_v2(sqlite3 *db, const char *zSql, int nByte, sqlite3_stmt **pStmt, const char **pzTail); int prepare_v2(sqlite3 *db, const char *zSql, int nByte, sqlite3_stmt **pStmt, const char **pzTail);
int bind_int64(sqlite3_stmt *pStmt, int column, int64_t value); int bind_int64(sqlite3_stmt *pStmt, int column, int64_t value);
int step(sqlite3_stmt *pStmt); int step(sqlite3_stmt *pStmt);

View File

@@ -1,18 +0,0 @@
#include <chrono>
struct Timer
{
std::chrono::steady_clock::time_point start_t;
std::chrono::steady_clock::time_point end_t;
std::chrono::nanoseconds dur;
void start();
void stop();
void reset();
void print(const char * str);
void stop_and_print(const char * str);
void reset_and_start();
};

View File

@@ -0,0 +1,20 @@
#include <cinttypes>
#include <vector>
struct sqlite3;
class DnaDB
{
sqlite3 *db;
public:
void init(const char *db_name = "data.db");
void deinit();
std::vector<int64_t> getUserIds();
int insertUser(int64_t id, int64_t max_gen);
int updateUser(int64_t id, int64_t max_gen);
void getGenerations();
void getLikesForGeneration();
void getVectorForGeneration();
};

View File

@@ -7,9 +7,9 @@
enum Liked enum Liked
{ {
tbd, tbd = 0,
yes, yes = 1,
no no = 2,
}; };
struct UiUnit struct UiUnit

View File

@@ -1,5 +1,4 @@
#include "canvas/Canvas.hpp" #include "canvas/Canvas.hpp"
#include "timing.hpp"
void Canvas::init(int size) void Canvas::init(int size)
{ {
@@ -7,13 +6,8 @@ void Canvas::init(int size)
tree.init(size); tree.init(size);
} }
bool finished = false;
Timer timer;
void Canvas::newGen(RenderTexture2D &target, Dna *dna) void Canvas::newGen(RenderTexture2D &target, Dna *dna)
{ {
finished = false;
timer.reset_and_start();
BeginTextureMode(target); BeginTextureMode(target);
ClearBackground(WHITE); ClearBackground(WHITE);
@@ -21,20 +15,13 @@ void Canvas::newGen(RenderTexture2D &target, Dna *dna)
tree.draw(dna); tree.draw(dna);
EndTextureMode(); EndTextureMode();
timer.stop();
} }
bool Canvas::tick(RenderTexture2D &target) bool Canvas::tick(RenderTexture2D &target)
{ {
timer.start();
BeginTextureMode(target); BeginTextureMode(target);
bool ret = tree.tick(); bool ret = tree.tick();
EndTextureMode(); EndTextureMode();
timer.stop();
if(ret && !finished){
finished = true;
timer.print("to draw canvas");
}
return ret; return ret;
} }

View File

@@ -1,13 +1,12 @@
#include <cmath> #include <cmath>
#include "canvas/Tree.hpp" #include "canvas/Tree.hpp"
#include "timing.hpp"
#include <raylib.h> #include <raylib.h>
#include <raymath.h> #include <raymath.h>
#include <rlgl.h> #include <rlgl.h>
#define ITER_PER_FRAME 10000 #define ITER_PER_FRAME 5000
constexpr int maxColorChange = 15; constexpr int maxColorChange = 15;
constexpr int minColorChange = -15; constexpr int minColorChange = -15;
@@ -47,23 +46,22 @@ void Tree::init(int size)
void Tree::draw(Dna *dna) void Tree::draw(Dna *dna)
{ {
circles = 0;
m_dna = dna; m_dna = dna;
branchSeed = dna->branchSeed; branchSeed = dna->branchSeed;
drawCalls.push_back({start, 180.0f, 0}); drawCalls.push_back({start, 180.0f, 0});
tick();
} }
bool Tree::tick() bool Tree::tick()
{ {
using namespace std::chrono; size_t i = 0;
auto start = steady_clock::now(); while (!drawCalls.empty())
nanoseconds dur = 0us;
while (!drawCalls.empty() && dur < 14ms)
{ {
calculateBranch(); calculateBranch();
drawCalls.pop_front(); drawCalls.pop_front();
auto end = steady_clock::now(); i++;
dur = end - start; if (i >= ITER_PER_FRAME)
break;
} }
return drawCalls.empty(); return drawCalls.empty();
@@ -85,12 +83,19 @@ void Tree::calculateBranch()
int sizeStart = getStartSize(arg); int sizeStart = getStartSize(arg);
int sizeEnd = getEndSize(arg, sizeStart); int sizeEnd = getEndSize(arg, sizeStart);
float fstep = 1.0 / ((length / sizeStart) * 2.0f);
Color colorStart = getStartColor(arg); Color colorStart = getStartColor(arg);
Color colorEnd = getEndColor(arg.dep, colorStart); Color colorEnd = getEndColor(arg.dep, colorStart);
// drawBranch_rlTriangle(arg.start, end, colorStart, colorEnd, sizeStart, sizeEnd, length); // drawBranch(arg.start, end, colorStart, colorEnd, sizeStart, sizeEnd);
drawBranch_circles(arg.start, end, colorStart, colorEnd, sizeStart, sizeEnd, length); for (float i = 0; i < 1; i += fstep)
// DrawLineEx(arg.start, end, sizeStart, colorStart); {
Vector2 point = Vector2Lerp(arg.start, end, i);
Color color = ColorLerp(colorStart, colorEnd, i);
int size = Lerp(sizeStart, sizeEnd, i);
DrawCircleV(point, size, color);
// DrawTextureEx(texBunny, point,0, ((float)size) / texBunny.height, color);
}
// add more branches to draw // add more branches to draw
@@ -109,7 +114,6 @@ void Tree::calculateBranch()
inline size_t Tree::getNumOfBranches(int dep) inline size_t Tree::getNumOfBranches(int dep)
{ {
return 3;
if (m_dna->branches[dep].branchCount < 128) if (m_dna->branches[dep].branchCount < 128)
return 2; return 2;
else else
@@ -159,7 +163,7 @@ inline int Tree::getStartSize(DrawArgs &arg)
float mixLevel = m_dna->branches[arg.dep].sizeLevel / 255.0f; float mixLevel = m_dna->branches[arg.dep].sizeLevel / 255.0f;
size = std::lerp(size, sizes[MAX_DEPTH - arg.dep - 1], mixLevel); size = std::lerp(size, sizes[MAX_DEPTH - arg.dep - 1], mixLevel);
//if (size < 1) if (size < 1)
size = 1; size = 1;
return size; return size;
} }
@@ -169,7 +173,7 @@ inline int Tree::getEndSize(DrawArgs &arg, int start)
int size = Remap(m_dna->branches[arg.dep].sizeChange, 0, 255, MinSizeChange, maxSizeChange); int size = Remap(m_dna->branches[arg.dep].sizeChange, 0, 255, MinSizeChange, maxSizeChange);
size += start; size += start;
//if (size < 1) if (size < 1)
size = 1; size = 1;
return size; return size;
} }
@@ -177,9 +181,9 @@ inline int Tree::getEndSize(DrawArgs &arg, int start)
inline float Tree::getLength(DrawArgs &arg) inline float Tree::getLength(DrawArgs &arg)
{ {
float lenght = lengths[arg.dep]; float lenght = lengths[arg.dep];
float lenghtRatio = Remap(255, 0, 255, 0.5f, 1.3f); float lenghtRatio = Remap(m_dna->branches[arg.dep].length, 0, 255, 0.5f, 1.3f);
lenght *= lenghtRatio; lenght *= lenghtRatio;
float lenghtVar = Remap(255, 0, 255, -0.15f, 0.15f); float lenghtVar = Remap(m_dna->branches[arg.dep].lengthVar, 0, 255, -0.15f, 0.15f);
lenght += lenght * lenghtVar * mrand::getFloat(&branchSeed); lenght += lenght * lenghtVar * mrand::getFloat(&branchSeed);
if (lenght < 1) if (lenght < 1)
lenght = 1; lenght = 1;
@@ -195,28 +199,15 @@ inline float Tree::getAngleVar(DrawArgs &arg)
return angleVar; return angleVar;
} }
void Tree::drawBranch_circles(Vector2 startPoint, Vector2 endPoint, Color startColor, Color endColor, float startThickness, float endThickness, float length) void Tree::drawBranch(Vector2 startPoint, Vector2 endPoint, Color startColor, Color endColor, float startThickness, float endThickness)
{ {
float fstep = 1.0 / ((length / startThickness) * 2.0f);
for (float i = 0; i < 1; i += fstep)
{
Vector2 point = Vector2Lerp(startPoint, endPoint, i);
Color color = ColorLerp(startColor, endColor, i);
int size = Lerp(startThickness, endThickness, i);
DrawCircleV(point, size, color);
circles++;
}
}
void Tree::drawBranch_rlTriangle(Vector2 startPoint, Vector2 endPoint, Color startColor, Color endColor, float startThickness, float endThickness, float length)
{
DrawCircleV(startPoint, startThickness, startColor);
DrawCircleV(endPoint, endThickness, endColor);
// Calculate the direction vector from startPoint to endPoint // Calculate the direction vector from startPoint to endPoint
Vector2 direction = {endPoint.x - startPoint.x, endPoint.y - startPoint.y}; Vector2 direction = {endPoint.x - startPoint.x, endPoint.y - startPoint.y};
// Normalize the direction vector // Normalize the direction vector
float length = sqrtf(direction.x * direction.x + direction.y * direction.y);
if (length == 0)
length = 1; // Avoid division by zero
Vector2 normalizedDir = {direction.x / length, direction.y / length}; Vector2 normalizedDir = {direction.x / length, direction.y / length};
// Calculate the perpendicular vector (rotate 90 degrees) // Calculate the perpendicular vector (rotate 90 degrees)

View File

@@ -78,6 +78,10 @@ namespace sql
{ {
return sqlite3_open(filename, ppDb); return sqlite3_open(filename, ppDb);
} }
int exec(sqlite3 *db, const char *sql, int (*callback)(void *, int, char **, char **), void *first, char **errmsg)
{
return sqlite3_exec(db, sql, callback, first, errmsg);
}
int prepare_v2(sqlite3 *db, const char *zSql, int nByte, sqlite3_stmt **pStmt, const char **pzTail) int prepare_v2(sqlite3 *db, const char *zSql, int nByte, sqlite3_stmt **pStmt, const char **pzTail)
{ {
return sqlite3_prepare_v2(db, zSql, nByte, pStmt, pzTail); return sqlite3_prepare_v2(db, zSql, nByte, pStmt, pzTail);

View File

@@ -1,42 +0,0 @@
#include <raylib.h>
#include <chrono>
#include "timing.hpp"
using namespace std::chrono;
void Timer::start()
{
start_t = std::chrono::steady_clock::now();
}
void Timer::stop()
{
end_t = std::chrono::steady_clock::now();
dur += end_t - start_t;
}
void Timer::reset()
{
dur = 0ns;
}
void Timer::print(const char * str)
{
auto s = std::chrono::duration_cast<std::chrono::milliseconds>(dur);
if (s > 1000us)
{
TraceLog(LOG_INFO, "%ld ms %s", s.count(), str);
}
}
void Timer::stop_and_print(const char *str)
{
stop();
print(str);
}
void Timer::reset_and_start()
{
reset();
start();
}

View File

@@ -0,0 +1,69 @@
#include "values/DnaDB.hpp"
#include <sql.hpp>
void DnaDB::init(const char * db_name)
{
sql::init();
int res = sql::open(db_name, &db);
constexpr char create_user_table[] = "CREATE TABLE IF NOT EXISTS user_table ( ID INTEGER PRIMARY KEY, USER_ID INTEGER, MAX_GENERATION INTEGER);";
res = sql::exec(db, create_user_table, nullptr, nullptr, nullptr);
}
void DnaDB::deinit()
{
sql::close(db);
sql::shutdown();
}
std::vector<int64_t> DnaDB::getUserIds()
{
constexpr char sql[] = "SELECT USER_ID FROM user_table;";
sqlite3_stmt *stmt;
sql::prepare_v2(db, sql, -1, &stmt, nullptr);
std::vector<int64_t> ids;
while (sql::step(stmt) != SQL_DONE)
{
int64_t id = sql::column_int64(stmt, 0);
ids.push_back(id);
}
sql::finalize(stmt);
return ids;
}
int DnaDB::insertUser(int64_t id, int64_t max_gen){
constexpr char sql[] = "INSERT INTO user_table (USER_ID, MAX_GENERATION) VALUES (?,?);";
sqlite3_stmt *stmt;
sql::prepare_v2(db, sql, -1, &stmt, nullptr);
sql::bind_int64(stmt, 1, id);
sql::bind_int64(stmt, 2, max_gen);
int ret = sql::step(stmt);
sql::finalize(stmt);
return ret;
}
int DnaDB::updateUser(int64_t id, int64_t max_gen){
constexpr char sql[] = "UPDATE user_table SET MAX_GENERATION = ? WHERE USER_ID = ?;";
sqlite3_stmt *stmt;
sql::prepare_v2(db, sql, -1, &stmt, nullptr);
sql::bind_int64(stmt, 1, max_gen);
sql::bind_int64(stmt, 2, id);
int ret = sql::step(stmt);
sql::finalize(stmt);
return ret;
}
void DnaDB::getGenerations()
{
}
void DnaDB::getLikesForGeneration()
{
}
void DnaDB::getVectorForGeneration()
{
}