ObjFW  Diff

Differences From Artifact [b6f18a05d5]:

To Artifact [d2411fda9b]:


47
48
49
50
51
52
53
54

55
56
57
58
59
60
61
47
48
49
50
51
52
53

54
55
56
57
58
59
60
61







-
+







	if (value >= center)
		return (value - center) / (max - center);
	else
		return (value - center) / (center - min);
}

@implementation OHWiiGameController
@synthesize rawProfile = _rawProfile;
@synthesize profile = _profile;

+ (void)initialize
{
	if (self != [OHWiiGameController class])
		return;

	if (WPAD_Init() != WPAD_ERR_NONE)
91
92
93
94
95
96
97
98

99
100

101
102

103
104
105
106
107
108
109
110
111
112
113
114
115

116
117
118
119
120
121
122
123


124
125
126
127
128
129
130
91
92
93
94
95
96
97

98
99

100
101

102
103
104
105
106
107
108
109
110
111
112
113
114

115
116
117
118
119
120
121


122
123
124
125
126
127
128
129
130







-
+

-
+

-
+












-
+






-
-
+
+







	self = [super init];

	@try {
		_index = index;
		_type = type;

		if (type == WPAD_EXP_CLASSIC)
			_rawProfile = [[OHWiiClassicController alloc] init];
			_profile = [[OHWiiClassicController alloc] init];
		else if (type == WPAD_EXP_NUNCHUK)
			_rawProfile = [[OHWiimoteWithNunchuk alloc] init];
			_profile = [[OHWiimoteWithNunchuk alloc] init];
		else
			_rawProfile = [[OHWiimote alloc] init];
			_profile = [[OHWiimote alloc] init];

		[self retrieveState];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}

- (void)dealloc
{
	[_rawProfile release];
	[_profile release];

	[super dealloc];
}

- (void)retrieveState
{
	OFDictionary *buttons = _rawProfile.buttons;
	OFDictionary *directionalPads = _rawProfile.directionalPads;
	OFDictionary *buttons = _profile.buttons;
	OFDictionary *directionalPads = _profile.directionalPads;
	WPADData *data;

	if (WPAD_ReadPending(_index, NULL) < WPAD_ERR_NONE)
		@throw [OFReadFailedException
		    exceptionWithObject: self
			requestedLength: sizeof(WPADData)
				  errNo: 0];
237
238
239
240
241
242
243
244

245
246
247
248
249
250
251
252

253
254
255
256
237
238
239
240
241
242
243

244
245
246
247
248
249
250
251

252
253
254
255
256







-
+







-
+




	else
		return @"Wiimote";
}

- (id <OHGamepad>)gamepad
{
	if (_type == WPAD_EXP_CLASSIC)
		return (id <OHGamepad>)_rawProfile;
		return (id <OHGamepad>)_profile;

	return nil;
}

- (id <OHExtendedGamepad>)extendedGamepad
{
	if (_type == WPAD_EXP_CLASSIC)
		return (id <OHExtendedGamepad>)_rawProfile;
		return (id <OHExtendedGamepad>)_profile;

	return nil;
}
@end