LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaned code, added pinch gesture detector, better opengl context handling, fixed issues

Browse Source 
Change-Id: I26a28374ae74391204586b4584d03cf0c58772c2
This commit is contained in:
Hak Matsuda
2013-09-26 20:58:00 -07:00
committed by Andrew Hsieh
parent 122d194b36
commit 5d1c91fb75
55 changed files with 6544 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ndk/platforms/android-17/samples/Teapot/jni/TeapotRenderer.cpp
View File

@@ -85,6 +85,15 @@ void TeapotRenderer::init()
delete[] p;
updateViewport();
_mModel = mat4::translation(0, 0, -15.f);
mat4 mat = mat4::rotationX(M_PI / 3);
_mModel = mat * _mModel;
}
void TeapotRenderer::updateViewport()
{
//Init Projection matrices
int32_t viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
@@ -95,10 +104,6 @@ void TeapotRenderer::init()
bool bRotate = false;
_mProjection = mat4::perspective(fAspect, 1.f,
CAM_NEAR, CAM_FAR);
_mModel = mat4::translation(0, 0, -15.f);
mat4 mat = mat4::rotationX(M_PI / 3);
_mModel = mat * _mModel;
}
void TeapotRenderer::unload()