ObjFW  Check-in [db7991d07b]

Overview
Comment:OFVector3D -> OFPoint3D

For now, we're only interested in transformed points.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: db7991d07b5b2b0d235c30fd43623e73626b3a4b6708f87f466769d11064000e
User & Date: js on 2023-02-16 19:59:20
Other Links: manifest | tags
Context
2023-02-16
21:37
OFMatrix4x4: Add translation and scaling check-in: 3e4ed4e59f user: js tags: trunk
19:59
OFVector3D -> OFPoint3D check-in: db7991d07b user: js tags: trunk
2023-02-15
21:54
OFMatrix4x4: Add -[transformedVector3D:] check-in: 1e550fabe3 user: js tags: trunk
Changes

Modified src/OFMatrix4x4.h from [6444eb96ee] to [32857d56d5].

68
69
70
71
72
73
74
75

76
77
78
79
80
81
82
83
84


85
86

87
88
89
68
69
70
71
72
73
74

75
76








77
78
79

80
81
82
83







-
+

-
-
-
-
-
-
-
-
+
+

-
+



 *	  and the receiver on the right side.
 *
 * @param matrix The matrix to multiply the receiver with
 */
- (void)multiplyWithMatrix: (OFMatrix4x4 *)matrix;

/**
 * @brief Transforms the specified 3D vector according to the matrix.
 * @brief Transforms the specified point in 3D space according to the matrix.
 *
 * As multiplying a 4x4 matrix with a 3D vector is not defined, this extends
 * the 3D vector to a 4D vector with its `w` value being set to 0 and just
 * discards the `w` value of the resulting 4D vector for the returned 3D
 * vector. This allows reducing the number number of calculations performed and
 * is mostly useful for 3D graphics.
 *
 * @param vector The 3D vector to transform
 * @return The transformed 3D vector
 * @param point The point to transform
 * @return The transformed point
 */
- (OFVector3D)transformedVector3D: (OFVector3D)vector;
- (OFPoint3D)transformedPoint3D: (OFPoint3D)point;
@end

OF_ASSUME_NONNULL_END

Modified src/OFMatrix4x4.m from [97bdb88364] to [630e704e06].

180
181
182
183
184
185
186
187

188
189
190
191
192
193
194
195







196
197
198
199
200
201
202
180
181
182
183
184
185
186

187
188







189
190
191
192
193
194
195
196
197
198
199
200
201
202







-
+

-
-
-
-
-
-
-
+
+
+
+
+
+
+







	    matrix->_values[14] * copy[15];
	_values[15] = matrix->_values[3] * copy[12] +
	    matrix->_values[7] * copy[13] +
	    matrix->_values[11] * copy[14] +
	    matrix->_values[15] * copy[15];
}

- (OFVector3D)transformedVector3D: (OFVector3D)vector
- (OFPoint3D)transformedPoint3D: (OFPoint3D)point
{
	return OFMakeVector3D(
	    _values[0] * vector.x + _values[4] * vector.y +
	    _values[8] * vector.z,
	    _values[1] * vector.x + _values[5] * vector.y +
	    _values[9] * vector.z,
	    _values[2] * vector.x + _values[6] * vector.y +
	    _values[10] * vector.z);
	return OFMakePoint3D(
	    _values[0] * point.x + _values[4] * point.y +
	    _values[8] * point.z + _values[12],
	    _values[1] * point.x + _values[5] * point.y +
	    _values[9] * point.z + _values[13],
	    _values[2] * point.x + _values[6] * point.y +
	    _values[10] * point.z + _values[14]);
}

- (OFString *)description
{
	return [OFString stringWithFormat:
	    @"<OFMatrix4x4: {\n"
	    @"\t%g %g %g %g\n"

Modified src/OFObject.h from [06e4bde8d0] to [01a23b3a57].

151
152
153
154
155
156
157
158

159
160
161
162
163
164
165
151
152
153
154
155
156
157

158
159
160
161
162
163
164
165







-
+







 * @brief A time interval in seconds.
 */
typedef double OFTimeInterval;

/**
 * @struct OFPoint OFObject.h ObjFW/OFObject.h
 *
 * @brief A point.
 * @brief A point in 2D space.
 */
typedef struct OF_BOXABLE {
	/** The x coordinate of the point */
	float x;
	/** The y coordinate of the point */
	float y;
} OFPoint;
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
335
336

337
338

339
340
341

342
343
344

345
346
347
348
349
350
351
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
335

336
337

338
339
340

341
342
343

344
345
346
347
348
349
350
351







-
+

-
+


-
+

-
+

-
+

-
+


-
+

-
-
-
-
+
+
+
+

-
-
+
+

-
+

-
+



-
+

-
-
-
+
+
+


-
+

-
+


-
+


-
+







	if (!OFEqualSizes(rect1.size, rect2.size))
		return false;

	return true;
}

/**
 * @struct OFVector3D OFObject.h ObjFW/OFObject.h
 * @struct OFPoint3D OFObject.h ObjFW/OFObject.h
 *
 * @brief A vector in 3D space.
 * @brief A point in 3D space.
 */
typedef struct OF_BOXABLE {
	/** The x coordinate of the vector */
	/** The x coordinate of the point */
	float x;
	/** The y coordinate of the vector */
	/** The y coordinate of the point */
	float y;
	/** The z coordinate of the vector */
	/** The z coordinate of the point */
	float z;
} OFVector3D;
} OFPoint3D;

/**
 * @brief Creates a new OFVector3D.
 * @brief Creates a new OFPoint3D.
 *
 * @param x The x coordinate of the vector
 * @param y The x coordinate of the vector
 * @param z The z coordinate of the vector
 * @return An OFVector3D with the specified coordinates
 * @param x The x coordinate of the point
 * @param y The x coordinate of the point
 * @param z The z coordinate of the point
 * @return An OFPoint3D with the specified coordinates
 */
static OF_INLINE OFVector3D OF_CONST_FUNC
OFMakeVector3D(float x, float y, float z)
static OF_INLINE OFPoint3D OF_CONST_FUNC
OFMakePoint3D(float x, float y, float z)
{
	OFVector3D vector = { x, y, z };
	OFPoint3D point = { x, y, z };

	return vector;
	return point;
}

/**
 * @brief Returns whether the two vectors are equal.
 * @brief Returns whether the two points are equal.
 *
 * @param vector1 The first vector for the comparison
 * @param vector2 The second vector for the comparison
 * @return Whether the two vectors are equal
 * @param point1 The first point for the comparison
 * @param point2 The second point for the comparison
 * @return Whether the two points are equal
 */
static OF_INLINE bool
OFEqualVectors3D(OFVector3D vector1, OFVector3D vector2)
OFEqualPoints3D(OFPoint3D point1, OFPoint3D point2)
{
	if (vector1.x != vector2.x)
	if (point1.x != point2.x)
		return false;

	if (vector1.y != vector2.y)
	if (point1.y != point2.y)
		return false;

	if (vector1.z != vector2.z)
	if (point1.z != point2.z)
		return false;

	return true;
}

/**
 * @brief Adds the specified byte to the hash.

Modified tests/OFMatrix4x4Tests.m from [9aa8c2d363] to [53376eca89].

20
21
22
23
24
25
26
27

28
29
30
31
32
33
34
20
21
22
23
24
25
26

27
28
29
30
31
32
33
34







-
+







static OFString *const module = @"OFMatrix4x4Tests";

@implementation TestsAppDelegate (OFMatrix4x4Tests)
- (void)matrix4x4Tests
{
	void *pool = objc_autoreleasePoolPush();
	OFMatrix4x4 *matrix, *matrix2;
	OFVector3D vec3;
	OFPoint3D point;

	TEST(@"+[identityMatrix]",
	    memcmp([[OFMatrix4x4 identityMatrix] values], (float [16]){
		1, 0, 0, 0,
		0, 1, 0, 0,
		0, 0, 1, 0,
		0, 0, 0, 1
83
84
85
86
87
88
89
90
91
92



93
94
95
96
83
84
85
86
87
88
89



90
91
92
93
94
95
96







-
-
-
+
+
+




	    [matrix2 isEqual: [OFMatrix4x4 matrixWithValues: (float [16]){
		 9000, 20200, 31400, 42600,
		10000, 22800, 35600, 48400,
		11000, 25400, 39800, 54200,
		12000, 28000, 44000, 60000
	    }]])

	TEST(@"-[transformedVector3D:]",
	    R((vec3 = [matrix transformedVector3D: OFMakeVector3D(1, 2, 3)])) &&
	    vec3.x == 14 && vec3.y == 38 && vec3.z == 62)
	TEST(@"-[transformedPoint3D:]",
	    R((point = [matrix transformedPoint3D: OFMakePoint3D(1, 2, 3)])) &&
	    point.x == 18 && point.y == 46 && point.z == 74)

	objc_autoreleasePoolPop(pool);
}
@end