ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port: 

- Remove some test code that accidentally snuck into r4423.
This commit is contained in:
rogerman 2012-12-08 01:18:13 +00:00
parent e841a8aa1a
commit 8dd727fc01
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
desmume/src/cocoa/userinterface/displayView.mm
View File

@ -78,7 +78,6 @@ CGLContextObj OSXOpenGLRendererContext = NULL;
spinlockDisplayOrder = OS_SPINLOCK_INIT;
normalSize = NSMakeSize(GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT * 2.0);
comboScreenGap = (normalSize.height/2.0) * DS_DISPLAY_VERTICAL_GAP_TO_HEIGHT_RATIO;
sendPortDisplay = nil;
cdsController = nil;
isHudEnabled = NO;
@ -136,28 +135,6 @@ CGLContextObj OSXOpenGLRendererContext = NULL;
return theSize;
}
- (NSSize) normalSizeWithGap
{
OSSpinLockLock(&spinlockNormalSize);
NSSize theSize = normalSize;
OSSpinLockUnlock(&spinlockNormalSize);
NSInteger theType = [self displayType];
if (theType == DS_DISPLAY_TYPE_COMBO)
{
if ([self displayOrientation] == DS_DISPLAY_ORIENTATION_VERTICAL)
{
theSize.height += (theSize.height/2.0) * DS_DISPLAY_VERTICAL_GAP_TO_HEIGHT_RATIO;
}
else
{
theSize.width += (theSize.width/2.0) * DS_DISPLAY_VERTICAL_GAP_TO_HEIGHT_RATIO;
}
}
return theSize;
}
- (void) setGpuStateFlags:(UInt32)flags
{
OSSpinLockLock(&spinlockGpuStateFlags);
@ -436,7 +413,7 @@ CGLContextObj OSXOpenGLRendererContext = NULL;
viewAngle = CLOCKWISE_DEGREES(viewAngle);
}
NSPoint touchLoc = GetNormalPointFromTransformedPoint(clickLoc, [self normalSizeWithGap], [[self view] bounds].size, [self scale], viewAngle);
NSPoint touchLoc = GetNormalPointFromTransformedPoint(clickLoc, [self normalSize], [[self view] bounds].size, [self scale], viewAngle);
// Normalize the touch location to the DS.
if ([self displayType] == DS_DISPLAY_TYPE_COMBO)
@ -446,11 +423,11 @@ CGLContextObj OSXOpenGLRendererContext = NULL;
if (theOrientation == DS_DISPLAY_ORIENTATION_VERTICAL && theOrder == DS_DISPLAY_ORDER_TOUCH_FIRST)
{
touchLoc.y -= GPU_DISPLAY_HEIGHT /* + transformedGap */;
touchLoc.y -= GPU_DISPLAY_HEIGHT;
}
else if (theOrientation == DS_DISPLAY_ORIENTATION_HORIZONTAL && theOrder == DS_DISPLAY_ORDER_MAIN_FIRST)
{
touchLoc.x -= GPU_DISPLAY_WIDTH /* + transformedGap */;
touchLoc.x -= GPU_DISPLAY_WIDTH;
}
}