Too much problems
This commit is contained in:
parent
8c8613aca6
commit
303e4105cb
13
renderd7.cpp
13
renderd7.cpp
@ -10,7 +10,7 @@ float animtime;
|
|||||||
bool isndspinit = false;
|
bool isndspinit = false;
|
||||||
bool running = true;
|
bool running = true;
|
||||||
std::stack<std::unique_ptr<RenderD7::Scene>> RenderD7::Scene::scenes;
|
std::stack<std::unique_ptr<RenderD7::Scene>> RenderD7::Scene::scenes;
|
||||||
std::vector<RenderD7::Ovl> overlays;
|
//std::vector<RenderD7::Ovl> overlays;
|
||||||
bool usedbgmsg = false;
|
bool usedbgmsg = false;
|
||||||
std::string dspststus = "Not Initialisized!";
|
std::string dspststus = "Not Initialisized!";
|
||||||
|
|
||||||
@ -864,18 +864,18 @@ bool RenderD7::DrawNFRect(float p1x, float p1y, float w, float h, u32 color, flo
|
|||||||
void RenderD7::FrameEnd()
|
void RenderD7::FrameEnd()
|
||||||
{
|
{
|
||||||
if (metrikd)RenderD7::DrawMetrikOvl();
|
if (metrikd)RenderD7::DrawMetrikOvl();
|
||||||
for (int i = 0; i < (int)overlays.size(); i++)
|
/*for (int i = 0; i < (int)overlays.size(); i++)
|
||||||
{
|
{
|
||||||
overlays[i].Draw();
|
overlays[i].Draw();
|
||||||
}
|
}*/
|
||||||
C3D_FrameEnd(0);
|
C3D_FrameEnd(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void RenderD7::AddOvl(RenderD7::Ovl overlay)
|
/*void RenderD7::AddOvl(RenderD7::Ovl overlay)
|
||||||
{
|
{
|
||||||
overlays.push_back(overlay);
|
overlays.push_back(overlay);
|
||||||
}
|
}*/
|
||||||
/*RenderD7::Console::Console()
|
RenderD7::Console::Console()
|
||||||
{
|
{
|
||||||
this->x = 0;
|
this->x = 0;
|
||||||
this->y = 0;
|
this->y = 0;
|
||||||
@ -925,4 +925,3 @@ bool RenderD7:: Console::Update()
|
|||||||
return dr_sc;
|
return dr_sc;
|
||||||
}
|
}
|
||||||
|
|
||||||
*/
|
|
||||||
|
@ -134,12 +134,12 @@ namespace RenderD7
|
|||||||
//static void HandleOvl();
|
//static void HandleOvl();
|
||||||
};
|
};
|
||||||
|
|
||||||
class Ovl {
|
/*class Ovl {
|
||||||
public:
|
public:
|
||||||
virtual ~Ovl(){}
|
virtual ~Ovl(){}
|
||||||
virtual void Draw() const = 0;
|
virtual void Draw() const = 0;
|
||||||
};
|
};
|
||||||
void AddOvl(RenderD7::Ovl overlay);
|
void AddOvl(RenderD7::Ovl overlay);*/
|
||||||
namespace Color
|
namespace Color
|
||||||
{
|
{
|
||||||
struct rgba
|
struct rgba
|
||||||
@ -282,7 +282,7 @@ namespace RenderD7
|
|||||||
u32 outcol, incol, chcol;
|
u32 outcol, incol, chcol;
|
||||||
};
|
};
|
||||||
void DrawCheckbox(Checkbox box);
|
void DrawCheckbox(Checkbox box);
|
||||||
/*class Console
|
class Console
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Console();
|
Console();
|
||||||
@ -302,7 +302,7 @@ namespace RenderD7
|
|||||||
RenderD7::rgba color = {255, 255, 255, 255};
|
RenderD7::rgba color = {255, 255, 255, 255};
|
||||||
RenderD7::rgba outlinecol = {222, 222, 222, 255};
|
RenderD7::rgba outlinecol = {222, 222, 222, 255};
|
||||||
RenderD7::rgba barcolor = {0, 0, 0, 255};
|
RenderD7::rgba barcolor = {0, 0, 0, 255};
|
||||||
};*/
|
};
|
||||||
|
|
||||||
bool NameIsEndingWith(const std::string &name, const std::vector<std::string> &extensions);
|
bool NameIsEndingWith(const std::string &name, const std::vector<std::string> &extensions);
|
||||||
void GetDirContentsExt(std::vector<RenderD7::DirContent> &dircontent, const std::vector<std::string> &extensions);
|
void GetDirContentsExt(std::vector<RenderD7::DirContent> &dircontent, const std::vector<std::string> &extensions);
|
||||||
|
Loading…
Reference in New Issue
Block a user