omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/omigamedev/new_engine

Browse Source
This commit is contained in:
omigamedev
2017-08-11 19:08:15 +01:00
parent 10fecd46b0 c2c046f77e
commit f08fd42a50
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
engine/asset.cpp
View File

@@ -45,11 +45,12 @@ std::vector<std::string> Asset::list_files(std::string folder, bool is_asset, co
} }
#else #else
std::string abs_path = folder;
if (is_asset) if (is_asset)
{ {
NSString* bundle_path = [[NSBundle mainBundle] resourcePath]; NSString* bundle_path = [[NSBundle mainBundle] resourcePath];
std::string base = [bundle_path cStringUsingEncoding : 1]; std::string base = [bundle_path cStringUsingEncoding : 1];
std::string abs_path = base + "/" + folder; abs_path = base + "/" + folder;
} }
DIR *dp; DIR *dp;

2
engine/asset.h
View File

@@ -7,7 +7,7 @@ public:
static AAssetManager* m_am; static AAssetManager* m_am;
AAsset* m_asset = nullptr; AAsset* m_asset = nullptr;
#endif #endif
static std::vector<std::string> Asset::list_files(std::string folder, bool is_asset, const std::string& filter_regex); static std::vector<std::string> list_files(std::string folder, bool is_asset, const std::string& filter_regex);
std::string m_current_path; std::string m_current_path;
FILE* m_fp = nullptr; FILE* m_fp = nullptr;

1
engine/canvas.cpp
View File

@@ -667,6 +667,7 @@ void ui::Canvas::layer_merge(int source_idx, int dest_idx)
ui::ShaderManager::u_int(kShaderUniform::Tex, 0); // dest ui::ShaderManager::u_int(kShaderUniform::Tex, 0); // dest
ui::ShaderManager::u_int(kShaderUniform::TexStroke, 1); // source ui::ShaderManager::u_int(kShaderUniform::TexStroke, 1); // source
ui::ShaderManager::u_float(kShaderUniform::Alpha, 1); ui::ShaderManager::u_float(kShaderUniform::Alpha, 1);
ShaderManager::u_int(kShaderUniform::Lock, false);
ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f)); ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f));
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);