starting the rewrite of forespend.
This commit is contained in:
parent
2b62c95db4
commit
d36dc68f8a
19 changed files with 833 additions and 290 deletions
|
|
@ -1,5 +1,14 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
#include "gr.h"
|
#include "gr.h"
|
||||||
#include "aud.h"
|
#include "aud.h"
|
||||||
#include "program.h"
|
#include "program.h"
|
||||||
#include "scenes/scene.h"
|
#include "scenes/scene.h"
|
||||||
|
enum PLATFORM {
|
||||||
|
WINDOWS,LINUX,MACOS,
|
||||||
|
ANDROID,IOS
|
||||||
|
};
|
||||||
|
extern PLATFORM platform;
|
||||||
|
extern std::string androidpackage;
|
||||||
|
#include "resmgr.h"
|
||||||
|
|
@ -9,3 +9,9 @@ long long calibrate() {
|
||||||
return (__rdtsc() - start) * 10;
|
return (__rdtsc() - start) * 10;
|
||||||
}
|
}
|
||||||
const long long enginend::CPUCLOCK=calibrate();
|
const long long enginend::CPUCLOCK=calibrate();
|
||||||
|
void enginend::program::changescene(scene *scn) {
|
||||||
|
this->currentscene->exit();
|
||||||
|
delete this->currentscene;
|
||||||
|
this->currentscene = scn;
|
||||||
|
this->currentscene->boot();
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,8 @@
|
||||||
#include <immintrin.h>
|
#include <immintrin.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
|
#include "scenes/scene.h"
|
||||||
|
|
||||||
namespace enginend{
|
namespace enginend{
|
||||||
extern const long long CPUCLOCK;
|
extern const long long CPUCLOCK;
|
||||||
inline const char* COMMONCONFIG();
|
inline const char* COMMONCONFIG();
|
||||||
|
|
@ -10,8 +12,10 @@ class program {
|
||||||
unsigned long long currenttick = __rdtsc();
|
unsigned long long currenttick = __rdtsc();
|
||||||
unsigned long long currentframe = __rdtsc();
|
unsigned long long currentframe = __rdtsc();
|
||||||
public:
|
public:
|
||||||
|
scene *currentscene;
|
||||||
int tickrate;
|
int tickrate;
|
||||||
int framerate;
|
int framerate;
|
||||||
|
void changescene(scene*scn);
|
||||||
program():client(false){}
|
program():client(false){}
|
||||||
program(bool isclient):client(isclient){}
|
program(bool isclient):client(isclient){}
|
||||||
virtual const char* CONF()=0;
|
virtual const char* CONF()=0;
|
||||||
|
|
|
||||||
12
engine/src/resmgr.h
Normal file
12
engine/src/resmgr.h
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
#pragma once
|
||||||
|
#include <string>
|
||||||
|
#include "engine.h"
|
||||||
|
inline const char *AT(std::string path) {
|
||||||
|
if (platform==LINUX || platform==WINDOWS || platform==MACOS) {
|
||||||
|
return path.c_str();
|
||||||
|
}else {
|
||||||
|
if (platform==ANDROID) {
|
||||||
|
return ("/data/data/"+androidpackage+"/files/"+path).c_str();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
#include "nodes.h"
|
#include "nodes.h"
|
||||||
|
|
||||||
namespace enginend {
|
namespace enginend {
|
||||||
|
namespace nodes {
|
||||||
struct node2d :public node {
|
struct node2d :public node {
|
||||||
Vector2 pos;
|
Vector2 pos;
|
||||||
node2d(){}
|
node2d(){}
|
||||||
|
|
@ -25,7 +26,54 @@ namespace enginend {
|
||||||
void boot()override{}
|
void boot()override{}
|
||||||
void tick()override{}
|
void tick()override{}
|
||||||
void draw()override{if(texture!=nullptr)DrawTexture(*texture,pos.x,pos.y,WHITE);}
|
void draw()override{if(texture!=nullptr)DrawTexture(*texture,pos.x,pos.y,WHITE);}
|
||||||
void exit()override{}
|
void exit()override{delete texture;}
|
||||||
|
};
|
||||||
|
struct animated : virtual public textured {
|
||||||
|
Image animimage;
|
||||||
|
int frames;
|
||||||
|
int currentframe;
|
||||||
|
int framedelay;
|
||||||
|
int framecounter;
|
||||||
|
unsigned int nextframeoffset;
|
||||||
|
|
||||||
|
animated() : frames(0), currentframe(0), framedelay(6), framecounter(0), nextframeoffset(0) {
|
||||||
|
animimage.data = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
animated(const char* gifpath, Vector2 position, Vector2 size, int delay = 6)
|
||||||
|
: textured(nullptr, position.x, position.y, size.x, size.y),
|
||||||
|
framedelay(delay), currentframe(0), framecounter(0), frames(0), nextframeoffset(0)
|
||||||
|
{
|
||||||
|
animimage = LoadImageAnim(gifpath, &frames);
|
||||||
|
if (frames > 0) {
|
||||||
|
texture = new Texture2D(LoadTextureFromImage(animimage));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void tick() override {
|
||||||
|
textured::tick();
|
||||||
|
if (frames <= 1) return;
|
||||||
|
|
||||||
|
framecounter++;
|
||||||
|
if (framecounter >= framedelay) {
|
||||||
|
framecounter = 0;
|
||||||
|
currentframe++;
|
||||||
|
if (currentframe >= frames) currentframe = 0;
|
||||||
|
nextframeoffset = animimage.width * animimage.height * 4 * currentframe;
|
||||||
|
UpdateTexture(*texture, ((unsigned char*)animimage.data) + nextframeoffset);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void draw() override {
|
||||||
|
textured::draw();
|
||||||
|
}
|
||||||
|
void exit() override {
|
||||||
|
if (animimage.data) UnloadImage(animimage);
|
||||||
|
if (texture) {
|
||||||
|
UnloadTexture(*texture);
|
||||||
|
delete texture;
|
||||||
|
texture = nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
struct colored :virtual public rect{
|
struct colored :virtual public rect{
|
||||||
Color c;
|
Color c;
|
||||||
|
|
@ -281,4 +329,5 @@ namespace enginend {
|
||||||
}
|
}
|
||||||
void exit()override{this->textfield::exit();}
|
void exit()override{this->textfield::exit();}
|
||||||
};
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
362
engine/src/scenes/node2drelative.h
Normal file
362
engine/src/scenes/node2drelative.h
Normal file
|
|
@ -0,0 +1,362 @@
|
||||||
|
#pragma once
|
||||||
|
#pragma once
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#include "nodes.h"
|
||||||
|
|
||||||
|
namespace enginend{
|
||||||
|
namespace nodes{
|
||||||
|
namespace relative {
|
||||||
|
struct node2d :public node {
|
||||||
|
double x;
|
||||||
|
double y;
|
||||||
|
double w;
|
||||||
|
double h;
|
||||||
|
node2d(){x=0;y=0;w=0;h=0;}
|
||||||
|
node2d(double x,double y,double w=0,double h=0):x(x),y(y),w(w),h(h){}
|
||||||
|
};
|
||||||
|
struct rect :virtual public node2d{
|
||||||
|
rect(){}
|
||||||
|
rect(double x,double y,double w,double h):node2d(x,y,w,h){}
|
||||||
|
};
|
||||||
|
struct textured :virtual public rect{
|
||||||
|
Texture2D* texture;
|
||||||
|
textured(){texture=nullptr;}
|
||||||
|
textured(Texture2D* texture,double x,double y,double w,double h):texture(texture),rect(x,y,w,h){}
|
||||||
|
void draw()override{
|
||||||
|
if(texture==nullptr)return;
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
float ax=x*sw;
|
||||||
|
float ay=y*sh;
|
||||||
|
float aw=w*sw;
|
||||||
|
float ah=h*sh;
|
||||||
|
DrawTexturePro(*texture,{0,0,(float)texture->width,(float)texture->height},{ax,ay,aw,ah},{0,0},0,WHITE);
|
||||||
|
}
|
||||||
|
void exit()override {
|
||||||
|
UnloadTexture(*texture);
|
||||||
|
delete texture;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
struct animated :virtual public textured{
|
||||||
|
Image animimage;
|
||||||
|
int frames;
|
||||||
|
int currentframe;
|
||||||
|
int framedelay;
|
||||||
|
int framecounter;
|
||||||
|
unsigned int nextframeoffset;
|
||||||
|
animated():frames(0),currentframe(0),framedelay(6),framecounter(0),nextframeoffset(0){
|
||||||
|
animimage.data=nullptr;
|
||||||
|
}
|
||||||
|
void boot()override{}
|
||||||
|
animated(const char* gifpath,double x,double y,double w,double h,int delay=6):
|
||||||
|
textured(nullptr,x,y,w,h),framedelay(delay),currentframe(0),framecounter(0),frames(0),nextframeoffset(0)
|
||||||
|
{
|
||||||
|
animimage=LoadImageAnim(gifpath,&frames);
|
||||||
|
if(frames>0){
|
||||||
|
texture=new Texture2D(LoadTextureFromImage(animimage));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void tick()override{
|
||||||
|
if(frames<=1)return;
|
||||||
|
framecounter++;
|
||||||
|
if(framecounter>=framedelay){
|
||||||
|
framecounter=0;
|
||||||
|
currentframe++;
|
||||||
|
if(currentframe>=frames)currentframe=0;
|
||||||
|
nextframeoffset=animimage.width*animimage.height*4*currentframe;
|
||||||
|
UpdateTexture(*texture,((unsigned char*)animimage.data)+nextframeoffset);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void draw()override {
|
||||||
|
textured::draw();
|
||||||
|
}
|
||||||
|
void exit(){
|
||||||
|
if(animimage.data)UnloadImage(animimage);
|
||||||
|
textured::exit();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
struct colored :virtual public rect{
|
||||||
|
Color c;
|
||||||
|
colored(){}
|
||||||
|
colored(Color color,double x,double y,double w,double h):c(color),rect(x,y,w,h){}
|
||||||
|
void draw()override{
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
float ax=x*sw;
|
||||||
|
float ay=y*sh;
|
||||||
|
float aw=w*sw;
|
||||||
|
float ah=h*sh;
|
||||||
|
DrawRectangle(ax,ay,aw,ah,c);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
struct tinted :virtual public colored,virtual public textured{
|
||||||
|
tinted(){}
|
||||||
|
tinted(Texture2D* texture,Color color,double x,double y,double w,double h):
|
||||||
|
node2d(x,y,w,h),
|
||||||
|
rect(x,y,w,h),
|
||||||
|
colored(color,x,y,w,h),
|
||||||
|
textured(texture,x,y,w,h)
|
||||||
|
{}
|
||||||
|
void draw()override{
|
||||||
|
if(texture==nullptr)return;
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
float ax=x*sw;
|
||||||
|
float ay=y*sh;
|
||||||
|
float aw=w*sw;
|
||||||
|
float ah=h*sh;
|
||||||
|
DrawTexturePro(*texture,{0,0,(float)texture->width,(float)texture->height},{ax,ay,aw,ah},{0,0},0,c);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
struct text :public tinted {
|
||||||
|
protected:
|
||||||
|
std::string result;
|
||||||
|
public:
|
||||||
|
Font font;
|
||||||
|
float fs;
|
||||||
|
Color txc;
|
||||||
|
std::string content;
|
||||||
|
text(){fs=20;}
|
||||||
|
text(Texture2D* texture,Color txcol,Color color,double x,double y,double w,double h,Font f,float fsize,std::string txt):
|
||||||
|
tinted(texture,color,x,y,w,h),
|
||||||
|
font(f),fs(fsize),content(txt),txc(txcol)
|
||||||
|
{
|
||||||
|
result=content;
|
||||||
|
size_t initp=0;
|
||||||
|
while((initp=result.find("\n",initp))!=std::string::npos){
|
||||||
|
result.replace(initp,1,"\\n");
|
||||||
|
initp+=2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void tick()override {
|
||||||
|
tinted::tick();
|
||||||
|
if(result!=content){
|
||||||
|
result=content;
|
||||||
|
size_t initp=0;
|
||||||
|
while((initp=result.find("\n",initp))!=std::string::npos){
|
||||||
|
result.replace(initp,1,"\\n");
|
||||||
|
initp+=2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void draw()override {
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
float ax=x*sw;
|
||||||
|
float ay=y*sh;
|
||||||
|
float aw=w*sw;
|
||||||
|
float ah=h*sh;
|
||||||
|
Vector2 minsize=MeasureTextEx(font,content.c_str(),fs,1);
|
||||||
|
Vector2 charsize=MeasureTextEx(font," ",fs,1);
|
||||||
|
float p=charsize.x>charsize.y?charsize.x/minsize.x:charsize.y/minsize.y;
|
||||||
|
p=p*2;
|
||||||
|
int minh=(minsize.y>ah)?minsize.y:ah;
|
||||||
|
int minw=(minsize.x>aw)?minsize.x:aw;
|
||||||
|
DrawRectangle(ax-charsize.x,ay-charsize.y,minw+p,minh+p,c);
|
||||||
|
DrawTextEx(font,content.c_str(),{ax,ay},fs,1,txc);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
struct button :virtual public tinted{
|
||||||
|
void(*func)();
|
||||||
|
bool pressed;
|
||||||
|
bool hover;
|
||||||
|
button():func(nullptr),pressed(false){}
|
||||||
|
button(Texture2D* texture,Color color,double x,double y,double w,double h,void(*f)()):func(f),pressed(false),tinted(texture,color,x,y,w,h){}
|
||||||
|
void tick()override{
|
||||||
|
tinted::tick();
|
||||||
|
Vector2 mouse=GetMousePosition();
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
Rectangle r={float(x*sw),float(y*sh),float(w*sw),float(h*sh)};
|
||||||
|
if(CheckCollisionPointRec(mouse,r)){hover=true;
|
||||||
|
if(IsMouseButtonPressed(MOUSE_LEFT_BUTTON)){
|
||||||
|
pressed=true;
|
||||||
|
if(func)func();
|
||||||
|
}else{
|
||||||
|
pressed=false;
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
hover=false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void draw()override {
|
||||||
|
tinted::draw();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
struct labeledbutton :virtual public button {
|
||||||
|
std::string label;
|
||||||
|
Font font;
|
||||||
|
int fs;
|
||||||
|
Color txc;
|
||||||
|
labeledbutton(std::string name,Texture2D* texture,Color color,Color text,
|
||||||
|
double x,double y,double w,double h,void(*f)(),
|
||||||
|
Font fnt,int size):font(fnt),fs(size),txc(text),label(name),
|
||||||
|
button(texture,color,x,y,w,h,f)
|
||||||
|
{}
|
||||||
|
void draw()override{
|
||||||
|
button::draw();
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
float ax=x*sw;
|
||||||
|
float ay=y*sh;
|
||||||
|
float aw=w*sw;
|
||||||
|
float ah=h*sh;
|
||||||
|
Vector2 tsize=MeasureTextEx(font,label.c_str(),fs,1);
|
||||||
|
Vector2 tpos={
|
||||||
|
ax+(aw-tsize.x)/2,
|
||||||
|
ay+(ah-tsize.y)/2
|
||||||
|
};
|
||||||
|
DrawTextEx(font,label.c_str(),tpos,fs,1,txc);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
struct slider :virtual public tinted{
|
||||||
|
float val;
|
||||||
|
float minv;
|
||||||
|
float maxv;
|
||||||
|
slider():val(0),minv(0),maxv(1){}
|
||||||
|
slider(Texture2D* texture,Color color,double x,double y,double w,double h,float min,float max,float v):val(v),minv(min),maxv(max),tinted(texture,color,x,y,w,h){}
|
||||||
|
void tick()override{
|
||||||
|
tinted::tick();
|
||||||
|
Vector2 mouse=GetMousePosition();
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
Rectangle r={float(x*sw),float(y*sh),float(w*sw),float(h*sh)};
|
||||||
|
if(CheckCollisionPointRec(mouse,r)&&IsMouseButtonDown(MOUSE_LEFT_BUTTON)){
|
||||||
|
float t=(mouse.x-(x*sw))/(w*sw);
|
||||||
|
val=minv+t*(maxv-minv);
|
||||||
|
if(val<minv)val=minv;
|
||||||
|
if(val>maxv)val=maxv;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void draw()override{
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
float ax=x*sw;
|
||||||
|
float ay=y*sh;
|
||||||
|
float aw=w*sw;
|
||||||
|
float ah=h*sh;
|
||||||
|
DrawRectangle(ax,ay,aw,ah,DARKGRAY);
|
||||||
|
float t=(val-minv)/(maxv-minv);
|
||||||
|
DrawRectangle(ax,ay,aw*t,ah,c);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
struct textfield :public text{
|
||||||
|
textfield(){}
|
||||||
|
textfield(Texture2D* texture,Color txcol,Color color,double x,double y,double w,double h,Font f,float fsize,std::string txt):
|
||||||
|
text(texture,txcol,color,x,y,w,h,f,fsize,txt){}
|
||||||
|
void draw()override{
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
float ax=x*sw;
|
||||||
|
float ay=y*sh;
|
||||||
|
float aw=w*sw;
|
||||||
|
float ah=h*sh;
|
||||||
|
Vector2 charsize=MeasureTextEx(font," ",fs,0);
|
||||||
|
Vector2 minsize=MeasureTextEx(font,content.c_str(),fs,charsize.x/2);
|
||||||
|
float po=charsize.x>charsize.y?charsize.x/charsize.y:charsize.y/charsize.x;po=po*5;
|
||||||
|
int minh=(minsize.y>ah)?minsize.y:ah;
|
||||||
|
int minw=(minsize.x>aw)?minsize.x:aw;
|
||||||
|
DrawRectangle(ax-(po/2),ay-(po/2),minw+(po*1.1),minh+(po*1.1),c);
|
||||||
|
DrawTextEx(font,content.c_str(),{ax,ay},fs,charsize.x/2,txc);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
struct textinput :public text{
|
||||||
|
bool active;
|
||||||
|
int cpos;
|
||||||
|
textinput():active(false),cpos(0){}
|
||||||
|
textinput(Texture2D* texture,Color txcol,Color color,double x,double y,double w,double h,Font f,float fsize):active(false),cpos(0),
|
||||||
|
text(texture,txcol,color,x,y,w,h,f,fsize,""){}
|
||||||
|
void tick()override{
|
||||||
|
text::tick();
|
||||||
|
Vector2 mouse=GetMousePosition();
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
Rectangle r={float(x*sw),float(y*sh),float(w*sw),float(h*sh)};
|
||||||
|
if(IsMouseButtonPressed(MOUSE_LEFT_BUTTON)){
|
||||||
|
active=CheckCollisionPointRec(mouse,r);
|
||||||
|
}
|
||||||
|
if(active){
|
||||||
|
int key=GetCharPressed();
|
||||||
|
while(key>0){
|
||||||
|
if(key>=32&&key<=125){
|
||||||
|
content+=static_cast<char>(key);
|
||||||
|
cpos++;
|
||||||
|
}
|
||||||
|
key=GetCharPressed();
|
||||||
|
}
|
||||||
|
if(IsKeyPressed(KEY_BACKSPACE)&&content.length()>0){
|
||||||
|
content.pop_back();
|
||||||
|
cpos--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void draw()override{
|
||||||
|
text::draw();
|
||||||
|
if(active){
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
float ax=x*sw;
|
||||||
|
float ay=y*sh;
|
||||||
|
DrawRectangle(ax+MeasureTextEx(font,content.c_str(),fs,1).x,ay,2,fs,{0,0,0,127});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
struct textinputfield :public textfield{
|
||||||
|
bool active;
|
||||||
|
int cpos;
|
||||||
|
textinputfield():active(false),cpos(0){}
|
||||||
|
textinputfield(Texture2D* texture,Color txcol,Color color,double x,double y,double w,double h,Font f,float fsize):active(false),cpos(0),
|
||||||
|
textfield(texture,txcol,color,x,y,w,h,f,fsize,""){}
|
||||||
|
void tick()override{
|
||||||
|
textfield::tick();
|
||||||
|
Vector2 mouse=GetMousePosition();
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
Rectangle r={float(x*sw),float(y*sh),float(w*sw),float(h*sh)};
|
||||||
|
if(IsMouseButtonPressed(MOUSE_LEFT_BUTTON)){
|
||||||
|
active=CheckCollisionPointRec(mouse,r);
|
||||||
|
}
|
||||||
|
if(active){
|
||||||
|
int key=GetCharPressed();
|
||||||
|
while(key>0){
|
||||||
|
if(key>=32&&key<=125){
|
||||||
|
content+=static_cast<char>(key);
|
||||||
|
cpos++;
|
||||||
|
}
|
||||||
|
key=GetCharPressed();
|
||||||
|
}
|
||||||
|
if(IsKeyPressed(KEY_BACKSPACE)&&content.length()>0){
|
||||||
|
content.pop_back();
|
||||||
|
cpos--;
|
||||||
|
}
|
||||||
|
if(IsKeyPressed(KEY_ENTER)){
|
||||||
|
content+='\n';
|
||||||
|
cpos++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void draw()override{
|
||||||
|
textfield::draw();
|
||||||
|
if(active){
|
||||||
|
float sw=GetScreenWidth();
|
||||||
|
float sh=GetScreenHeight();
|
||||||
|
float ax=x*sw;
|
||||||
|
float ay=y*sh;
|
||||||
|
float lh=fs+2;
|
||||||
|
Vector2 p={ax,ay};
|
||||||
|
std::string line="";
|
||||||
|
for(char ch:content){
|
||||||
|
if(ch=='\n'){
|
||||||
|
p.y+=lh;
|
||||||
|
line="";
|
||||||
|
}else{
|
||||||
|
line+=ch;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
DrawRectangle(p.x+MeasureTextEx(font,line.c_str(),fs,1).x,p.y,2,fs,BLACK);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
|
@ -4,7 +4,8 @@
|
||||||
#include "../net.h"
|
#include "../net.h"
|
||||||
#include<tiny/term.h>
|
#include<tiny/term.h>
|
||||||
|
|
||||||
namespace enginend {
|
namespace enginend {
|
||||||
|
namespace nodes {
|
||||||
struct node{
|
struct node{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
|
@ -13,4 +14,5 @@ namespace enginend {
|
||||||
virtual void draw()=0;
|
virtual void draw()=0;
|
||||||
virtual void exit()=0;
|
virtual void exit()=0;
|
||||||
};
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,14 +1,16 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
#include "nodes.h"
|
#include "nodes.h"
|
||||||
#include <list>
|
#include <list>
|
||||||
|
|
||||||
|
|
||||||
namespace enginend {
|
namespace enginend {
|
||||||
struct scene{
|
struct scene{
|
||||||
std::list<enginend::node*> nodes;
|
std::list<enginend::nodes::node*> nodes;
|
||||||
virtual void boot() {
|
virtual void boot() {
|
||||||
int i=0;
|
int i=0;
|
||||||
tiny::echo((char*)"initializing scene");
|
tiny::echo((char*)"initializing scene");
|
||||||
for (enginend::node* n : nodes) {
|
for (enginend::nodes::node* n : nodes) {
|
||||||
tiny::echo((char*)"initializing object of ID: %i",i++);
|
tiny::echo((char*)"initializing object of ID: %i",i++);
|
||||||
n->boot();
|
n->boot();
|
||||||
}
|
}
|
||||||
|
|
@ -17,18 +19,18 @@ namespace enginend {
|
||||||
|
|
||||||
ClearBackground(BLANK);
|
ClearBackground(BLANK);
|
||||||
BeginDrawing();
|
BeginDrawing();
|
||||||
for (enginend::node* n : nodes) {
|
for (enginend::nodes::node* n : nodes) {
|
||||||
n->draw();
|
n->draw();
|
||||||
}
|
}
|
||||||
EndDrawing();
|
EndDrawing();
|
||||||
}
|
}
|
||||||
virtual void tick() {
|
virtual void tick() {
|
||||||
for (enginend::node* n : nodes) {
|
for (enginend::nodes::node* n : nodes) {
|
||||||
n->tick();
|
n->tick();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
virtual void exit() {
|
virtual void exit() {
|
||||||
for (enginend::node* n : nodes) {
|
for (enginend::nodes::node* n : nodes) {
|
||||||
n->exit();
|
n->exit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,10 +14,10 @@ public:
|
||||||
InitWindow(500,500,"test");
|
InitWindow(500,500,"test");
|
||||||
SetTargetFPS(GetMonitorRefreshRate(GetCurrentMonitor()));
|
SetTargetFPS(GetMonitorRefreshRate(GetCurrentMonitor()));
|
||||||
this->tickrate=GetMonitorRefreshRate(GetCurrentMonitor());
|
this->tickrate=GetMonitorRefreshRate(GetCurrentMonitor());
|
||||||
s.nodes=std::list<node*>{
|
s.nodes=std::list<nodes::node*>{
|
||||||
|
|
||||||
new colored(Color{255,255,255,255},0,0,500,500),
|
new nodes::colored(Color{255,255,255,255},0,0,500,500),
|
||||||
new textfield(nullptr,Color{255,127,127,255},Color{127,127,127,255}
|
new nodes::textfield(nullptr,Color{255,127,127,255},Color{127,127,127,255}
|
||||||
,100,100,220,32,GetFontDefault(),32,
|
,100,100,220,32,GetFontDefault(),32,
|
||||||
"welcome to enginend!\n"
|
"welcome to enginend!\n"
|
||||||
"hehe"
|
"hehe"
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
|
||||||
using namespace enginend;
|
using namespace enginend;
|
||||||
|
using namespace enginend::nodes;
|
||||||
netio nete{};
|
netio nete{};
|
||||||
/*
|
/*
|
||||||
|
|
||||||
|
|
@ -111,7 +111,6 @@ public:
|
||||||
Texture2D buttonslabel[8];
|
Texture2D buttonslabel[8];
|
||||||
Font gamename,changelog,information;
|
Font gamename,changelog,information;
|
||||||
bool vsync=true;
|
bool vsync=true;
|
||||||
scene s;
|
|
||||||
RenderTexture2D target;
|
RenderTexture2D target;
|
||||||
text version;
|
text version;
|
||||||
std::string selectedversion="";
|
std::string selectedversion="";
|
||||||
|
|
@ -169,7 +168,7 @@ public:
|
||||||
playbtn[0]=LoadTexture("res/playoff.png");
|
playbtn[0]=LoadTexture("res/playoff.png");
|
||||||
playbtn[1]=LoadTexture("res/playon.png");
|
playbtn[1]=LoadTexture("res/playon.png");
|
||||||
playbutton= new button(&playbtn[0], {255,255,255,255},406,(18*11)+17+9,153,59,std::function<void()>(playbuttonfunc));
|
playbutton= new button(&playbtn[0], {255,255,255,255},406,(18*11)+17+9,153,59,std::function<void()>(playbuttonfunc));
|
||||||
s.nodes=std::list<node*>{
|
currentscene->nodes=std::list<node*>{
|
||||||
new background(&bg,0,0,600,300),
|
new background(&bg,0,0,600,300),
|
||||||
new textured(&buttonfore,3,36,62,62),
|
new textured(&buttonfore,3,36,62,62),
|
||||||
new textured(&buttonlock,3,36+((62+4)*1),62,62),
|
new textured(&buttonlock,3,36+((62+4)*1),62,62),
|
||||||
|
|
@ -189,7 +188,7 @@ public:
|
||||||
new text(nullptr,Color{255,255,255,255},Color{0,0,0,0},96+16,(16*14)-3,1,1,information,20,"downloaded verified"),
|
new text(nullptr,Color{255,255,255,255},Color{0,0,0,0},96+16,(16*14)-3,1,1,information,20,"downloaded verified"),
|
||||||
&version,
|
&version,
|
||||||
};
|
};
|
||||||
s.boot();
|
currentscene->boot();
|
||||||
}
|
}
|
||||||
int buttondelay=0;
|
int buttondelay=0;
|
||||||
void tick() override {
|
void tick() override {
|
||||||
|
|
@ -234,14 +233,14 @@ public:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
s.tick();
|
currentscene->tick();
|
||||||
buttondelay--;
|
buttondelay--;
|
||||||
}
|
}
|
||||||
bool changedmenu=true;
|
bool changedmenu=true;
|
||||||
bool itemchanged=true;
|
bool itemchanged=true;
|
||||||
void draw() override {
|
void draw() override {
|
||||||
BeginTextureMode(target);
|
BeginTextureMode(target);
|
||||||
s.draw();
|
currentscene->draw();
|
||||||
EndTextureMode();
|
EndTextureMode();
|
||||||
BeginDrawing();
|
BeginDrawing();
|
||||||
ClearBackground(BLANK);
|
ClearBackground(BLANK);
|
||||||
|
|
@ -267,7 +266,7 @@ public:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void exit() override {
|
void exit() override {
|
||||||
s.exit();
|
currentscene->exit();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,35 @@
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
client::client(){}
|
|
||||||
void client::boot() {}
|
#include "scenes/mainmenu.h"
|
||||||
void client::draw() {}
|
|
||||||
void client::exit() {}
|
client::client() {
|
||||||
void client::tick() {}
|
|
||||||
|
}
|
||||||
|
void client::boot() {
|
||||||
|
this->framerate=60;
|
||||||
|
this->tickrate=20;
|
||||||
|
InitWindow(380,240,"forespend - 0.03h");
|
||||||
|
// SetConfigFlags();
|
||||||
|
this->currentscene=new mainmenu();
|
||||||
|
this->currentscene->boot();
|
||||||
|
target=LoadRenderTexture(380,240);
|
||||||
|
}
|
||||||
|
void client::draw() {
|
||||||
|
BeginTextureMode(target);
|
||||||
|
this->currentscene->draw();
|
||||||
|
EndTextureMode();
|
||||||
|
BeginDrawing();
|
||||||
|
ClearBackground(WHITE);
|
||||||
|
DrawTexturePro(target.texture, {0, 0, 380,240}, {0, 0, (float)GetScreenWidth(), (float)GetScreenHeight()}, {0, 0}, 0, WHITE);
|
||||||
|
EndDrawing();
|
||||||
|
}
|
||||||
|
void client::exit() {
|
||||||
|
this->currentscene->exit();
|
||||||
|
delete this->currentscene;
|
||||||
|
}
|
||||||
|
void client::tick() {
|
||||||
|
this->currentscene->tick();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <incmgr.h>
|
#include <incmgr.h>
|
||||||
|
|
||||||
class client :public program{
|
class client :public enginend::program{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
RenderTexture2D target;
|
||||||
const char* CONF() final{return "client.tdf";}
|
const char* CONF() final{return "client.tdf";}
|
||||||
client();
|
client();
|
||||||
void boot() override;
|
void boot() override;
|
||||||
|
|
|
||||||
1
games/forespend/src/client/scenes/game.cpp
Normal file
1
games/forespend/src/client/scenes/game.cpp
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
#include "game.h"
|
||||||
7
games/forespend/src/client/scenes/game.h
Normal file
7
games/forespend/src/client/scenes/game.h
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
#pragma once
|
||||||
|
#include <incmgr.h>
|
||||||
|
|
||||||
|
|
||||||
|
class game :public virtual enginend::scene {
|
||||||
|
|
||||||
|
};
|
||||||
|
|
@ -1,6 +1,22 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <incmgr.h>
|
#include <incmgr.h>
|
||||||
|
#include <enginend/scenes/node2drelative.h>
|
||||||
|
|
||||||
class mainmenu :public virtual scene{
|
class mainmenu :public virtual enginend::scene{
|
||||||
|
public:
|
||||||
|
void boot() override {
|
||||||
|
this->nodes=std::list<enginend::nodes::node*>{
|
||||||
|
new enginend::nodes::relative::animated(AT("res/images/sky.gif"),0,0,10,10,5)
|
||||||
|
};
|
||||||
|
enginend::scene::boot();
|
||||||
|
}
|
||||||
|
void tick() override {
|
||||||
|
enginend::scene::tick();
|
||||||
|
}
|
||||||
|
void draw() override {
|
||||||
|
enginend::scene::draw();
|
||||||
|
}
|
||||||
|
void exit() override {
|
||||||
|
enginend::scene::exit();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,57 @@
|
||||||
|
#include <atomic>
|
||||||
#include <incmgr.h>
|
#include <incmgr.h>
|
||||||
|
#include <thread>
|
||||||
|
|
||||||
|
#include "server/server.h"
|
||||||
|
#include "client/client.h"
|
||||||
|
PLATFORM platform=LINUX;
|
||||||
|
std::string androidpackage="kn.kinfuyuki.forespend";
|
||||||
inline const char* COMMONCONFIG(){return "common.tdf";}
|
inline const char* COMMONCONFIG(){return "common.tdf";}
|
||||||
tiny::ErrorLevel tiny::level{6};
|
tiny::ErrorLevel tiny::level{6};
|
||||||
|
|
||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
|
enginend::program* game;
|
||||||
tiny::startup("forespend","0.03g-rewrite");
|
tiny::startup("forespend","0.03g-rewrite");
|
||||||
|
bool isserver = false;
|
||||||
if (argc>1) {
|
if (argc>1) {
|
||||||
|
for (int i=1;i<argc;i++) {
|
||||||
|
if (argv[i]=="server") {
|
||||||
|
isserver = true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (isserver) game = new server();else game = new client();
|
||||||
|
game->boot();
|
||||||
|
std::atomic<bool> running{true};
|
||||||
|
std::thread tickthread([game, &running]() {
|
||||||
|
double tickrate=1.0/game->tickrate;
|
||||||
|
auto lasttick=std::chrono::high_resolution_clock::now();
|
||||||
|
|
||||||
|
while (running) {
|
||||||
|
auto now=std::chrono::high_resolution_clock::now();
|
||||||
|
double elapsed=std::chrono::duration_cast<std::chrono::duration<double>>(now-lasttick).count();
|
||||||
|
|
||||||
|
if (elapsed>=tickrate) {
|
||||||
|
game->tick();
|
||||||
|
lasttick=now;
|
||||||
|
} else {
|
||||||
|
std::this_thread::sleep_for(std::chrono::duration<double>(tickrate-elapsed));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
double framerate=1.0/game->framerate;
|
||||||
|
auto lastframe=std::chrono::high_resolution_clock::now();
|
||||||
|
while (!WindowShouldClose()) {
|
||||||
|
auto now=std::chrono::high_resolution_clock::now();
|
||||||
|
double elapsed=std::chrono::duration_cast<std::chrono::duration<double>>(now-lastframe).count();
|
||||||
|
|
||||||
|
if (elapsed>=framerate) {
|
||||||
|
game->draw();
|
||||||
|
lastframe=now;
|
||||||
|
} else {
|
||||||
|
WaitTime(framerate-elapsed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
game->exit();
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#include <incmgr.h>
|
#include <incmgr.h>
|
||||||
|
|
||||||
class server : public program{
|
class server : public enginend::program{
|
||||||
public:
|
public:
|
||||||
server();
|
server();
|
||||||
const char* CONF() final{return "client.tdf";}
|
const char* CONF() final{return "client.tdf";}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
#pragma once
|
||||||
#include <tiny/tdf.h>
|
#include <tiny/tdf.h>
|
||||||
#include <tiny/term.h>
|
#include <tiny/term.h>
|
||||||
#include <raylib.h>
|
#include <raylib.h>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue