feat: add android support

This commit is contained in:
2021-11-01 15:24:33 +01:00
parent 8f0e0c48ed
commit 0c68512caf
15 changed files with 38 additions and 29 deletions

View File

@@ -5,6 +5,7 @@
#include <map>
#include <unordered_map>
#include <glm/glm.hpp>
#include <array>
#include "Mobs.h"
#include "Team.h"

View File

@@ -14,9 +14,9 @@ private:
public:
WorldClient(ClientGame* game);
virtual void HandlePacket(protocol::WorldBeginDataPacket* packet);
virtual void HandlePacket(protocol::WorldDataPacket* packet);
virtual void HandlePacket(protocol::SpawnMobPacket* packet);
virtual void HandlePacket(protocol::WorldBeginDataPacket* packet) override;
virtual void HandlePacket(protocol::WorldDataPacket* packet) override;
virtual void HandlePacket(protocol::SpawnMobPacket* packet) override;
virtual void OnArrowShot(game::MobPtr target, game::Tower* shooter) override;
};

View File

@@ -1,3 +1,8 @@
#pragma once
#include "glbinding/gl/gl.h"
#ifdef ANDROID
#include <GLES3/gl3.h>
#else
#include "glbinding/gl/gl.h"
using namespace gl;
#endif

View File

@@ -10,10 +10,7 @@
#include <string>
#include <glm/glm.hpp>
namespace gl {
enum class GLenum : unsigned int;
}
#include "render/GL.h"
class ShaderProgram {
public:
@@ -40,8 +37,8 @@ private:
unsigned int programID;
unsigned int vertexShaderID;
unsigned int fragmentShaderID;
int loadShaderFromFile(const std::string& file, gl::GLenum type);
int loadShader(const std::string& source, gl::GLenum type);
int loadShaderFromFile(const std::string& file, GLenum type);
int loadShader(const std::string& source, GLenum type);
};
#endif /* RENDER_SHADERS_SHADERPROGRAM_H_ */