Fixed Windows build errors
This commit is contained in:
parent
55538d3b02
commit
7fe2a057c6
@ -106,7 +106,7 @@ ImageData* _png_load(const char* file){
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
|
|
||||||
int _png_load(const char* file){
|
ImageData* _png_load(const char* file){
|
||||||
int r = 0;
|
int r = 0;
|
||||||
FILE *png;
|
FILE *png;
|
||||||
char *pngbuf = nullptr;
|
char *pngbuf = nullptr;
|
||||||
@ -198,7 +198,6 @@ int _png_load(const char* file){
|
|||||||
|
|
||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ImageData* png::load_image(std::string filename) {
|
ImageData* png::load_image(std::string filename) {
|
||||||
|
|||||||
@ -3,6 +3,7 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
|
#define GLEW_STATIC
|
||||||
|
|
||||||
#include "audio/Audio.h"
|
#include "audio/Audio.h"
|
||||||
#include "assets/Assets.h"
|
#include "assets/Assets.h"
|
||||||
|
|||||||
@ -76,7 +76,9 @@ HudRenderer::HudRenderer(GUI* gui, Level* level, Assets* assets) : level(level),
|
|||||||
Panel* sub = new Panel(vec2(10, 27), vec4(0.0f));
|
Panel* sub = new Panel(vec2(10, 27), vec4(0.0f));
|
||||||
sub->orientation(Orientation::horizontal);
|
sub->orientation(Orientation::horizontal);
|
||||||
|
|
||||||
Label* label = new Label(wstring({L'x'+ax})+L": ");
|
wstring str = L"x: ";
|
||||||
|
str[0] += ax;
|
||||||
|
Label* label = new Label(str);
|
||||||
label->margin(vec4(2, 3, 2, 3));
|
label->margin(vec4(2, 3, 2, 3));
|
||||||
sub->add(shared_ptr<UINode>(label));
|
sub->add(shared_ptr<UINode>(label));
|
||||||
sub->color(vec4(0.0f));
|
sub->color(vec4(0.0f));
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
#define GRAPHICS_TEXTURE_H_
|
#define GRAPHICS_TEXTURE_H_
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include "../typedefs.h"
|
||||||
|
|
||||||
class ImageData;
|
class ImageData;
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,6 @@
|
|||||||
#include "Window.h"
|
#include "Window.h"
|
||||||
#include "Events.h"
|
#include "Events.h"
|
||||||
|
|
||||||
#define GLEW_STATIC
|
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
#include <GLFW/glfw3.h>
|
#include <GLFW/glfw3.h>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user