summaryrefslogtreecommitdiff
path: root/macosx/plugins
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-10-08 16:51:26 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-10-08 16:51:26 +0000
commit1c334c0ec8376621d09c2391371fce415d4a32e7 (patch)
tree2b253ca911726ba4fa31e3fbadb44041e07cc79b /macosx/plugins
parent0bc2020828acaab665608b9d274ec5200af018a0 (diff)
downloadpcsxr-1c334c0ec8376621d09c2391371fce415d4a32e7.tar.gz
OS X: update the remaining xib files.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@91803 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins')
-rw-r--r--macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.xib18
-rw-r--r--macosx/plugins/DFCdrom/Base.lproj/DFCdromPluginConfig.xib70
-rw-r--r--macosx/plugins/DFSound/Resorces/Shared/Base.lproj/NetSfPeopsSpuPluginMain.xib17
-rw-r--r--macosx/plugins/DFXVideo/Base.lproj/NetSfPeopsSoftGPUConfig.xib71
-rw-r--r--macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib9
-rwxr-xr-xmacosx/plugins/DFXVideo/gpuPeteOGL2.slv34
-rw-r--r--macosx/plugins/PeopsXgl/Base.lproj/NetSfPeopsOpenGLConfig.xib47
-rw-r--r--macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib7
8 files changed, 141 insertions, 132 deletions
diff --git a/macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.xib b/macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.xib
index 8e8c8fb3..330d1b20 100644
--- a/macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.xib
+++ b/macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.xib
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6246" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6249" systemVersion="14A386b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6246"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6249"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="Bladesio1PluginConfigController">
@@ -17,16 +17,16 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="BladeSIO1 Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window">
- <windowStyleMask key="styleMask" titled="YES" miniaturizable="YES"/>
+ <window title="BladeSIO1 Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="alertPanel" id="5" userLabel="Window">
+ <windowStyleMask key="styleMask" titled="YES"/>
<rect key="contentRect" x="131" y="362" width="315" height="203"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
<view key="contentView" id="6">
<rect key="frame" x="0.0" y="0.0" width="315" height="203"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7">
- <rect key="frame" x="137" y="13" width="82" height="32"/>
+ <rect key="frame" x="135" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="186">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -39,7 +39,7 @@ Gw
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8">
- <rect key="frame" x="219" y="13" width="82" height="32"/>
+ <rect key="frame" x="218" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="187">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -147,7 +147,7 @@ DQ
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<button translatesAutoresizingMaskIntoConstraints="NO" id="194">
- <rect key="frame" x="16" y="166" width="57" height="22"/>
+ <rect key="frame" x="16" y="166" width="58" height="22"/>
<buttonCell key="cell" type="check" title="Enabled" bezelStyle="regularSquare" imagePosition="left" controlSize="mini" state="on" inset="2" id="195">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -157,7 +157,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="221">
- <rect key="frame" x="14" y="13" width="74" height="32"/>
+ <rect key="frame" x="14" y="13" width="76" height="32"/>
<buttonCell key="cell" type="push" title="Reset" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="222">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
diff --git a/macosx/plugins/DFCdrom/Base.lproj/DFCdromPluginConfig.xib b/macosx/plugins/DFCdrom/Base.lproj/DFCdromPluginConfig.xib
index 7f62b18f..79ec143a 100644
--- a/macosx/plugins/DFCdrom/Base.lproj/DFCdromPluginConfig.xib
+++ b/macosx/plugins/DFCdrom/Base.lproj/DFCdromPluginConfig.xib
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6246" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6249" systemVersion="14A386b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6246"/>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6249"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="DFCdromPluginConfigController">
@@ -14,36 +15,29 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="CDR-ROM Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window">
- <windowStyleMask key="styleMask" titled="YES" miniaturizable="YES"/>
- <rect key="contentRect" x="131" y="362" width="377" height="242"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+ <window title="CD-ROM Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="alertPanel" id="5" userLabel="Window">
+ <windowStyleMask key="styleMask" titled="YES"/>
+ <rect key="contentRect" x="131" y="362" width="377" height="235"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
<value key="minSize" type="size" width="377" height="238"/>
<view key="contentView" id="6">
- <rect key="frame" x="0.0" y="0.0" width="377" height="242"/>
+ <rect key="frame" x="0.0" y="0.0" width="377" height="235"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<box title="General Settings" translatesAutoresizingMaskIntoConstraints="NO" id="162">
- <rect key="frame" x="17" y="132" width="343" height="90"/>
+ <rect key="frame" x="17" y="125" width="343" height="90"/>
<view key="contentView">
<rect key="frame" x="2" y="2" width="339" height="73"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="169">
- <rect key="frame" x="15" y="16" width="150" height="21"/>
- <buttonCell key="cell" type="check" title="Use Cached Reading" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="189">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- </button>
<popUpButton horizontalHuggingPriority="249" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="173">
- <rect key="frame" x="125" y="40" width="200" height="26"/>
- <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="190">
+ <rect key="frame" x="127" y="40" width="198" height="26"/>
+ <popUpButtonCell key="cell" type="push" title="Default" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="176" id="190">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="174">
<items>
- <menuItem title="Default" id="176"/>
+ <menuItem title="Default" state="on" id="176"/>
<menuItem title="1 X" tag="1" id="177"/>
<menuItem title="2 X" tag="2" id="175"/>
<menuItem title="4 X" tag="4" id="179"/>
@@ -55,13 +49,20 @@
</popUpButtonCell>
</popUpButton>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="266">
- <rect key="frame" x="15" y="46" width="106" height="17"/>
+ <rect key="frame" x="15" y="46" width="108" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="CD-ROM Speed:" id="267">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="169">
+ <rect key="frame" x="15" y="11" width="153" height="26"/>
+ <buttonCell key="cell" type="check" title="Use Cached Reading" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="189">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ </button>
</subviews>
</view>
<constraints>
@@ -71,20 +72,28 @@
<constraint firstItem="173" firstAttribute="leading" secondItem="266" secondAttribute="trailing" constant="8" symbolic="YES" id="FPY-Qc-N1f"/>
<constraint firstItem="266" firstAttribute="baseline" secondItem="173" secondAttribute="baseline" id="Ftj-Vv-kjA"/>
<constraint firstItem="266" firstAttribute="leading" secondItem="162" secondAttribute="leading" constant="16" id="XTz-Fk-3oB"/>
+ <constraint firstAttribute="bottom" secondItem="169" secondAttribute="bottom" constant="11" id="jRa-BT-een"/>
<constraint firstItem="169" firstAttribute="top" secondItem="173" secondAttribute="bottom" constant="8" symbolic="YES" id="n6F-ne-iWN"/>
- <constraint firstAttribute="bottom" secondItem="169" secondAttribute="bottom" constant="16" id="zLt-Jb-4q8"/>
</constraints>
<color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<box title="Misc" translatesAutoresizingMaskIntoConstraints="NO" id="164">
- <rect key="frame" x="17" y="56" width="343" height="72"/>
+ <rect key="frame" x="17" y="56" width="343" height="65"/>
<view key="contentView">
- <rect key="frame" x="2" y="2" width="339" height="55"/>
+ <rect key="frame" x="2" y="2" width="339" height="48"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jzm-F5-M7J">
+ <rect key="frame" x="15" y="22" width="110" height="17"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Cache Size:" id="MSf-Ad-auA">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
<slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="172">
- <rect key="frame" x="129" y="17" width="195" height="27"/>
+ <rect key="frame" x="129" y="10" width="195" height="27"/>
<constraints>
<constraint firstAttribute="width" constant="191" id="222"/>
</constraints>
@@ -92,29 +101,21 @@
<font key="font" size="12" name="Helvetica"/>
</sliderCell>
</slider>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jzm-F5-M7J">
- <rect key="frame" x="15" y="29" width="110" height="17"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Cache Size:" id="MSf-Ad-auA">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
</subviews>
</view>
<constraints>
<constraint firstAttribute="trailing" secondItem="172" secondAttribute="trailing" constant="16" id="241"/>
<constraint firstItem="172" firstAttribute="top" secondItem="164" secondAttribute="top" constant="28" id="1SZ-MD-TCY"/>
+ <constraint firstAttribute="bottom" secondItem="172" secondAttribute="bottom" constant="9" id="3VA-up-80n"/>
<constraint firstItem="Jzm-F5-M7J" firstAttribute="baseline" secondItem="172" secondAttribute="baseline" id="M64-If-woz"/>
<constraint firstItem="172" firstAttribute="leading" secondItem="Jzm-F5-M7J" secondAttribute="trailing" constant="8" symbolic="YES" id="NFN-dN-Z1o"/>
<constraint firstItem="Jzm-F5-M7J" firstAttribute="leading" secondItem="164" secondAttribute="leading" constant="16" id="b9u-7l-0XP"/>
- <constraint firstAttribute="bottom" secondItem="172" secondAttribute="bottom" constant="16" id="gIW-Le-xX9"/>
</constraints>
<color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="242">
- <rect key="frame" x="304" y="13" width="59" height="32"/>
+ <rect key="frame" x="280" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="243">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -127,7 +128,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="250">
- <rect key="frame" x="222" y="13" width="82" height="31"/>
+ <rect key="frame" x="197" y="13" width="83" height="31"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="251">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -152,6 +153,7 @@ Gw
<constraint firstAttribute="bottom" secondItem="164" secondAttribute="bottom" constant="60" id="247"/>
<constraint firstAttribute="trailing" secondItem="242" secondAttribute="trailing" constant="20" symbolic="YES" id="249"/>
<constraint firstItem="242" firstAttribute="leading" secondItem="250" secondAttribute="trailing" constant="12" symbolic="YES" id="252"/>
+ <constraint firstItem="242" firstAttribute="width" secondItem="250" secondAttribute="width" id="PfT-tY-cU5"/>
<constraint firstItem="250" firstAttribute="top" secondItem="164" secondAttribute="bottom" constant="20" symbolic="YES" id="V9l-qU-SI5"/>
<constraint firstItem="242" firstAttribute="baseline" secondItem="250" secondAttribute="baseline" id="sHP-yL-yOn"/>
</constraints>
diff --git a/macosx/plugins/DFSound/Resorces/Shared/Base.lproj/NetSfPeopsSpuPluginMain.xib b/macosx/plugins/DFSound/Resorces/Shared/Base.lproj/NetSfPeopsSpuPluginMain.xib
index c218457d..3a837214 100644
--- a/macosx/plugins/DFSound/Resorces/Shared/Base.lproj/NetSfPeopsSpuPluginMain.xib
+++ b/macosx/plugins/DFSound/Resorces/Shared/Base.lproj/NetSfPeopsSpuPluginMain.xib
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6246" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6249" systemVersion="14A386b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6246"/>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6249"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="SPUPluginController">
@@ -18,10 +19,10 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="SPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="6" userLabel="Configuration">
- <windowStyleMask key="styleMask" titled="YES" miniaturizable="YES"/>
+ <window title="SPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="6" userLabel="Configuration">
+ <windowStyleMask key="styleMask" titled="YES"/>
<rect key="contentRect" x="128" y="348" width="466" height="316"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
<view key="contentView" id="5">
<rect key="frame" x="0.0" y="0.0" width="466" height="316"/>
<autoresizingMask key="autoresizingMask"/>
@@ -238,7 +239,7 @@
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="162">
- <rect key="frame" x="370" y="13" width="82" height="32"/>
+ <rect key="frame" x="369" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="163">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -251,7 +252,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="166">
- <rect key="frame" x="288" y="13" width="82" height="32"/>
+ <rect key="frame" x="286" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="167">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -264,7 +265,7 @@ Gw
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="171">
- <rect key="frame" x="14" y="13" width="74" height="32"/>
+ <rect key="frame" x="14" y="13" width="76" height="32"/>
<buttonCell key="cell" type="push" title="Reset" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="172">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
diff --git a/macosx/plugins/DFXVideo/Base.lproj/NetSfPeopsSoftGPUConfig.xib b/macosx/plugins/DFXVideo/Base.lproj/NetSfPeopsSoftGPUConfig.xib
index a2bbcece..751b2716 100644
--- a/macosx/plugins/DFXVideo/Base.lproj/NetSfPeopsSoftGPUConfig.xib
+++ b/macosx/plugins/DFXVideo/Base.lproj/NetSfPeopsSoftGPUConfig.xib
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6246" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6249" systemVersion="14A386b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6246"/>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6249"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NetSfPeopsSoftGPUPluginConfigController">
@@ -28,22 +29,22 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="GPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window">
- <windowStyleMask key="styleMask" titled="YES" miniaturizable="YES"/>
- <rect key="contentRect" x="411" y="163" width="480" height="583"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+ <window title="GPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window">
+ <windowStyleMask key="styleMask" titled="YES"/>
+ <rect key="contentRect" x="411" y="163" width="480" height="585"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
<view key="contentView" id="6">
- <rect key="frame" x="0.0" y="0.0" width="480" height="583"/>
+ <rect key="frame" x="0.0" y="0.0" width="480" height="585"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<box title="Hacks" translatesAutoresizingMaskIntoConstraints="NO" id="76">
- <rect key="frame" x="17" y="197" width="446" height="188"/>
+ <rect key="frame" x="17" y="197" width="446" height="190"/>
<view key="contentView">
- <rect key="frame" x="2" y="2" width="442" height="171"/>
+ <rect key="frame" x="2" y="2" width="442" height="173"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="74">
- <rect key="frame" x="46" y="119" width="350" height="42"/>
+ <rect key="frame" x="43" y="135" width="357" height="28"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="center" id="162">
<font key="font" metaFont="smallSystem"/>
<string key="title">Only enable a hack to fix a specific problem in a game.
@@ -53,7 +54,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
</textFieldCell>
</textField>
<matrix verticalHuggingPriority="750" mode="highlight" allowsEmptySelection="NO" autosizesCells="NO" translatesAutoresizingMaskIntoConstraints="NO" id="530">
- <rect key="frame" x="27" y="13" width="388" height="98"/>
+ <rect key="frame" x="27" y="29" width="388" height="98"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<size key="cellSize" width="192" height="18"/>
<size key="intercellSpacing" width="4" height="2"/>
@@ -121,7 +122,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<box title="Display Settings" translatesAutoresizingMaskIntoConstraints="NO" id="89">
- <rect key="frame" x="17" y="389" width="234" height="174"/>
+ <rect key="frame" x="17" y="391" width="234" height="174"/>
<view key="contentView">
<rect key="frame" x="2" y="2" width="230" height="157"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -135,21 +136,21 @@ Hold the mouse over a checkbox to get more information about it.</string>
</buttonCell>
</button>
<button toolTip="Skip rendering frames to improve overall speed when needed. This setting might cause compatibility problems" translatesAutoresizingMaskIntoConstraints="NO" id="96">
- <rect key="frame" x="18" y="111" width="146" height="18"/>
+ <rect key="frame" x="18" y="111" width="147" height="18"/>
<buttonCell key="cell" type="check" title="Use Frame Skipping" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="173">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button toolTip="When Enabled a small counter will show the current performance of the rendering measured in Frames Per Second (FPS)" translatesAutoresizingMaskIntoConstraints="NO" id="97">
- <rect key="frame" x="18" y="131" width="148" height="18"/>
+ <rect key="frame" x="18" y="131" width="150" height="18"/>
<buttonCell key="cell" type="check" title="Display FPS Counter" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="174">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button hidden="YES" toolTip="Automatically enter full screen mode" translatesAutoresizingMaskIntoConstraints="NO" id="99">
- <rect key="frame" x="18" y="91" width="125" height="18"/>
+ <rect key="frame" x="18" y="91" width="124" height="18"/>
<buttonCell key="cell" type="check" title="Auto Full Screen" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="175">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -196,13 +197,13 @@ Hold the mouse over a checkbox to get more information about it.</string>
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<box title="Rendering" translatesAutoresizingMaskIntoConstraints="NO" id="107">
- <rect key="frame" x="253" y="389" width="210" height="174"/>
+ <rect key="frame" x="253" y="391" width="210" height="174"/>
<view key="contentView">
<rect key="frame" x="2" y="2" width="206" height="157"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField toolTip="Specify when to use dithering to render colors" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="112">
- <rect key="frame" x="15" y="134" width="106" height="17"/>
+ <rect key="frame" x="15" y="134" width="105" height="17"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Dither Graphics:" id="176">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -211,12 +212,12 @@ Hold the mouse over a checkbox to get more information about it.</string>
</textField>
<popUpButton toolTip="Specify when to use dithering to render colors" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="116">
<rect key="frame" x="15" y="102" width="177" height="26"/>
- <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="177">
+ <popUpButtonCell key="cell" type="push" title="Never" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="111" id="177">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="113">
<items>
- <menuItem title="Never" id="111"/>
+ <menuItem title="Never" state="on" id="111"/>
<menuItem title="When Hinted" id="115"/>
<menuItem title="Always" id="114"/>
</items>
@@ -224,7 +225,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
</popUpButtonCell>
</popUpButton>
<button toolTip="Enable use of the hacks specified below" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="117">
- <rect key="frame" x="15" y="81" width="117" height="18"/>
+ <rect key="frame" x="15" y="81" width="119" height="18"/>
<buttonCell key="cell" type="check" title="Enable Hacks" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="178">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -234,7 +235,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
</connections>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="180">
- <rect key="frame" x="15" y="61" width="117" height="18"/>
+ <rect key="frame" x="15" y="61" width="119" height="18"/>
<buttonCell key="cell" type="check" title="Enable Shaders" bezelStyle="regularSquare" imagePosition="left" inset="2" id="181">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -252,6 +253,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
<constraint firstItem="180" firstAttribute="top" secondItem="117" secondAttribute="bottom" constant="6" symbolic="YES" id="591"/>
<constraint firstAttribute="trailing" secondItem="116" secondAttribute="trailing" constant="16" id="592"/>
<constraint firstItem="180" firstAttribute="trailing" secondItem="117" secondAttribute="trailing" id="593"/>
+ <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="180" secondAttribute="bottom" constant="11" id="69Z-zB-3Xd"/>
<constraint firstItem="117" firstAttribute="leading" secondItem="180" secondAttribute="leading" id="E8l-1O-t2W"/>
<constraint firstItem="117" firstAttribute="top" secondItem="116" secondAttribute="bottom" constant="8" symbolic="YES" id="edX-A9-gv2"/>
<constraint firstItem="117" firstAttribute="leading" secondItem="112" secondAttribute="leading" id="rCK-rd-Jyw"/>
@@ -267,7 +269,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="182">
- <rect key="frame" x="335" y="82" width="101" height="32"/>
+ <rect key="frame" x="334" y="82" width="102" height="32"/>
<buttonCell key="cell" type="push" title="Select..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="183">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -277,7 +279,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
</connections>
</button>
<button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="184">
- <rect key="frame" x="335" y="49" width="101" height="32"/>
+ <rect key="frame" x="334" y="49" width="102" height="32"/>
<buttonCell key="cell" type="push" title="Select..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="185">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -287,7 +289,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
</connections>
</button>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="186">
- <rect key="frame" x="88" y="92" width="247" height="17"/>
+ <rect key="frame" x="87" y="92" width="247" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="243" id="255"/>
</constraints>
@@ -298,7 +300,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="188">
- <rect key="frame" x="88" y="59" width="247" height="17"/>
+ <rect key="frame" x="87" y="59" width="247" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="189">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -306,7 +308,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="194">
- <rect key="frame" x="16" y="92" width="68" height="17"/>
+ <rect key="frame" x="16" y="92" width="67" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Vertex:" id="195">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -314,7 +316,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="196">
- <rect key="frame" x="16" y="59" width="68" height="17"/>
+ <rect key="frame" x="16" y="59" width="67" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Fragment:" id="197">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -322,16 +324,16 @@ Hold the mouse over a checkbox to get more information about it.</string>
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="219">
- <rect key="frame" x="88" y="20" width="100" height="26"/>
+ <rect key="frame" x="87" y="20" width="100" height="26"/>
<constraints>
<constraint firstAttribute="width" constant="95" id="279"/>
</constraints>
- <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="220">
+ <popUpButtonCell key="cell" type="push" title="1.0" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="222" id="220">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="221">
<items>
- <menuItem title="1.0" tag="1" id="222">
+ <menuItem title="1.0" state="on" tag="1" id="222">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<menuItem title="2.0" tag="2" id="223">
@@ -346,7 +348,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
</popUpButtonCell>
</popUpButton>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="225">
- <rect key="frame" x="16" y="26" width="68" height="17"/>
+ <rect key="frame" x="16" y="26" width="67" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Quality:" id="226">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -394,7 +396,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="371">
- <rect key="frame" x="384" y="13" width="82" height="32"/>
+ <rect key="frame" x="383" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="372">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -407,7 +409,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="375">
- <rect key="frame" x="302" y="13" width="82" height="32"/>
+ <rect key="frame" x="300" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="376">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -420,7 +422,7 @@ Gw
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="381">
- <rect key="frame" x="14" y="13" width="74" height="32"/>
+ <rect key="frame" x="14" y="13" width="76" height="32"/>
<buttonCell key="cell" type="push" title="Reset" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="382">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -458,6 +460,7 @@ Gw
<outlet property="delegate" destination="-2" id="142"/>
<outlet property="initialFirstResponder" destination="97" id="145"/>
</connections>
+ <point key="canvasLocation" x="322" y="400.5"/>
</window>
</objects>
</document>
diff --git a/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib b/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib
index ea57f1dd..63328813 100644
--- a/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib
+++ b/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6246" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6249" systemVersion="14A386b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6246"/>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6249"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NetSfPeopsSoftGPUPluginWindowController">
@@ -12,10 +13,10 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="PeopsSoftGL Display" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window" customClass="NetSfPeopsSoftGPUPluginWindow">
+ <window title="PeopsSoftGL Display" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window" customClass="NetSfPeopsSoftGPUPluginWindow">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" texturedBackground="YES"/>
<rect key="contentRect" x="6" y="240" width="640" height="480"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
<value key="minSize" type="size" width="640" height="480"/>
<view key="contentView" id="6">
<rect key="frame" x="0.0" y="0.0" width="640" height="480"/>
diff --git a/macosx/plugins/DFXVideo/gpuPeteOGL2.slv b/macosx/plugins/DFXVideo/gpuPeteOGL2.slv
index 49f6bd27..4f5f44eb 100755
--- a/macosx/plugins/DFXVideo/gpuPeteOGL2.slv
+++ b/macosx/plugins/DFXVideo/gpuPeteOGL2.slv
@@ -6,21 +6,21 @@ uniform vec4 OGL2Size;
void main()
{
-float x = (OGL2Size.x/2048.0)*OGL2Param.x;
-float y = (OGL2Size.y/1024.0)*OGL2Param.y;
-vec2 dg1 = vec2( x,y);
-vec2 dg2 = vec2(-x,y);
-vec2 dx = vec2(x,0.0);
-vec2 dy = vec2(0.0,y);
-gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-gl_TexCoord[0] = gl_MultiTexCoord0;
-gl_TexCoord[6].zw= gl_MultiTexCoord1.xy;
-gl_TexCoord[1].xy = gl_TexCoord[0].xy - dy;
-gl_TexCoord[2].xy = gl_TexCoord[0].xy + dy;
-gl_TexCoord[3].xy = gl_TexCoord[0].xy - dx;
-gl_TexCoord[4].xy = gl_TexCoord[0].xy + dx;
-gl_TexCoord[5].xy = gl_TexCoord[0].xy - dg1;
-gl_TexCoord[6].xy = gl_TexCoord[0].xy + dg1;
-gl_TexCoord[1].zw = gl_TexCoord[0].xy - dg2;
-gl_TexCoord[2].zw = gl_TexCoord[0].xy + dg2;
+ float x = (OGL2Size.x/2048.0)*OGL2Param.x;
+ float y = (OGL2Size.y/1024.0)*OGL2Param.y;
+ vec2 dg1 = vec2( x,y);
+ vec2 dg2 = vec2(-x,y);
+ vec2 dx = vec2(x,0.0);
+ vec2 dy = vec2(0.0,y);
+ gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+ gl_TexCoord[0] = gl_MultiTexCoord0;
+ gl_TexCoord[6].zw= gl_MultiTexCoord1.xy;
+ gl_TexCoord[1].xy = gl_TexCoord[0].xy - dy;
+ gl_TexCoord[2].xy = gl_TexCoord[0].xy + dy;
+ gl_TexCoord[3].xy = gl_TexCoord[0].xy - dx;
+ gl_TexCoord[4].xy = gl_TexCoord[0].xy + dx;
+ gl_TexCoord[5].xy = gl_TexCoord[0].xy - dg1;
+ gl_TexCoord[6].xy = gl_TexCoord[0].xy + dg1;
+ gl_TexCoord[1].zw = gl_TexCoord[0].xy - dg2;
+ gl_TexCoord[2].zw = gl_TexCoord[0].xy + dg2;
}
diff --git a/macosx/plugins/PeopsXgl/Base.lproj/NetSfPeopsOpenGLConfig.xib b/macosx/plugins/PeopsXgl/Base.lproj/NetSfPeopsOpenGLConfig.xib
index cc35d806..4ee1cde3 100644
--- a/macosx/plugins/PeopsXgl/Base.lproj/NetSfPeopsOpenGLConfig.xib
+++ b/macosx/plugins/PeopsXgl/Base.lproj/NetSfPeopsOpenGLConfig.xib
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6246" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6249" systemVersion="14A386b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6246"/>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6249"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NetSfPeopsOpenGLPluginConfigController">
@@ -38,10 +39,10 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="GPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window">
- <windowStyleMask key="styleMask" titled="YES" miniaturizable="YES"/>
+ <window title="GPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="alertPanel" id="5" userLabel="Window">
+ <windowStyleMask key="styleMask" titled="YES"/>
<rect key="contentRect" x="2" y="373" width="611" height="501"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
<view key="contentView" id="6">
<rect key="frame" x="0.0" y="0.0" width="611" height="501"/>
<autoresizingMask key="autoresizingMask"/>
@@ -135,14 +136,14 @@
</textFieldCell>
</textField>
<button toolTip="When checked, will keep the PSX display at natural aspect ratio" translatesAutoresizingMaskIntoConstraints="NO" id="910">
- <rect key="frame" x="15" y="82" width="155" height="23"/>
+ <rect key="frame" x="15" y="87" width="153" height="18"/>
<buttonCell key="cell" type="check" title="Resize Proportionally" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="919">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="911">
- <rect key="frame" x="196" y="17" width="90" height="32"/>
+ <rect key="frame" x="194" y="22" width="92" height="32"/>
<buttonCell key="cell" type="push" title="Hacks…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="918">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -152,7 +153,7 @@
</connections>
</button>
<form verticalHuggingPriority="750" mode="track" allowsEmptySelection="NO" translatesAutoresizingMaskIntoConstraints="NO" id="912">
- <rect key="frame" x="17" y="24" width="126" height="52"/>
+ <rect key="frame" x="17" y="29" width="126" height="52"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<size key="cellSize" width="126" height="22"/>
<size key="intercellSpacing" width="1" height="8"/>
@@ -195,8 +196,8 @@
<constraint firstItem="910" firstAttribute="leading" secondItem="89" secondAttribute="leading" constant="16" id="948"/>
<constraint firstItem="785" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="911" secondAttribute="trailing" constant="8" symbolic="YES" id="GwH-kn-rLW"/>
<constraint firstItem="911" firstAttribute="trailing" secondItem="908" secondAttribute="trailing" id="Kvw-mi-0pm"/>
- <constraint firstAttribute="bottom" secondItem="912" secondAttribute="bottom" constant="22" id="YZu-mL-ucP"/>
- <constraint firstAttribute="bottom" secondItem="785" secondAttribute="bottom" constant="24" id="slk-vo-UJi"/>
+ <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="912" secondAttribute="bottom" constant="11" id="YZu-mL-ucP"/>
+ <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="785" secondAttribute="bottom" constant="11" id="slk-vo-UJi"/>
</constraints>
<color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -208,7 +209,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField toolTip="Specify when to use dithering to render colors" horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="671" translatesAutoresizingMaskIntoConstraints="NO" id="112">
- <rect key="frame" x="15" y="219" width="125" height="17"/>
+ <rect key="frame" x="15" y="219" width="122" height="17"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Dither Graphics:" id="383">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -216,7 +217,7 @@
</textFieldCell>
</textField>
<popUpButton toolTip="Specify when to use dithering to render colors" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="116">
- <rect key="frame" x="144" y="213" width="174" height="26"/>
+ <rect key="frame" x="141" y="213" width="174" height="26"/>
<constraints>
<constraint firstAttribute="width" constant="169" id="624"/>
</constraints>
@@ -233,7 +234,7 @@
</popUpButtonCell>
</popUpButton>
<popUpButton toolTip="Use offscreen drawing to remove some graphics glitches" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="202">
- <rect key="frame" x="144" y="182" width="174" height="26"/>
+ <rect key="frame" x="141" y="182" width="174" height="26"/>
<popUpButtonCell key="cell" type="push" title="Default" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="206" id="393">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
@@ -249,7 +250,7 @@
</popUpButtonCell>
</popUpButton>
<textField toolTip="Use offscreen drawing to remove some graphics glitches" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="207">
- <rect key="frame" x="15" y="188" width="125" height="17"/>
+ <rect key="frame" x="15" y="188" width="122" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="Frr-gU-j9s"/>
</constraints>
@@ -492,7 +493,7 @@
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="665">
- <rect key="frame" x="14" y="13" width="74" height="32"/>
+ <rect key="frame" x="14" y="13" width="76" height="32"/>
<buttonCell key="cell" type="push" title="Reset" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="666">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -502,7 +503,7 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="670">
- <rect key="frame" x="515" y="13" width="82" height="32"/>
+ <rect key="frame" x="514" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="671">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -515,7 +516,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="674">
- <rect key="frame" x="433" y="13" width="82" height="32"/>
+ <rect key="frame" x="431" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="675">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -549,10 +550,10 @@ Gw
<outlet property="delegate" destination="-2" id="142"/>
</connections>
</window>
- <window title="Hacks" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="472">
+ <window title="Hacks" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="472">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<rect key="contentRect" x="196" y="207" width="501" height="339"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
<view key="contentView" id="473">
<rect key="frame" x="0.0" y="0.0" width="501" height="339"/>
<autoresizingMask key="autoresizingMask"/>
@@ -663,7 +664,7 @@ Gw
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="475">
- <rect key="frame" x="69" y="269" width="363" height="28"/>
+ <rect key="frame" x="72" y="269" width="357" height="28"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="center" id="478">
<font key="font" metaFont="smallSystem"/>
<string key="title">Only enable a hack to fix a specific problem in a game.
@@ -673,7 +674,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
</textFieldCell>
</textField>
<button translatesAutoresizingMaskIntoConstraints="NO" id="476">
- <rect key="frame" x="198" y="303" width="105" height="18"/>
+ <rect key="frame" x="197" y="303" width="107" height="18"/>
<constraints>
<constraint firstAttribute="height" constant="14" id="Iht-O0-ydA"/>
</constraints>
@@ -686,7 +687,7 @@ Hold the mouse over a checkbox to get more information about it.</string>
</connections>
</button>
<button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="501">
- <rect key="frame" x="405" y="13" width="82" height="32"/>
+ <rect key="frame" x="404" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="502">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -699,7 +700,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="503">
- <rect key="frame" x="323" y="13" width="82" height="32"/>
+ <rect key="frame" x="321" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="504">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
diff --git a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib
index c679c81f..18cb8133 100644
--- a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib
+++ b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6246" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6249" systemVersion="14A386b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6246"/>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6249"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NetSfPeopsSoftGPUPluginWindowController">
@@ -12,7 +13,7 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="PeopsOpenGL Display" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window" customClass="NetSfPeopsOpenGLGPUPluginWindow">
+ <window title="PeopsOpenGL Display" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" visibleAtLaunch="NO" animationBehavior="documentWindow" id="5" userLabel="Window" customClass="NetSfPeopsOpenGLGPUPluginWindow">
<windowStyleMask key="styleMask" closable="YES" resizable="YES"/>
<rect key="contentRect" x="108" y="331" width="640" height="480"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-08 22:47:30 +0000