vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

XashActivity: revert 59411a2

Browse source
This commit is contained in:
Alibek Omarov 2019-12-23 05:48:30 +03:00
parent b9028879fb
commit d5d3c6868e
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
android/src/su/xash/engine/XashActivity.java
View file

@ -1082,6 +1082,9 @@ class EngineSurface extends SurfaceView implements SurfaceHolder.Callback, View.
private EGLDisplay mEGLDisplay; private EGLDisplay mEGLDisplay;
private EGL10 mEGL; private EGL10 mEGL;
private EGLConfig mEGLConfig; private EGLConfig mEGLConfig;
private boolean resizing = false;
// Sensors
// Startup // Startup
public EngineSurface( Context context ) public EngineSurface( Context context )
@ -1123,48 +1126,45 @@ class EngineSurface extends SurfaceView implements SurfaceHolder.Callback, View.
XashActivity.nativeSetPause(1); XashActivity.nativeSetPause(1);
} }
private boolean resizing = false;
// Called when the surface is resized // Called when the surface is resized
public void surfaceChanged( SurfaceHolder holder, int format, int width, int height ) public void surfaceChanged( SurfaceHolder holder, int format, int width, int height )
{ {
Log.v( TAG, "surfaceChanged()" ); Log.v( TAG, "surfaceChanged()" );
int newWidth = 0, newHeight = 0; if( ( XashActivity.mForceHeight!= 0 && XashActivity.mForceWidth!= 0 || XashActivity.mScale != 0 ) && !resizing )
if( XashActivity.mForceHeight != 0 && XashActivity.mForceWidth != 0 )
{ {
newWidth = XashActivity.mForceWidth; int newWidth, newHeight;
newHeight = XashActivity.mForceHeight; resizing = true;
XashActivity.mTouchScaleX = (float)newWidth / width; if( XashActivity.mForceHeight != 0 && XashActivity.mForceWidth != 0 )
XashActivity.mTouchScaleY = (float)newHeight / height; {
newWidth = XashActivity.mForceWidth;
newHeight = XashActivity.mForceHeight;
}
else
{
newWidth = ( int )( getWidth() / XashActivity.mScale );
newHeight = ( int )( getHeight() / XashActivity.mScale );
}
holder.setFixedSize( newWidth, newHeight ); holder.setFixedSize( newWidth, newHeight );
XashActivity.mTouchScaleX = ( float )newWidth / getWidth();
XashActivity.mTouchScaleY = ( float )newHeight / getHeight();
width = newWidth;
height = newHeight;
} }
else if( XashActivity.mScale != 0 )
{
newWidth = ( int )( width / XashActivity.mScale );
newHeight = ( int )( height / XashActivity.mScale );
XashActivity.mTouchScaleX = XashActivity.mTouchScaleY = 1 / XashActivity.mScale;
}
else
{
newWidth = width;
newWidth = height;
XashActivity.mTouchScaleX = XashActivity.mTouchScaleY = 1.0f;
}
// Android may force only-landscape app to portait during lock // Android may force only-landscape app to portait during lock
// Just don't notify engine in that case // Just don't notify engine in that case
if( newWidth > newHeight ) if( width > height )
XashActivity.onNativeResize( newWidth, newHeight ); XashActivity.onNativeResize( width, height );
// holder.setFixedSize( width / 2, height / 2 ); // holder.setFixedSize( width / 2, height / 2 );
// Now start up the C app thread // Now start up the C app thread
if( mEngThread == null ) if( mEngThread == null )
{ {
mEngThread = new Thread( new XashMain(), "EngineThread" ); mEngThread = new Thread( new XashMain(), "EngineThread" );
mEngThread.start(); mEngThread.start();
} }
resizing = false;
} }
public void engineThreadJoin() public void engineThreadJoin()