salmon-engine-projects/salmon-wallpaper
14
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed day time setting, added wallpaper setting button, other fixes

Browse Source
This commit is contained in:
emil.kabirov committed 2018-11-30 12:00:31 +05:00
1 parent 2c51ab0cc6
commit 15da663864
10 files changed
+74 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

jni/main_code.cpp
+10 -1
View File
@@ -541,14 +541,23 @@ void TAndroidApplication::InnerInit()
Renderer->SetMatrixHeight(800);
}
Renderer->PushPerspectiveProjectionMatrix(pi/6, Renderer->GetMatrixWidth() / Renderer->GetMatrixHeight(), 1.f, 400.f);
Renderer->SetPerspectiveProjectionMatrix(pi/6, Renderer->GetMatrixWidth() / Renderer->GetMatrixHeight(), 1.f, 400.f);
GetConsole() << "Inner init end!\n";
m2.unlock();
}
void TAndroidApplication::InnerReinitGLResources()
{
if (Renderer->GetScreenWidth() < Renderer->GetScreenHeight())
{
Renderer->SetMatrixWidth(480);
Renderer->SetMatrixHeight(800);
}
Renderer->SetPerspectiveProjectionMatrix(pi/6, Renderer->GetMatrixWidth() / Renderer->GetMatrixHeight(), 1.f, 400.f);
}
void TAndroidApplication::InnerDeinit()
{
jni/main_code.h
+7 -6
View File
@@ -13,12 +13,12 @@
#include <GLES/gl.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#endif
//#ifdef TARGET_WIN32
//#define NOMINMAX 1
//#include <Windows.h>
//#undef NOMINMAX
#endif
//#ifdef TARGET_WIN32
//#define NOMINMAX 1
//#include <Windows.h>
//#undef NOMINMAX
//#endif
#include "boost/shared_ptr.hpp"
@@ -62,6 +62,7 @@ public:
TAndroidApplication();
virtual void InnerInit();
void InnerReinitGLResources() override;
virtual void InnerDeinit();