Overview
| Comment: | Make OFColor a proper class cluster |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
ea9b62035b76f8d31987bd978fde9f7b |
| User & Date: | js on 2023-08-08 21:16:22 |
| Other Links: | manifest | tags |
Context
|
2023-08-09
| ||
| 08:14 | Add OFSubdata (check-in: d1a8c88dc6 user: js tags: trunk) | |
|
2023-08-08
| ||
| 21:16 | Make OFColor a proper class cluster (check-in: ea9b62035b user: js tags: trunk) | |
| 21:06 | Make OFDate a proper class cluster (check-in: 3865cc5695 user: js tags: trunk) | |
Changes
Modified src/OFColor.h from [de724e96d7] to [180c6dda05].
| ︙ | ︙ | |||
19 20 21 22 23 24 25 | /** * @class OFColor OFColor.h ObjFW/OFColor.h * * @brief A class for storing a color. */ @interface OFColor: OFObject | < < < < < | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | /** * @class OFColor OFColor.h ObjFW/OFColor.h * * @brief A class for storing a color. */ @interface OFColor: OFObject #ifdef OF_HAVE_CLASS_PROPERTIES @property (class, readonly, nonatomic) OFColor *black; @property (class, readonly, nonatomic) OFColor *silver; @property (class, readonly, nonatomic) OFColor *grey; @property (class, readonly, nonatomic) OFColor *white; @property (class, readonly, nonatomic) OFColor *maroon; @property (class, readonly, nonatomic) OFColor *red; |
| ︙ | ︙ |
Modified src/OFColor.m from [321947787c] to [dd91316e5c].
| ︙ | ︙ | |||
19 20 21 22 23 24 25 | #import "OFColor.h" #import "OFOnce.h" #import "OFString.h" #import "OFInvalidArgumentException.h" | | > | > > | < < < < < < < < < < < < < < < < < < < < < | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 |
#import "OFColor.h"
#import "OFOnce.h"
#import "OFString.h"
#import "OFInvalidArgumentException.h"
@interface OFConcreteColor: OFColor
{
float _red, _green, _blue, _alpha;
OF_RESERVE_IVARS(OFColor, 4)
}
@end
@interface OFColorSingleton: OFConcreteColor
@end
@interface OFColorPlaceholder: OFColorSingleton
@end
#ifdef OF_OBJFW_RUNTIME
@interface OFTaggedPointerColor: OFColorSingleton
@end
static const float allowedImprecision = 0.0000001;
#endif
static struct {
Class isa;
} placeholder;
#ifdef OF_OBJFW_RUNTIME
static int colorTag;
#endif
@implementation OFColorPlaceholder
- (instancetype)initWithRed: (float)red
green: (float)green
blue: (float)blue
alpha: (float)alpha
{
#ifdef OF_OBJFW_RUNTIME
|
| ︙ | ︙ | |||
88 89 90 91 92 93 94 | (uintptr_t)blueInt); if (ret != nil) return ret; } #endif | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 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 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 |
(uintptr_t)blueInt);
if (ret != nil)
return ret;
}
#endif
return (id)[[OFConcreteColor alloc] initWithRed: red
green: green
blue: blue
alpha: alpha];
}
@end
@implementation OFColorSingleton
- (instancetype)autorelease
{
return self;
}
- (instancetype)retain
{
return self;
}
- (void)release
{
}
- (unsigned int)retainCount
{
return OFMaxRetainCount;
}
@end
@implementation OFConcreteColor
- (instancetype)initWithRed: (float)red
green: (float)green
blue: (float)blue
alpha: (float)alpha
{
self = [super init];
@try {
if (red < 0.0 || red > 1.0 ||
green < 0.0 || green > 1.0 ||
blue < 0.0 || blue > 1.0 ||
alpha < 0.0 || alpha > 1.0)
@throw [OFInvalidArgumentException exception];
_red = red;
_green = green;
_blue = blue;
_alpha = alpha;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)getRed: (float *)red
green: (float *)green
blue: (float *)blue
alpha: (float *)alpha
{
*red = _red;
*green = _green;
*blue = _blue;
if (alpha != NULL)
*alpha = _alpha;
}
@end
#ifdef OF_OBJFW_RUNTIME
@implementation OFTaggedPointerColor
- (void)getRed: (float *)red
green: (float *)green
|
| ︙ | ︙ | |||
127 128 129 130 131 132 133 | object_setClass((id)&placeholder, [OFColorPlaceholder class]); #ifdef OF_OBJFW_RUNTIME colorTag = objc_registerTaggedPointerClass([OFTaggedPointerColor class]); #endif } | < < < < < | 171 172 173 174 175 176 177 178 179 180 181 182 183 184 |
object_setClass((id)&placeholder, [OFColorPlaceholder class]);
#ifdef OF_OBJFW_RUNTIME
colorTag =
objc_registerTaggedPointerClass([OFTaggedPointerColor class]);
#endif
}
+ (instancetype)alloc
{
if (self == [OFColor class])
return (id)&placeholder;
return [super alloc];
}
|
| ︙ | ︙ | |||
194 195 196 197 198 199 200 |
}
- (instancetype)initWithRed: (float)red
green: (float)green
blue: (float)blue
alpha: (float)alpha
{
| < | | < < < < < | < < < < | | | | > > > | > > > > > > > | | | | > > > | > > > > | | < < < < < < < | < < | 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 |
}
- (instancetype)initWithRed: (float)red
green: (float)green
blue: (float)blue
alpha: (float)alpha
{
if ([self isMemberOfClass: [OFColor class]]) {
@try {
[self doesNotRecognizeSelector: _cmd];
} @catch (id e) {
[self release];
@throw e;
}
abort();
}
return [super init];
}
- (bool)isEqual: (id)object
{
OFColor *other;
float red, green, blue, alpha;
float otherRed, otherGreen, otherBlue, otherAlpha;
if (object == self)
return true;
if (![object isKindOfClass: [OFColor class]])
return false;
other = object;
[self getRed: &red green: &green blue: &blue alpha: &alpha];
[other getRed: &otherRed
green: &otherGreen
blue: &otherBlue
alpha: &otherAlpha];
if (otherRed != red)
return false;
if (otherGreen != green)
return false;
if (otherBlue != blue)
return false;
if (otherAlpha != alpha)
return false;
return true;
}
- (unsigned long)hash
{
float red, green, blue, alpha;
unsigned long hash;
float tmp;
[self getRed: &red green: &green blue: &blue alpha: &alpha];
OFHashInit(&hash);
tmp = OFToLittleEndianFloat(red);
for (uint_fast8_t i = 0; i < sizeof(float); i++)
OFHashAddByte(&hash, ((char *)&tmp)[i]);
tmp = OFToLittleEndianFloat(green);
for (uint_fast8_t i = 0; i < sizeof(float); i++)
OFHashAddByte(&hash, ((char *)&tmp)[i]);
tmp = OFToLittleEndianFloat(blue);
for (uint_fast8_t i = 0; i < sizeof(float); i++)
OFHashAddByte(&hash, ((char *)&tmp)[i]);
tmp = OFToLittleEndianFloat(alpha);
for (uint_fast8_t i = 0; i < sizeof(float); i++)
OFHashAddByte(&hash, ((char *)&tmp)[i]);
OFHashFinalize(&hash);
return hash;
}
- (void)getRed: (float *)red
green: (float *)green
blue: (float *)blue
alpha: (float *)alpha
{
OF_UNRECOGNIZED_SELECTOR
}
- (OFString *)description
{
float red, green, blue, alpha;
[self getRed: &red green: &green blue: &blue alpha: &alpha];
return [OFString stringWithFormat:
@"<%@ red=%f green=%f blue=%f alpha=%f>",
self.class, red, green, blue, alpha];
}
@end
|