diff --git a/MacGLide Control Panel/English.lproj/MainWindow.nib/classes.nib b/MacGLide Control Panel/English.lproj/MainWindow.nib/classes.nib index 496c48e..229c1b5 100644 --- a/MacGLide Control Panel/English.lproj/MainWindow.nib/classes.nib +++ b/MacGLide Control Panel/English.lproj/MainWindow.nib/classes.nib @@ -2,16 +2,49 @@ IBClasses = ( {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { - ACTIONS = {noSplash = id; toggleMipmapping = id; }; CLASS = MacGLideMainPanel; LANGUAGE = ObjC; + OUTLETS = {controller = MacGLideSettingsController; }; SUPERCLASS = NSWindow; }, { - ACTIONS = {toggleTextureSmoothing = id; }; - CLASS = NSWindow; + ACTIONS = { + setAnisotropicFilteringLevel = id; + setAutoEnableGameSpecificSettings = id; + setBoardType = id; + setFramebufferMemory = id; + setFullSceneAnitaliasingLevel = id; + setGammaBias = id; + setMipmapping = id; + setNoSplash = id; + setRefreshRate = id; + setResolution = id; + setSettingsName = id; + setShowShamelessPlug = id; + setTextureMemory = id; + setTextureUnits = id; + setUseApplicationSpecificSettings = id; + }; + CLASS = MacGLideSettingsController; LANGUAGE = ObjC; - SUPERCLASS = NSResponder; + OUTLETS = { + anisotropicFilteringLevel = NSSlider; + autoEnableGameSpecificSettings = NSButton; + boardType = NSPopUpButton; + framebufferMemory = NSPopUpButton; + fullSceneAnitaliasingLevel = NSSlider; + gammaBias = NSSlider; + mipmapping = NSButton; + noSplash = NSButton; + refreshRate = NSPopUpButton; + resolution = NSPopUpButton; + settingsName = NSPopUpButton; + showShamelessPlug = NSButton; + textureMemory = NSPopUpButton; + textureUnits = NSPopUpButton; + useUseApplicationSpecificSettings = NSButton; + }; + SUPERCLASS = NSObject; } ); IBVersion = 1; diff --git a/MacGLide Control Panel/English.lproj/MainWindow.nib/info.nib b/MacGLide Control Panel/English.lproj/MainWindow.nib/info.nib index 36aae56..1131baf 100644 --- a/MacGLide Control Panel/English.lproj/MainWindow.nib/info.nib +++ b/MacGLide Control Panel/English.lproj/MainWindow.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 486 10 534 282 0 0 1024 746 + 554 6 413 292 0 0 1024 746 IBEditorPositions 29 @@ -21,9 +21,10 @@ IBOpenObjects + 29 21 IBSystem Version - 8I127 + 8L127 diff --git a/MacGLide Control Panel/English.lproj/MainWindow.nib/keyedobjects.nib b/MacGLide Control Panel/English.lproj/MainWindow.nib/keyedobjects.nib index 05ea4c4..0afc2bc 100644 Binary files a/MacGLide Control Panel/English.lproj/MainWindow.nib/keyedobjects.nib and b/MacGLide Control Panel/English.lproj/MainWindow.nib/keyedobjects.nib differ diff --git a/MacGLide Control Panel/MacGLide Control Panel.xcodeproj/jens.pbxuser b/MacGLide Control Panel/MacGLide Control Panel.xcodeproj/jens.pbxuser index 1abbfd1..42b75ba 100644 --- a/MacGLide Control Panel/MacGLide Control Panel.xcodeproj/jens.pbxuser +++ b/MacGLide Control Panel/MacGLide Control Panel.xcodeproj/jens.pbxuser @@ -7,12 +7,64 @@ addToTargets = ( 8D1107260486CEB800E47090 /* MacGLide Control Panel */, ); + breakpoints = ( + B4EC72250AF6164100828538 /* MacGLideSettingsController.mm:66 */, + B4EC72270AF6164200828538 /* MacGLideSettingsController.mm:61 */, + B4EC72290AF6164300828538 /* MacGLideSettingsController.mm:56 */, + B439EE190AF63A5300BAE724 /* MacGLideSettingsController.mm:27 */, + B439EE340AF63A8F00BAE724 /* MacGLideSettingsController.mm:89 */, + B439EE5E0AF63CA600BAE724 /* MacGLideSettingsController.mm:37 */, + ); breakpointsGroup = B4F7C7F909A508AB0001160D /* XCBreakpointsBucket */; codeSenseManager = B4E30D5A09A0BC9A003DD374 /* Code sense */; executables = ( B4E30D4B09A0BC8D003DD374 /* MacGLide Control Panel */, ); perUserDictionary = { + "PBXConfiguration.PBXBreakpointsDataSource.v1:1CA1AED706398EBD00589147" = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXBreakpointsDataSource_BreakpointID; + PBXFileTableDataSourceColumnWidthsKey = ( + 20, + 20, + 291, + 20, + 255, + 125, + 20, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXBreakpointsDataSource_ActionID, + PBXBreakpointsDataSource_TypeID, + PBXBreakpointsDataSource_BreakpointID, + PBXBreakpointsDataSource_UseID, + PBXBreakpointsDataSource_LocationID, + PBXBreakpointsDataSource_ConditionID, + PBXBreakpointsDataSource_ContinueID, + ); + }; + "PBXConfiguration.PBXBreakpointsDataSource.v1:1CA23EDF0692099D00951B8B" = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXBreakpointsDataSource_BreakpointID; + PBXFileTableDataSourceColumnWidthsKey = ( + 20, + 20, + 266, + 20, + 165, + 165, + 20, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXBreakpointsDataSource_ActionID, + PBXBreakpointsDataSource_TypeID, + PBXBreakpointsDataSource_BreakpointID, + PBXBreakpointsDataSource_UseID, + PBXBreakpointsDataSource_LocationID, + PBXBreakpointsDataSource_ConditionID, + PBXBreakpointsDataSource_ContinueID, + ); + }; PBXConfiguration.PBXFileTableDataSource3.PBXErrorsWarningsDataSource = { PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; PBXFileTableDataSourceColumnSortingKey = PBXErrorsWarningsDataSource_LocationID; @@ -46,7 +98,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 554, + 482, 20, 48, 43, @@ -85,8 +137,33 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 171316574; - PBXWorkspaceStateSaveDate = 171316574; + PBXPerProjectTemplateStateSaveDate = 186008316; + PBXWorkspaceStateSaveDate = 186008316; + }; + perUserProjectItems = { + B439EE1E0AF63A5500BAE724 /* PBXTextBookmark */ = B439EE1E0AF63A5500BAE724 /* PBXTextBookmark */; + B439EE210AF63A5500BAE724 /* PBXTextBookmark */ = B439EE210AF63A5500BAE724 /* PBXTextBookmark */; + B439EE2B0AF63A5700BAE724 /* PBXTextBookmark */ = B439EE2B0AF63A5700BAE724 /* PBXTextBookmark */; + B439EE670AF6479F00BAE724 /* PBXTextBookmark */ = B439EE670AF6479F00BAE724 /* PBXTextBookmark */; + B47770B00AF38D200083B671 /* PBXTextBookmark */ = B47770B00AF38D200083B671 /* PBXTextBookmark */; + B47770B10AF38D200083B671 /* PBXTextBookmark */ = B47770B10AF38D200083B671 /* PBXTextBookmark */; + B47770FD0AF3927D0083B671 /* PBXTextBookmark */ = B47770FD0AF3927D0083B671 /* PBXTextBookmark */; + B4C6D28F0B1642FB00A4F7AF /* PBXTextBookmark */ = B4C6D28F0B1642FB00A4F7AF /* PBXTextBookmark */; + B4C6D2CC0B16440300A4F7AF /* PBXTextBookmark */ = B4C6D2CC0B16440300A4F7AF /* PBXTextBookmark */; + B4C6D2CD0B16440300A4F7AF /* PBXTextBookmark */ = B4C6D2CD0B16440300A4F7AF /* PBXTextBookmark */; + B4C6D2CE0B16440600A4F7AF /* PBXTextBookmark */ = B4C6D2CE0B16440600A4F7AF /* PBXTextBookmark */; + B4C6D2D50B16445300A4F7AF /* PBXTextBookmark */ = B4C6D2D50B16445300A4F7AF /* PBXTextBookmark */; + B4C6D2D60B16445300A4F7AF /* PBXTextBookmark */ = B4C6D2D60B16445300A4F7AF /* PBXTextBookmark */; + B4EC712B0AF6064100828538 /* PBXTextBookmark */ = B4EC712B0AF6064100828538 /* PBXTextBookmark */; + B4EC712C0AF6064100828538 /* PBXTextBookmark */ = B4EC712C0AF6064100828538 /* PBXTextBookmark */; + B4EC712F0AF6064100828538 /* PBXTextBookmark */ = B4EC712F0AF6064100828538 /* PBXTextBookmark */; + B4EC71300AF6064100828538 /* PBXTextBookmark */ = B4EC71300AF6064100828538 /* PBXTextBookmark */; + B4EC71310AF6064100828538 /* PBXTextBookmark */ = B4EC71310AF6064100828538 /* PBXTextBookmark */; + B4EC71320AF6064100828538 /* PBXTextBookmark */ = B4EC71320AF6064100828538 /* PBXTextBookmark */; + B4EC722D0AF616CE00828538 /* PBXTextBookmark */ = B4EC722D0AF616CE00828538 /* PBXTextBookmark */; + B4EC72310AF616CE00828538 /* PBXTextBookmark */ = B4EC72310AF616CE00828538 /* PBXTextBookmark */; + B4EC72340AF616D100828538 /* PBXTextBookmark */ = B4EC72340AF616D100828538 /* PBXTextBookmark */; + B4EC723B0AF6172A00828538 /* PBXTextBookmark */ = B4EC723B0AF6172A00828538 /* PBXTextBookmark */; }; sourceControlManager = B4E30D5909A0BC9A003DD374 /* Source Control */; userBuildSettings = { @@ -97,13 +174,13 @@ sepNavIntBoundsRect = "{{0, 0}, {723, 322}}"; sepNavSelRange = "{275, 0}"; sepNavVisRect = "{{0, 0}, {723, 322}}"; - sepNavWindowFrame = "{{179, 0}, {762, 451}}"; + sepNavWindowFrame = "{{95, 159}, {762, 451}}"; }; }; 32CA4F630368D1EE00C91783 /* MacGLide Control Panel_Prefix.pch */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {725, 325}}"; - sepNavSelRange = "{256, 0}"; + sepNavSelRange = "{377, 0}"; sepNavVisRect = "{{0, 0}, {725, 325}}"; sepNavWindowFrame = "{{7, 36}, {764, 454}}"; }; @@ -122,12 +199,120 @@ sepNavWindowFrame = "{{216, 83}, {713, 596}}"; }; }; + B427E8DD0A9CFEE100B42C21 /* MacGLideSettingsController.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {640, 910}}"; + sepNavSelRange = "{1435, 0}"; + sepNavVisRect = "{{0, 126}, {640, 463}}"; + sepNavWindowFrame = "{{131, 57}, {640, 689}}"; + }; + }; + B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {946, 2534}}"; + sepNavSelRange = "{332, 27}"; + sepNavVisRect = "{{0, 396}, {946, 231}}"; + sepNavWindowFrame = "{{235, 0}, {750, 692}}"; + }; + }; + B439EDEE0AF637E700BAE724 /* sdk2_3dfx.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = sdk2_3dfx.h; + path = "/Users/jens/Developer/MacGLide/MacGLide Control Panel/../MacGLide/OpenGLide/sdk2_3dfx.h"; + sourceTree = ""; + }; + B439EE190AF63A5300BAE724 /* MacGLideSettingsController.mm:27 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + delayBeforeContinue = 0; + fileReference = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; + functionName = "-init"; + hitCount = 1; + lineNumber = 27; + location = MacGLideSettingsController.ob; + modificationTime = 186008435.73781; + state = 2; + }; + B439EE1E0AF63A5500BAE724 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B439EDEE0AF637E700BAE724 /* sdk2_3dfx.h */; + name = "# warning define FX_ENTRY & FX_CALL for your compiler"; + rLen = 55; + rLoc = 2297; + rType = 0; + vrLen = 602; + vrLoc = 1990; + }; + B439EE210AF63A5500BAE724 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B4DC13F30A3AF2660094E754 /* GlideSettings_FSp.cpp */; + name = dupFNErr; + rLen = 8; + rLoc = 4331; + rType = 0; + vrLen = 777; + vrLoc = 4945; + }; + B439EE2B0AF63A5700BAE724 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B439EDEE0AF637E700BAE724 /* sdk2_3dfx.h */; + name = "# warning define FX_ENTRY & FX_CALL for your compiler"; + rLen = 55; + rLoc = 2297; + rType = 0; + vrLen = 798; + vrLoc = 1910; + }; + B439EE340AF63A8F00BAE724 /* MacGLideSettingsController.mm:89 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + delayBeforeContinue = 0; + fileReference = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; + functionName = "-saveSettings"; + hitCount = 1; + lineNumber = 89; + location = MacGLideSettingsController.ob; + modificationTime = 186008486.918484; + state = 1; + }; + B439EE5E0AF63CA600BAE724 /* MacGLideSettingsController.mm:37 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + delayBeforeContinue = 0; + fileReference = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; + functionName = "-init:"; + hitCount = 32; + lineNumber = 37; + location = MacGLideSettingsController.ob; + modificationTime = 186008620.451515; + state = 1; + }; + B439EE670AF6479F00BAE724 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B43FFB0409FD3D350094A3E3 /* GlideSettings.cpp */; + name = "GlideSettings.cpp: 269"; + rLen = 0; + rLoc = 8938; + rType = 0; + vrLen = 782; + vrLoc = 1927; + }; B43FFB0409FD3D350094A3E3 /* GlideSettings.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {693, 8232}}"; - sepNavSelRange = "{426, 0}"; - sepNavVisRect = "{{0, 0}, {693, 482}}"; - sepNavWindowFrame = "{{36, 21}, {732, 611}}"; + sepNavIntBoundsRect = "{{0, 0}, {782, 8876}}"; + sepNavSelRange = "{8938, 0}"; + sepNavVisRect = "{{0, 631}, {680, 601}}"; + sepNavWindowFrame = "{{248, 17}, {732, 611}}"; }; }; B452D05309F9756E00A4F626 /* GlideSettings_iostream.cpp */ = { @@ -148,42 +333,129 @@ }; B46D4BC60A064796002A428F /* GlideSettings_FSp.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {725, 602}}"; - sepNavSelRange = "{434, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {725, 616}}"; + sepNavSelRange = "{458, 16}"; sepNavVisRect = "{{0, 0}, {725, 325}}"; sepNavWindowFrame = "{{15, 287}, {764, 454}}"; }; }; - B46D4BC70A064796002A428F /* GlideSettings.cpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {860, 3388}}"; - sepNavSelRange = "{3812, 0}"; - sepNavVisRect = "{{0, 1615}, {725, 325}}"; - sepNavWindowFrame = "{{38, 266}, {764, 454}}"; - }; + B47770B00AF38D200083B671 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; + name = "MacGLideSettingsController.mm: 17"; + rLen = 0; + rLoc = 437; + rType = 0; + vrLen = 409; + vrLoc = 253; + }; + B47770B10AF38D200083B671 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B43FFB0409FD3D350094A3E3 /* GlideSettings.cpp */; + name = "GlideSettings.cpp: 275"; + rLen = 0; + rLoc = 9200; + rType = 0; + vrLen = 181; + vrLoc = 10450; + }; + B47770FD0AF3927D0083B671 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B43FFB0409FD3D350094A3E3 /* GlideSettings.cpp */; + name = "GlideSettings.cpp: 275"; + rLen = 0; + rLoc = 9200; + rType = 0; + vrLen = 0; + vrLoc = 0; }; B483759009F67BFC004826B1 /* GlideSettings.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {674, 2170}}"; - sepNavSelRange = "{2260, 13}"; - sepNavVisRect = "{{0, 881}, {674, 329}}"; + sepNavIntBoundsRect = "{{0, 0}, {674, 2324}}"; + sepNavSelRange = "{3209, 18}"; + sepNavVisRect = "{{0, 1467}, {674, 329}}"; sepNavWindowFrame = "{{272, 31}, {713, 458}}"; }; }; + B4C6D28F0B1642FB00A4F7AF /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; + rLen = 1; + rLoc = 17; + rType = 1; + }; + B4C6D2CC0B16440300A4F7AF /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B4DC13F30A3AF2660094E754 /* GlideSettings_FSp.cpp */; + name = retu; + rLen = 4; + rLoc = 1519; + rType = 0; + vrLen = 1327; + vrLoc = 1464; + }; + B4C6D2CD0B16440300A4F7AF /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; + name = "err = userConfig.load();"; + rLen = 27; + rLoc = 332; + rType = 0; + vrLen = 471; + vrLoc = 39; + }; + B4C6D2CE0B16440600A4F7AF /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B4DC13F30A3AF2660094E754 /* GlideSettings_FSp.cpp */; + name = retu; + rLen = 4; + rLoc = 1519; + rType = 0; + vrLen = 1008; + vrLoc = 1464; + }; + B4C6D2D50B16445300A4F7AF /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; + name = "err = userConfig.load();"; + rLen = 27; + rLoc = 332; + rType = 0; + vrLen = 511; + vrLoc = 40; + }; + B4C6D2D60B16445300A4F7AF /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; + name = "err = userConfig.load();"; + rLen = 27; + rLoc = 332; + rType = 0; + vrLen = 534; + vrLoc = 39; + }; + B4DC13F30A3AF2660094E754 /* GlideSettings_FSp.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {848, 3598}}"; + sepNavSelRange = "{1519, 4}"; + sepNavVisRect = "{{0, 616}, {640, 463}}"; + sepNavWindowFrame = "{{15, 19}, {781, 722}}"; + }; + }; B4DE41C90A18BF99002BD718 /* MacGLideMainPanel.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {725, 325}}"; - sepNavSelRange = "{89, 0}"; - sepNavVisRect = "{{0, 0}, {725, 325}}"; - sepNavWindowFrame = "{{191, 105}, {764, 454}}"; + sepNavIntBoundsRect = "{{0, 0}, {926, 386}}"; + sepNavSelRange = "{88, 0}"; + sepNavVisRect = "{{0, 0}, {640, 386}}"; + sepNavWindowFrame = "{{167, 66}, {764, 454}}"; }; }; B4DE41CA0A18BF99002BD718 /* MacGLideMainPanel.mm */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {725, 325}}"; - sepNavSelRange = "{126, 0}"; - sepNavVisRect = "{{0, 0}, {725, 325}}"; - sepNavWindowFrame = "{{61, 245}, {764, 454}}"; + sepNavIntBoundsRect = "{{0, 0}, {902, 392}}"; + sepNavSelRange = "{57, 0}"; + sepNavVisRect = "{{0, 0}, {640, 386}}"; + sepNavWindowFrame = "{{51, 105}, {734, 574}}"; }; }; B4E30D4B09A0BC8D003DD374 /* MacGLide Control Panel */ = { @@ -211,6 +483,42 @@ }; sourceDirectories = ( ); + variableFormatDictionary = { + $v0 = 1; + $v1 = 1; + $v10 = 1; + $v11 = 1; + $v12 = 1; + $v13 = 1; + $v14 = 1; + $v15 = 1; + $v16 = 1; + $v17 = 1; + $v18 = 1; + $v19 = 1; + $v2 = 1; + $v20 = 1; + $v21 = 1; + $v22 = 1; + $v23 = 1; + $v24 = 1; + $v25 = 1; + $v26 = 1; + $v27 = 1; + $v28 = 1; + $v29 = 1; + $v3 = 1; + $v30 = 1; + $v31 = 1; + $v4 = 1; + $v5 = 1; + $v6 = 1; + $v7 = 1; + $v8 = 1; + $v9 = 1; + $vrsave = 1; + $vscr = 1; + }; }; B4E30D5909A0BC9A003DD374 /* Source Control */ = { isa = PBXSourceControlManager; @@ -225,10 +533,161 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; + B4EC712B0AF6064100828538 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B4DE41CA0A18BF99002BD718 /* MacGLideMainPanel.mm */; + name = "MacGLideMainPanel.mm: 3"; + rLen = 0; + rLoc = 57; + rType = 0; + vrLen = 588; + vrLoc = 0; + }; + B4EC712C0AF6064100828538 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B4DE41C90A18BF99002BD718 /* MacGLideMainPanel.h */; + name = "MacGLideMainPanel.h: 5"; + rLen = 0; + rLoc = 88; + rType = 0; + vrLen = 340; + vrLoc = 0; + }; + B4EC712F0AF6064100828538 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; + name = "NSString* s = [sender titleOfSelectedItem];"; + rLen = 46; + rLoc = 2763; + rType = 0; + vrLen = 623; + vrLoc = 2391; + }; + B4EC71300AF6064100828538 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B427E8DD0A9CFEE100B42C21 /* MacGLideSettingsController.h */; + name = "MacGLideSettingsController.h: 30"; + rLen = 0; + rLoc = 765; + rType = 0; + vrLen = 1050; + vrLoc = 270; + }; + B4EC71310AF6064100828538 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B4DE41CA0A18BF99002BD718 /* MacGLideMainPanel.mm */; + name = "MacGLideMainPanel.mm: 3"; + rLen = 0; + rLoc = 57; + rType = 0; + vrLen = 588; + vrLoc = 0; + }; + B4EC71320AF6064100828538 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B4DE41C90A18BF99002BD718 /* MacGLideMainPanel.h */; + name = "MacGLideMainPanel.h: 5"; + rLen = 0; + rLoc = 88; + rType = 0; + vrLen = 340; + vrLoc = 0; + }; + B4EC72250AF6164100828538 /* MacGLideSettingsController.mm:66 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + delayBeforeContinue = 0; + fileReference = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; + functionName = "-updateButton:floatValue:"; + hitCount = 1; + lineNumber = 66; + location = MacGLideSettingsController.ob; + modificationTime = 186008435.733022; + state = 2; + }; + B4EC72270AF6164200828538 /* MacGLideSettingsController.mm:61 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + delayBeforeContinue = 0; + fileReference = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; + functionName = "-updateButton:ulongValue:"; + hitCount = 1; + lineNumber = 61; + location = MacGLideSettingsController.ob; + modificationTime = 186008435.735256; + state = 2; + }; + B4EC72290AF6164300828538 /* MacGLideSettingsController.mm:56 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + delayBeforeContinue = 0; + fileReference = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; + functionName = "-updateButton:boolValue:"; + hitCount = 1; + lineNumber = 56; + location = MacGLideSettingsController.ob; + modificationTime = 186008435.736552; + state = 2; + }; + B4EC722D0AF616CE00828538 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 29B97316FDCFA39411CA2CEA /* main.m */; + name = "main.m: 13"; + rLen = 0; + rLoc = 214; + rType = 0; + vrLen = 275; + vrLoc = 0; + }; + B4EC72310AF616CE00828538 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 29B97316FDCFA39411CA2CEA /* main.m */; + name = "main.m: 13"; + rLen = 0; + rLoc = 214; + rType = 0; + vrLen = 275; + vrLoc = 0; + }; + B4EC72340AF616D100828538 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B427E8DD0A9CFEE100B42C21 /* MacGLideSettingsController.h */; + name = "MacGLideSettingsController.h: setRefreshRate:"; + rLen = 0; + rLoc = 1435; + rType = 0; + vrLen = 1373; + vrLoc = 0; + }; + B4EC723B0AF6172A00828538 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B427E8DD0A9CFEE100B42C21 /* MacGLideSettingsController.h */; + name = "MacGLideSettingsController.h: setRefreshRate:"; + rLen = 0; + rLoc = 1435; + rType = 0; + vrLen = 1180; + vrLoc = 193; + }; B4F7C7F909A508AB0001160D /* XCBreakpointsBucket */ = { isa = XCBreakpointsBucket; - name = "Project Breakpoints"; + name = "MacGLide Control Panel"; objects = ( + B4EC72250AF6164100828538 /* MacGLideSettingsController.mm:66 */, + B4EC72270AF6164200828538 /* MacGLideSettingsController.mm:61 */, + B4EC72290AF6164300828538 /* MacGLideSettingsController.mm:56 */, + B439EE190AF63A5300BAE724 /* MacGLideSettingsController.mm:27 */, + B439EE340AF63A8F00BAE724 /* MacGLideSettingsController.mm:89 */, + B439EE5E0AF63CA600BAE724 /* MacGLideSettingsController.mm:37 */, ); }; } diff --git a/MacGLide Control Panel/MacGLide Control Panel.xcodeproj/jens.perspective b/MacGLide Control Panel/MacGLide Control Panel.xcodeproj/jens.perspective index bb2f7bb..119a0bc 100644 --- a/MacGLide Control Panel/MacGLide Control Panel.xcodeproj/jens.perspective +++ b/MacGLide Control Panel/MacGLide Control Panel.xcodeproj/jens.perspective @@ -3,7 +3,7 @@ ActivePerspectiveName - Project + Debug AllowedModules @@ -188,9 +188,9 @@ PerspectiveWidths - 1000 - 1000 - 1000 + 987 + 987 + 987 Perspectives @@ -221,8 +221,6 @@ Layout - BecomeActive - ContentConfiguration PBXBottomSmartGroupGIDs @@ -248,7 +246,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 185 + 244 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -260,25 +258,20 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey 29B97314FDCFA39411CA2CEA - B4E30D5D09A0BD2A003DD374 - B4E30D5E09A0BD2A003DD374 080E96DDFE201D6D7F000001 29B97315FDCFA39411CA2CEA - 29B97317FDCFA39411CA2CEA - 29B97323FDCFA39411CA2CEA - 19C28FACFE9D520D11CA2CBB - 8D1107320486CEB800E47090 + 1C37FBAC04509CD000000102 1C37FAAC04509CD000000102 + 1C77FABC04509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 1 - 0 + 30 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {185, 367}} + {{0, 0}, {244, 632}} PBXTopSmartGroupGIDs @@ -288,19 +281,17 @@ GeometryConfiguration Frame - {{0, 0}, {202, 385}} + {{0, 0}, {261, 650}} GroupTreeTableConfiguration MainColumn - 185 + 244 - RubberWindowFrame - 4 319 1000 426 0 0 1024 746 Module PBXSmartGroupTreeModule Proportion - 202pt + 261pt Dock @@ -311,7 +302,7 @@ PBXProjectModuleGUID B4DC85D409A27F830099E581 PBXProjectModuleLabel - + MacGLideSettingsController.mm PBXSplitModuleInNavigatorKey Split0 @@ -319,7 +310,33 @@ PBXProjectModuleGUID B4DC85D509A27F830099E581 PBXProjectModuleLabel - + MacGLideSettingsController.mm + _historyCapacity + 0 + bookmark + B4C6D2D50B16445300A4F7AF + history + + B4EC712B0AF6064100828538 + B4EC712C0AF6064100828538 + B4EC722D0AF616CE00828538 + B4EC72340AF616D100828538 + B439EE2B0AF63A5700BAE724 + B439EE670AF6479F00BAE724 + B4C6D2CC0B16440300A4F7AF + B4C6D28F0B1642FB00A4F7AF + + prevStack + + B47770B00AF38D200083B671 + B47770B10AF38D200083B671 + B4EC71300AF6064100828538 + B4EC71310AF6064100828538 + B4EC71320AF6064100828538 + B4EC72310AF616CE00828538 + B439EE1E0AF63A5500BAE724 + B439EE210AF63A5500BAE724 + SplitCount 1 @@ -332,18 +349,16 @@ GeometryConfiguration Frame - {{0, 0}, {793, 0}} - RubberWindowFrame - 4 319 1000 426 0 0 1024 746 + {{0, 0}, {721, 443}} Module PBXNavigatorGroup Proportion - 0pt + 443pt Proportion - 380pt + 190pt Tabs @@ -357,7 +372,7 @@ GeometryConfiguration Frame - {{10, 27}, {793, 353}} + {{10, 27}, {721, 163}} Module XCDetailModule @@ -390,8 +405,6 @@ Frame {{10, 27}, {793, 353}} - RubberWindowFrame - 4 319 1000 426 0 0 1024 746 Module PBXCVSModule @@ -400,7 +413,7 @@ Proportion - 793pt + 721pt Name @@ -418,11 +431,11 @@ TableOfContents - B4840EE10A361AF800ED34FB + B4C6D2B80B1643A900A4F7AF 1CA23ED40692098700951B8B - B4840EE20A361AF800ED34FB + B4C6D2B90B1643A900A4F7AF B4DC85D409A27F830099E581 - B4840EE30A361AF800ED34FB + B4C6D2BA0B1643A900A4F7AF 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -472,7 +485,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 260 + 284 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -497,13 +510,13 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 19 - 18 + 7 + 6 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 64}, {260, 367}} + {{0, 0}, {284, 632}} PBXTopSmartGroupGIDs @@ -513,17 +526,17 @@ GeometryConfiguration Frame - {{0, 0}, {277, 385}} + {{0, 0}, {301, 650}} GroupTreeTableConfiguration MainColumn - 260 + 284 Module PBXSmartGroupTreeModule Proportion - 277pt + 301pt Dock @@ -534,7 +547,7 @@ PBXProjectModuleGUID B467E8DA09A6421200625DA6 PBXProjectModuleLabel - + MacGLideSettingsController.mm PBXSplitModuleInNavigatorKey Split0 @@ -542,7 +555,33 @@ PBXProjectModuleGUID B467E8DB09A6421200625DA6 PBXProjectModuleLabel - + MacGLideSettingsController.mm + _historyCapacity + 0 + bookmark + B4C6D2D60B16445300A4F7AF + history + + B4EC712B0AF6064100828538 + B4EC712C0AF6064100828538 + B47770FD0AF3927D0083B671 + B4EC722D0AF616CE00828538 + B4EC723B0AF6172A00828538 + B439EE2B0AF63A5700BAE724 + B4C6D2CE0B16440600A4F7AF + B4C6D2CD0B16440300A4F7AF + + prevStack + + B4EC712F0AF6064100828538 + B4EC71300AF6064100828538 + B4EC71310AF6064100828538 + B4EC71320AF6064100828538 + B47770B10AF38D200083B671 + B4EC72310AF616CE00828538 + B439EE1E0AF63A5500BAE724 + B439EE210AF63A5500BAE724 + SplitCount 1 @@ -555,21 +594,23 @@ GeometryConfiguration Frame - {{0, 0}, {718, 0}} + {{0, 0}, {681, 495}} Module PBXNavigatorGroup Proportion - 0pt + 495pt Proportion - 380pt + 138pt Tabs ContentConfiguration + PBXBuildLogShowsTranscriptDefaultKey + {{0, 5}, {681, 106}} PBXProjectModuleGUID XCMainBuildResultsModuleGUID PBXProjectModuleLabel @@ -582,7 +623,7 @@ GeometryConfiguration Frame - {{10, 27}, {718, 353}} + {{10, 27}, {681, 111}} Module PBXBuildResultsModule @@ -635,7 +676,7 @@ GeometryConfiguration Frame - {{10, 27}, {718, 444}} + {{10, 27}, {681, 111}} Module PBXRunSessionModule @@ -644,7 +685,7 @@ Proportion - 718pt + 681pt Name @@ -662,14 +703,14 @@ TableOfContents - B4840EE40A361AF800ED34FB + B4C6D2BC0B1643A900A4F7AF 1CA23EE50692099D00951B8B - B4840EE50A361AF800ED34FB + B4C6D2BD0B1643A900A4F7AF B467E8DA09A6421200625DA6 - B4840EE60A361AF800ED34FB + B4C6D2BE0B1643A900A4F7AF XCMainBuildResultsModuleGUID 1CA23EE80692099D00951B8B - B4840EE70A361AF800ED34FB + B4C6D2BF0B1643A900A4F7AF ToolbarConfiguration xcode.toolbar.config.buildAndRun @@ -713,12 +754,14 @@ GeometryConfiguration Frame - {{0, 0}, {969, 0}} + {{0, 0}, {987, 102}} + RubberWindowFrame + 0 55 987 691 0 0 1024 746 Module PBXDebugCLIModule Proportion - 0pt + 102pt ContentConfiguration @@ -737,8 +780,8 @@ yes sizes - {{0, 0}, {472, 149}} - {{472, 0}, {497, 149}} + {{0, 0}, {512, 280}} + {{512, 0}, {475, 280}} VerticalSplitView @@ -753,8 +796,8 @@ yes sizes - {{0, 0}, {969, 149}} - {{0, 149}, {969, 160}} + {{0, 0}, {987, 280}} + {{0, 280}, {987, 263}} @@ -776,12 +819,14 @@ DebugSTDIOWindowFrame {{200, 200}, {500, 300}} Frame - {{0, 5}, {969, 309}} + {{0, 107}, {987, 543}} + RubberWindowFrame + 0 55 987 691 0 0 1024 746 Module PBXDebugSessionModule Proportion - 309pt + 543pt Name @@ -800,15 +845,15 @@ TableOfContents - B452D07B09F9789800A4F626 + B4C6D2C00B1643A900A4F7AF 1CCC7628064C1048000F2A68 1CCC7629064C1048000F2A68 - B452D07C09F9789800A4F626 - B452D07D09F9789800A4F626 - B452D07E09F9789800A4F626 - B452D07F09F9789800A4F626 - B452D06609F9763300A4F626 - B452D08009F9789800A4F626 + B4C6D2C10B1643A900A4F7AF + B4C6D2C20B1643A900A4F7AF + B4C6D2C30B1643A900A4F7AF + B4C6D2C40B1643A900A4F7AF + B467E8DA09A6421200625DA6 + B4C6D2C50B1643A900A4F7AF ToolbarConfiguration xcode.toolbar.config.debug @@ -838,10 +883,13 @@ 5 WindowOrderList + B4C6D2C60B1643A900A4F7AF + B4C6D2C70B1643A900A4F7AF + B4C6D2C50B1643A900A4F7AF /Users/jens/Developer/MacGLide/MacGLide Control Panel/MacGLide Control Panel.xcodeproj WindowString - 4 319 1000 426 0 0 1024 746 + 0 55 987 691 0 0 1024 746 WindowTools @@ -1134,18 +1182,18 @@ 743 379 452 308 0 0 1280 1002 + FirstTimeWindowDisplayed + Identifier windowTool.breakpoints IsVertical - 0 + Layout Dock - BecomeActive - 1 ContentConfiguration PBXBottomSmartGroupGIDs @@ -1182,24 +1230,24 @@ PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {168, 350}} + {{0, 0}, {168, 631}} PBXTopSmartGroupGIDs XCIncludePerspectivesSwitch - 0 + GeometryConfiguration Frame - {{0, 0}, {185, 368}} + {{0, 0}, {185, 649}} GroupTreeTableConfiguration MainColumn 168 RubberWindowFrame - 315 424 744 409 0 0 1440 878 + 0 56 986 690 0 0 1024 746 Module PBXSmartGroupTreeModule @@ -1207,6 +1255,8 @@ 185pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -1217,18 +1267,18 @@ GeometryConfiguration Frame - {{190, 0}, {554, 368}} + {{190, 0}, {796, 649}} RubberWindowFrame - 315 424 744 409 0 0 1440 878 + 0 56 986 690 0 0 1024 746 Module XCDetailModule Proportion - 554pt + 796pt Proportion - 368pt + 649pt MajorVersion @@ -1243,22 +1293,22 @@ XCDetailModule StatusbarIsVisible - 1 + TableOfContents - 1CDDB66807F98D9800BB5817 - 1CDDB66907F98D9800BB5817 + B439EE0F0AF63A0200BAE724 + B439EE100AF63A0200BAE724 1CE0B1FE06471DED0097A5F4 1CA1AED706398EBD00589147 ToolbarConfiguration xcode.toolbar.config.breakpoints WindowString - 315 424 744 409 0 0 1440 878 + 0 56 986 690 0 0 1024 746 WindowToolGUID - 1CDDB66807F98D9800BB5817 + B439EE0F0AF63A0200BAE724 WindowToolIsVisible - 1 + Identifier diff --git a/MacGLide Control Panel/MacGLide Control Panel.xcodeproj/project.pbxproj b/MacGLide Control Panel/MacGLide Control Panel.xcodeproj/project.pbxproj index 98870de..699becf 100644 --- a/MacGLide Control Panel/MacGLide Control Panel.xcodeproj/project.pbxproj +++ b/MacGLide Control Panel/MacGLide Control Panel.xcodeproj/project.pbxproj @@ -11,12 +11,13 @@ 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; B419FB2A0A32251C0070C008 /* Displays.png in Resources */ = {isa = PBXBuildFile; fileRef = B419FB290A32251C0070C008 /* Displays.png */; }; + B427E8E20A9CFF2B00B42C21 /* MacGLideSettingsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */; }; B43FFB0509FD3D350094A3E3 /* GlideSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B43FFB0409FD3D350094A3E3 /* GlideSettings.cpp */; }; B44507C90A250ECA008ACE63 /* opengl.gif in Resources */ = {isa = PBXBuildFile; fileRef = B44507C80A250ECA008ACE63 /* opengl.gif */; }; B452D05509F9756E00A4F626 /* GlideSettings_iostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B452D05309F9756E00A4F626 /* GlideSettings_iostream.cpp */; }; B467E8CA09A6410500625DA6 /* 3Dfx-Logo_25%.png in Resources */ = {isa = PBXBuildFile; fileRef = B467E8C909A6410500625DA6 /* 3Dfx-Logo_25%.png */; }; B467E92709A65EFD00625DA6 /* 3Dfx-Logo.icns in Resources */ = {isa = PBXBuildFile; fileRef = B467E92609A65EFD00625DA6 /* 3Dfx-Logo.icns */; }; - B46D4BC80A064797002A428F /* GlideSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B46D4BC70A064796002A428F /* GlideSettings.cpp */; }; + B4DC13F40A3AF2660094E754 /* GlideSettings_FSp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4DC13F30A3AF2660094E754 /* GlideSettings_FSp.cpp */; }; B4DE41CB0A18BF99002BD718 /* MacGLideMainPanel.mm in Sources */ = {isa = PBXBuildFile; fileRef = B4DE41CA0A18BF99002BD718 /* MacGLideMainPanel.mm */; }; B4E30D5F09A0BD2A003DD374 /* MainWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = B4E30D5D09A0BD2A003DD374 /* MainWindow.nib */; }; /* End PBXBuildFile section */ @@ -32,6 +33,8 @@ 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8D1107320486CEB800E47090 /* MacGLide Control Panel.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "MacGLide Control Panel.app"; sourceTree = BUILT_PRODUCTS_DIR; }; B419FB290A32251C0070C008 /* Displays.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Displays.png; path = images/Displays.png; sourceTree = ""; }; + B427E8DD0A9CFEE100B42C21 /* MacGLideSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MacGLideSettingsController.h; sourceTree = ""; }; + B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = MacGLideSettingsController.mm; sourceTree = ""; }; B43FFB0409FD3D350094A3E3 /* GlideSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = GlideSettings.cpp; path = ../MacGLide/OpenGLide/GlideSettings.cpp; sourceTree = SOURCE_ROOT; }; B44507C80A250ECA008ACE63 /* opengl.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = opengl.gif; path = images/opengl.gif; sourceTree = ""; }; B452D05309F9756E00A4F626 /* GlideSettings_iostream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = GlideSettings_iostream.cpp; path = ../MacGLide/OpenGLide/GlideSettings_iostream.cpp; sourceTree = SOURCE_ROOT; }; @@ -39,8 +42,8 @@ B467E8C909A6410500625DA6 /* 3Dfx-Logo_25%.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "3Dfx-Logo_25%.png"; path = "images/3Dfx-Logo_25%.png"; sourceTree = ""; }; B467E92609A65EFD00625DA6 /* 3Dfx-Logo.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = "3Dfx-Logo.icns"; path = "images/3Dfx-Logo.icns"; sourceTree = ""; }; B46D4BC60A064796002A428F /* GlideSettings_FSp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GlideSettings_FSp.h; path = ../MacGLide/Mac/GlideSettings_FSp.h; sourceTree = SOURCE_ROOT; }; - B46D4BC70A064796002A428F /* GlideSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = GlideSettings.cpp; path = ../MacGLide/Mac/GlideSettings.cpp; sourceTree = SOURCE_ROOT; }; B483759009F67BFC004826B1 /* GlideSettings.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GlideSettings.h; path = ../MacGLide/OpenGLide/GlideSettings.h; sourceTree = SOURCE_ROOT; }; + B4DC13F30A3AF2660094E754 /* GlideSettings_FSp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = GlideSettings_FSp.cpp; path = ../MacGLide/Mac/GlideSettings_FSp.cpp; sourceTree = SOURCE_ROOT; }; B4DE41C90A18BF99002BD718 /* MacGLideMainPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MacGLideMainPanel.h; sourceTree = ""; }; B4DE41CA0A18BF99002BD718 /* MacGLideMainPanel.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = MacGLideMainPanel.mm; sourceTree = ""; }; B4E30D5E09A0BD2A003DD374 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainWindow.nib; sourceTree = ""; }; @@ -61,8 +64,10 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( + B427E8E10A9CFF2B00B42C21 /* MacGLideSettingsController.mm */, + B427E8DD0A9CFEE100B42C21 /* MacGLideSettingsController.h */, + B4DC13F30A3AF2660094E754 /* GlideSettings_FSp.cpp */, B46D4BC60A064796002A428F /* GlideSettings_FSp.h */, - B46D4BC70A064796002A428F /* GlideSettings.cpp */, B43FFB0409FD3D350094A3E3 /* GlideSettings.cpp */, B452D05309F9756E00A4F626 /* GlideSettings_iostream.cpp */, B452D05409F9756E00A4F626 /* GlideSettings_iostream.h */, @@ -203,8 +208,9 @@ 8D11072D0486CEB800E47090 /* main.m in Sources */, B452D05509F9756E00A4F626 /* GlideSettings_iostream.cpp in Sources */, B43FFB0509FD3D350094A3E3 /* GlideSettings.cpp in Sources */, - B46D4BC80A064797002A428F /* GlideSettings.cpp in Sources */, B4DE41CB0A18BF99002BD718 /* MacGLideMainPanel.mm in Sources */, + B4DC13F40A3AF2660094E754 /* GlideSettings_FSp.cpp in Sources */, + B427E8E20A9CFF2B00B42C21 /* MacGLideSettingsController.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -239,6 +245,7 @@ GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_REUSE_STRINGS = NO; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; PRODUCT_NAME = "MacGLide Control Panel"; @@ -257,6 +264,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_REUSE_STRINGS = NO; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; PRODUCT_NAME = "MacGLide Control Panel"; diff --git a/MacGLide Control Panel/MacGLide Control Panel_Prefix.pch b/MacGLide Control Panel/MacGLide Control Panel_Prefix.pch index 2be90ab..407775f 100644 --- a/MacGLide Control Panel/MacGLide Control Panel_Prefix.pch +++ b/MacGLide Control Panel/MacGLide Control Panel_Prefix.pch @@ -14,4 +14,4 @@ #include "sdk2_glide.h" const int StringBufferSize = 256; -void GlideMsg(const char *message, ...); +void GlideMsg(const char* message, ...); diff --git a/MacGLide Control Panel/MacGLideMainPanel.h b/MacGLide Control Panel/MacGLideMainPanel.h index fa4c0c0..90f2026 100644 --- a/MacGLide Control Panel/MacGLideMainPanel.h +++ b/MacGLide Control Panel/MacGLideMainPanel.h @@ -1,10 +1,11 @@ /* MacGLideMainPanel */ #import +#import "MacGLideSettingsController.h" @interface MacGLideMainPanel : NSWindow { + IBOutlet MacGLideSettingsController* controller; } -- (IBAction)toggleMipmapping:(id)sender; -- (IBAction)toogleUseGameSpecificOptimisations:(id)sender; +// - (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation; @end diff --git a/MacGLide Control Panel/MacGLideMainPanel.mm b/MacGLide Control Panel/MacGLideMainPanel.mm index 66e5577..cb8fdee 100644 --- a/MacGLide Control Panel/MacGLideMainPanel.mm +++ b/MacGLide Control Panel/MacGLideMainPanel.mm @@ -1,22 +1,27 @@ #import "MacGLideMainPanel.h" +#include "GlideSettings.h" -#include -#include "GlideSettings_FSp.h" - -GlideSettingsFSp UserConfig; @implementation MacGLideMainPanel -- (IBAction)toggleMipmapping:(id)sender +/* +- (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation { + [super initWithContentRect:contentRect styleMask:styleMask backing:bufferingType defer:deferCreation]; + // Select default setting file + OSErr err = userConfig.init(NULL); + if (err == noErr) + { + err = userConfig.load(); + if (err == noErr) + { + // init controls +// [updateButton userConfig.Mipmapping]; + } + } + return self; } +*/ -- (IBAction)toggleTextureSmoothing:(id)sender -{ -} - -- (IBAction)toogleUseGameSpecificOptimisations:(id)sender -{ -} @end diff --git a/MacGLide Control Panel/MacGLidePanel.h b/MacGLide Control Panel/MacGLidePanel.h deleted file mode 100644 index 27b939e..0000000 --- a/MacGLide Control Panel/MacGLidePanel.h +++ /dev/null @@ -1,11 +0,0 @@ -/* MacGLidePanel */ - -#import - -@interface MacGLidePanel : NSPanel -{ -} -- (IBAction)toggleTextureSmoothing:(id)sender; -- (IBAction)toggleMipmapping:(id)sender; -- (IBAction)toogleUseGameSpecificOptimisations:(id)sender; -@end diff --git a/MacGLide Control Panel/MacGLidePanel.mm b/MacGLide Control Panel/MacGLidePanel.mm deleted file mode 100644 index b788bcf..0000000 --- a/MacGLide Control Panel/MacGLidePanel.mm +++ /dev/null @@ -1,30 +0,0 @@ -#import "MacGLidePanel.h" - -#include -#include "GlideSettings_iostream.h" - -GlideSettingsIOStream UserConfig; - -void GlideMsg(const char *message, ...) -{ - // Do nothing here as we don't need the logging output -} - -@implementation MacGLidePanel - -- (IBAction)toggleTextureSmoothing:(id)sender -{ - assert(false); -} - -- (IBAction)toggleMipmapping:(id)sender -{ - UserConfig.EnableMipMaps = true; -} - -- (IBAction)toogleUseGameSpecificOptimisations:(id)sender -{ - assert(false); -} - -@end diff --git a/MacGLide Control Panel/MacGLideSettingsController.h b/MacGLide Control Panel/MacGLideSettingsController.h new file mode 100644 index 0000000..2d0463d --- /dev/null +++ b/MacGLide Control Panel/MacGLideSettingsController.h @@ -0,0 +1,64 @@ +/* MacGLideSettingsController */ + +#import + +#include "GlideSettings.h" + +@interface MacGLideSettingsController : NSObject +{ + IBOutlet NSButton *useUseApplicationSpecificSettings; + IBOutlet NSPopUpButton *settingsName; + + IBOutlet NSPopUpButton *resolution; + IBOutlet NSPopUpButton *refreshRate; + IBOutlet NSSlider *gammaBias; + IBOutlet NSSlider *fullSceneAnitaliasingLevel; + + IBOutlet NSSlider *anisotropicFilteringLevel; + IBOutlet NSButton *mipmapping; + IBOutlet NSButton *autoEnableGameSpecificSettings; + + IBOutlet NSPopUpButton *boardType; + IBOutlet NSPopUpButton *framebufferMemory; + IBOutlet NSPopUpButton *textureMemory; + IBOutlet NSPopUpButton *textureUnits; + IBOutlet NSButton *noSplash; + IBOutlet NSButton *showShamelessPlug; +} + +- (void)init; +- (void)init:(const char*)fileName; +- (void) updateButton:(id)source boolValue:(bool) value; +- (void) updateButton:(id)source ulongValue:(unsigned long) value; +- (void) updateButton:(id)source floatValue:(GLfloat) value; +- (void) updateSetting:(id)source boolSetting:(bool&) setting; +- (void) updateSetting:(id)source ulongSetting:(unsigned long&) setting; +- (void) updateSetting:(id)source floatSetting:(GLfloat&) setting; +- (GlideSettings::IOErr)saveSettings; + +// Settings selection +- (IBAction)setUseApplicationSpecificSettings:(id)sender; +- (IBAction)setSettingsName:(id)sender; + +// Appearence / Monitor +- (IBAction)setResolution:(id)sender; +- (IBAction)setRefreshRate:(id)sender; +- (IBAction)setGammaBias:(id)sender; +- (IBAction)setFullSceneAnitaliasingLevel:(id)sender; + +// OpenGL +- (IBAction)setMipmapping:(id)sender; +- (IBAction)setAnisotropicFilteringLevel:(id)sender; +// OpenGL auto adjust features +- (IBAction)setAutoEnableGameSpecificSettings:(id)sender; + +// 3Dfx +- (IBAction)setBoardType:(id)sender; +- (IBAction)setFramebufferMemory:(id)sender; +- (IBAction)setTextureMemory:(id)sender; +- (IBAction)setTextureUnits:(id)sender; +- (IBAction)setShowShamelessPlug:(id)sender; +- (IBAction)setNoSplash:(id)sender; + + +@end diff --git a/MacGLide Control Panel/MacGLideSettingsController.mm b/MacGLide Control Panel/MacGLideSettingsController.mm new file mode 100644 index 0000000..70a0b49 --- /dev/null +++ b/MacGLide Control Panel/MacGLideSettingsController.mm @@ -0,0 +1,180 @@ +#import "MacGLideSettingsController.h" + +#include +#include "GlideSettings_FSp.h" + +GlideSettingsFSp userConfig; + +void GlideMsg(const char* message, ...) +{ + // Don't log anything +} +OSErr loadUserConfig(const char* fileName) +{ + // Select default setting file + OSErr err = userConfig.init(fileName); + if (err == noErr) + { + err = userConfig.load(); + } + return err; +} + +@implementation MacGLideSettingsController + +- (void)init +{ + [self init:"Defaults"]; + return; +} + +- (void)init:(const char*) fileName +{ + OSErr err = loadUserConfig(fileName); + if (err == noErr) + { + // init controls + [self updateButton:useUseApplicationSpecificSettings boolValue:userConfig.UseApplicationSpecificSettings]; + [self updateButton:resolution ulongValue:userConfig.Resolution]; + [self updateButton:refreshRate ulongValue:userConfig.MonitorRefreshRate]; + [self updateButton:gammaBias floatValue:userConfig.GammaBias]; + [self updateButton:fullSceneAnitaliasingLevel ulongValue:userConfig.FullSceneAntiAliasing]; + [self updateButton:anisotropicFilteringLevel ulongValue:userConfig.AnisotropylLevel]; + [self updateButton:mipmapping ulongValue:userConfig.Mipmapping]; + [self updateButton:autoEnableGameSpecificSettings boolValue:userConfig.AutoEnableGameSpecificSettings]; + [self updateButton:boardType ulongValue:userConfig.BoardType]; + [self updateButton:framebufferMemory ulongValue:userConfig.FrameBufferMemorySize]; + [self updateButton:textureMemory ulongValue:userConfig.TextureMemorySize]; + [self updateButton:textureUnits ulongValue:userConfig.GlideTextureUnits]; + [self updateButton:noSplash boolValue:userConfig.NoSplash]; + [self updateButton:showShamelessPlug boolValue:userConfig.ShamelessPlug]; + } +} + +- (void) updateButton:(id) source boolValue:(bool) value +{ + [source setState:(value ? NSOnState : NSOffState)]; +} + +- (void) updateButton:(id) source ulongValue:(unsigned long) value +{ + [source setIntValue: value]; +} + +- (void) updateButton:(id) source floatValue:(GLfloat) value +{ + [source setFloatValue: value]; +} + +- (void) updateSetting:(id) source boolSetting:(bool&)setting; +{ + setting = ([source state] == NSOnState) ? true : false; + [self saveSettings]; +} + +- (void) updateSetting:(id) source ulongSetting:(unsigned long&)setting; +{ + setting = [source intValue]; + [self saveSettings]; +} + +- (void) updateSetting:(id) source floatSetting:(GLfloat&)setting; +{ + setting = [source floatValue]; + [self saveSettings]; +} + +- (GlideSettings::IOErr) saveSettings +{ + GlideSettings::IOErr err = userConfig.save(); + return err; +} + +// Settings selection +- (IBAction)setUseApplicationSpecificSettings:(id)sender +{ + [self updateSetting:sender boolSetting:userConfig.UseApplicationSpecificSettings]; +} + +- (IBAction)setSettingsName:(id)sender +{ + [self saveSettings]; + NSString* s = [sender titleOfSelectedItem]; + [self init:[s UTF8String]]; +} + +// Appearence / Monitor +- (IBAction)setResolution:(id)sender +{ + [self updateSetting:sender ulongSetting:userConfig.Resolution]; +} + +- (IBAction)setRefreshRate:(id)sender +{ + [self updateSetting:sender ulongSetting:userConfig.MonitorRefreshRate]; +} + +- (IBAction)setGammaBias:(id)sender +{ + [self updateSetting:sender floatSetting:userConfig.GammaBias]; +} + +- (IBAction)setFullSceneAnitaliasingLevel:(id)sender +{ + [self updateSetting:sender ulongSetting:userConfig.FullSceneAntiAliasing]; +} + + +// OpenGL +- (IBAction)setMipmapping:(id)sender +{ + [self updateSetting:sender boolSetting:userConfig.Mipmapping]; +} + +- (IBAction)setAnisotropicFilteringLevel:(id)sender +{ + [self updateSetting:sender ulongSetting:userConfig.AnisotropylLevel]; +} + + +- (IBAction)setAutoEnableGameSpecificSettings:(id)sender +{ + [self updateSetting:sender boolSetting:userConfig.AutoEnableGameSpecificSettings]; +} + + +// 3Dfx +- (IBAction)setBoardType:(id)sender +{ + unsigned long bt = userConfig.BoardType; + [self updateSetting:sender ulongSetting:bt]; + userConfig.BoardType = static_cast(bt); +} + +- (IBAction)setFramebufferMemory:(id)sender +{ + [self updateSetting:sender ulongSetting:userConfig.FrameBufferMemorySize]; +} + +- (IBAction)setTextureMemory:(id)sender +{ + [self updateSetting:sender ulongSetting:userConfig.TextureMemorySize]; +} + +- (IBAction)setTextureUnits:(id)sender +{ + [self updateSetting:sender ulongSetting:userConfig.GlideTextureUnits]; +} + +- (IBAction)setShowShamelessPlug:(id)sender +{ + [self updateSetting:sender boolSetting:userConfig.ShamelessPlug]; +} + +- (IBAction)setNoSplash:(id)sender +{ + [self updateSetting:sender boolSetting:userConfig.NoSplash]; +} + + +@end