Skip to content

Commit

Permalink
Merge pull request #65 from schveiguy/fixctorattrs
Browse files Browse the repository at this point in the history 
Attribute and various fixes
  • Loading branch information
@schveiguy
schveiguy authored Nov 21, 2024
2 parents 1381ca2 + 3d29cd9 commit 1cc76b8
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 45 deletions.
46 changes: 23 additions & 23 deletions source/raylib/raylib_types.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ struct Vector2
enum zero = Vector2(0.0f, 0.0f);
enum one = Vector2(1.0f, 1.0f);

@safe @nogc nothrow:
@safe @nogc nothrow pure:

inout Vector2 opUnary(string op)() if (op == "+" || op == "-") {
Vector2 opUnary(string op)() const if (op == "+" || op == "-") {
return Vector2(
mixin(op, "x"),
mixin(op, "y"),
);
}

inout Vector2 opBinary(string op)(inout Vector2 rhs) if (op == "+" || op == "-") {
Vector2 opBinary(string op)(inout Vector2 rhs) const if (op == "+" || op == "-") {
return Vector2(
mixin("x", op, "rhs.x"),
mixin("y", op, "rhs.y"),
Expand All @@ -34,14 +34,14 @@ struct Vector2
return this;
}

inout Vector2 opBinary(string op)(inout float rhs) if (op == "+" || op == "-" || op == "*" || op == "/") {
Vector2 opBinary(string op)(inout float rhs) const if (op == "+" || op == "-" || op == "*" || op == "/") {
return Vector2(
mixin("x", op, "rhs"),
mixin("y", op, "rhs"),
);
}

inout Vector2 opBinaryRight(string op)(inout float lhs) if (op == "+" || op == "-" || op == "*" || op == "/") {
Vector2 opBinaryRight(string op)(inout float lhs) const if (op == "+" || op == "-" || op == "*" || op == "/") {
return Vector2(
mixin("lhs", op, "x"),
mixin("lhs", op, "y"),
Expand All @@ -65,17 +65,17 @@ struct Vector3
enum zero = Vector3(0.0f, 0.0f, 0.0f);
enum one = Vector3(1.0f, 1.0f, 1.0f);

@safe @nogc nothrow:
@safe @nogc nothrow pure:

inout Vector3 opUnary(string op)() if (op == "+" || op == "-") {
Vector3 opUnary(string op)() const if (op == "+" || op == "-") {
return Vector3(
mixin(op, "x"),
mixin(op, "y"),
mixin(op, "z"),
);
}

inout Vector3 opBinary(string op)(inout Vector3 rhs) if (op == "+" || op == "-") {
Vector3 opBinary(string op)(inout Vector3 rhs) const if (op == "+" || op == "-") {
return Vector3(
mixin("x", op, "rhs.x"),
mixin("y", op, "rhs.y"),
Expand All @@ -90,15 +90,15 @@ struct Vector3
return this;
}

inout Vector3 opBinary(string op)(inout float rhs) if (op == "+" || op == "-" || op == "*" || op == "/") {
Vector3 opBinary(string op)(inout float rhs) const if (op == "+" || op == "-" || op == "*" || op == "/") {
return Vector3(
mixin("x", op, "rhs"),
mixin("y", op, "rhs"),
mixin("z", op, "rhs"),
);
}

inout Vector3 opBinaryRight(string op)(inout float lhs) if (op == "+" || op == "-" || op == "*" || op == "/") {
Vector3 opBinaryRight(string op)(inout float lhs) const if (op == "+" || op == "-" || op == "*" || op == "/") {
return Vector3(
mixin("lhs", op, "x"),
mixin("lhs", op, "y"),
Expand All @@ -125,9 +125,9 @@ struct Vector4
enum zero = Vector4(0.0f, 0.0f, 0.0f, 0.0f);
enum one = Vector4(1.0f, 1.0f, 1.0f, 1.0f);

@safe @nogc nothrow:
@safe @nogc nothrow pure:

inout Vector4 opUnary(string op)() if (op == "+" || op == "-") {
Vector4 opUnary(string op)() const if (op == "+" || op == "-") {
return Vector4(
mixin(op, "x"),
mixin(op, "y"),
Expand All @@ -136,7 +136,7 @@ struct Vector4
);
}

inout Vector4 opBinary(string op)(inout Vector4 rhs) if (op == "+" || op == "-") {
Vector4 opBinary(string op)(inout Vector4 rhs) const if (op == "+" || op == "-") {
return Vector4(
mixin("x", op, "rhs.x"),
mixin("y", op, "rhs.y"),
Expand All @@ -153,7 +153,7 @@ struct Vector4
return this;
}

inout Vector4 opBinary(string op)(inout float rhs) if (op == "+" || op == "-" || op == "*" || op == "/") {
Vector4 opBinary(string op)(inout float rhs) const if (op == "+" || op == "-" || op == "*" || op == "/") {
return Vector4(
mixin("x", op, "rhs"),
mixin("y", op, "rhs"),
Expand All @@ -162,7 +162,7 @@ struct Vector4
);
}

inout Vector4 opBinaryRight(string op)(inout float lhs) if (op == "+" || op == "-" || op == "*" || op == "/") {
Vector4 opBinaryRight(string op)(inout float lhs) const if (op == "+" || op == "-" || op == "*" || op == "/") {
return Vector4(
mixin("lhs", op, "x"),
mixin("lhs", op, "y"),
Expand Down Expand Up @@ -214,14 +214,14 @@ struct Rectangle
alias w = width;
alias h = height;

@safe @nogc nothrow:
@safe @nogc nothrow pure:

Vector2 origin() { // Rectangle function exclusive to raylib-d
Vector2 origin() const { // Rectangle function exclusive to raylib-d
return Vector2(x, y);
}
alias position = origin;

Vector2 dimensions() {
Vector2 dimensions() const {
return Vector2(width, height);
}

Expand Down Expand Up @@ -262,22 +262,22 @@ struct Color
ubyte r;
ubyte g;
ubyte b;
ubyte a = 255;
ubyte a;

@safe @nogc nothrow:
@safe @nogc nothrow pure:

this(ubyte r, ubyte g, ubyte b, ubyte a = 255) {
this(ubyte r, ubyte g, ubyte b, ubyte a = 255) inout {
this.r = r;
this.g = g;
this.b = b;
this.a = a;
}

this(ubyte[4] rgba) {
this(ubyte[4] rgba) inout {
this(rgba[0], rgba[1], rgba[2], rgba[3]);
}

this(ubyte[3] rgb) {
this(ubyte[3] rgb) inout {
this(rgb[0], rgb[1], rgb[2], 255);
}
}
Expand Down
47 changes: 25 additions & 22 deletions source/raylib/raymathext.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module raylib.raymathext;

import raylib;
import core.stdc.math;
import std.traits : FieldNameTuple;

pragma(inline, true):

Expand All @@ -15,15 +14,15 @@ struct Bivector2
enum zero = Bivector2(0.0f);
enum one = Bivector2(1.0f);

@safe @nogc nothrow:
@safe @nogc nothrow pure:

inout Bivector2 opUnary(string op)() if (op == "+" || op == "-") {
Bivector2 opUnary(string op)() const if (op == "+" || op == "-") {
return Bivector2(
mixin(op, "xy"),
);
}

inout Bivector2 opBinary(string op)(inout Bivector2 rhs) if (op == "+" || op == "-") {
Bivector2 opBinary(string op)(inout Bivector2 rhs) const if (op == "+" || op == "-") {
return Bivector2(
mixin("xy", op, "rhs.xy"),
);
Expand All @@ -34,13 +33,13 @@ struct Bivector2
return this;
}

inout Bivector2 opBinary(string op)(inout float rhs) if (op == "+" || op == "-" || op == "*" || op == "/") {
Bivector2 opBinary(string op)(inout float rhs) const if (op == "+" || op == "-" || op == "*" || op == "/") {
return Bivector2(
mixin("xy", op, "rhs"),
);
}

inout Bivector2 opBinaryRight(string op)(inout float lhs) if (op == "+" || op == "-" || op == "*" || op == "/") {
Bivector2 opBinaryRight(string op)(inout float lhs) const if (op == "+" || op == "-" || op == "*" || op == "/") {
return Bivector2(
mixin("lhs", op, "xy"),
);
Expand All @@ -64,17 +63,17 @@ struct Bivector3
enum zero = Bivector3(0.0f, 0.0f, 0.0f);
enum one = Bivector3(1.0f, 1.0f, 1.0f);

@safe @nogc nothrow:
@safe @nogc nothrow pure:

inout Bivector3 opUnary(string op)() if (op == "+" || op == "-") {
Bivector3 opUnary(string op)() const if (op == "+" || op == "-") {
return Bivector3(
mixin(op, "xy"),
mixin(op, "yz"),
mixin(op, "zx"),
);
}

inout Bivector3 opBinary(string op)(inout Bivector3 rhs) if (op == "+" || op == "-") {
Bivector3 opBinary(string op)(inout Bivector3 rhs) const if (op == "+" || op == "-") {
return Bivector3(
mixin("xy", op, "rhs.xy"),
mixin("yz", op, "rhs.yz"),
Expand All @@ -89,15 +88,15 @@ struct Bivector3
return this;
}

inout Bivector3 opBinary(string op)(inout float rhs) if (op == "+" || op == "-" || op == "*" || op == "/") {
Bivector3 opBinary(string op)(inout float rhs) const if (op == "+" || op == "-" || op == "*" || op == "/") {
return Bivector3(
mixin("xy", op, "rhs"),
mixin("yz", op, "rhs"),
mixin("zx", op, "rhs"),
);
}

inout Bivector3 opBinaryRight(string op)(inout float lhs) if (op == "+" || op == "-" || op == "*" || op == "/") {
Bivector3 opBinaryRight(string op)(inout float lhs) const if (op == "+" || op == "-" || op == "*" || op == "/") {
return Bivector3(
mixin("lhs", op, "xy"),
mixin("lhs", op, "yz"),
Expand Down Expand Up @@ -128,9 +127,9 @@ struct Rotor3
alias j = zx;
alias k = xy;

@safe @nogc nothrow:
@safe @nogc nothrow pure:

@property Bivector3 b()
@property Bivector3 b() const
{
return Bivector3(xy, yz, zx);
}
Expand All @@ -143,21 +142,23 @@ struct Rotor3
return _b;
}

this(float _a, Bivector3 _b)
this(float _a, Bivector3 _b) inout
{
a = _a;
b = _b;
xy = _b.xy;
yz = _b.yz;
zx = _b.zx;
}

this(float _a, float _xy, float _yz, float _zx)
this(float _a, float _xy, float _yz, float _zx) inout
{
a = _a;
xy = _xy;
yz = _yz;
zx = _zx;
}

inout Rotor3 opUnary(string op)() if (op == "+" || op == "-") {
Rotor3 opUnary(string op)() const if (op == "+" || op == "-") {
return Rotor3(
mixin(op, "a"),
mixin(op, "xy"),
Expand All @@ -167,7 +168,7 @@ struct Rotor3
}

/// Returns a rotor equivalent to first apply p, then apply q
inout Rotor3 opBinary(string op)(inout Rotor3 q) if (op == "*") {
Rotor3 opBinary(string op)(inout Rotor3 q) const if (op == "*") {
alias p = this;
Rotor3 r;
r.a = p.a * q.a - p.i * q.i - p.j * q.j - p.k * q.k;
Expand All @@ -177,23 +178,23 @@ struct Rotor3
return r;
}

inout Vector3 opBinary(string op)(inout Vector3 v) if (op == "*") {
Vector3 opBinary(string op)(inout Vector3 v) const if (op == "*") {
Vector3 rv;
rv.x = a * v.x + xy * v.y - zx * v.z;
rv.y = a * v.y + yz * v.z - xy * v.x;
rv.z = a * v.z + zx * v.x - yz * v.y;
return rv;
}

inout Vector3 opBinaryRight(string op)(inout Vector3 v) if (op == "*") {
Vector3 opBinaryRight(string op)(inout Vector3 v) const if (op == "*") {
Vector3 vr;
vr.x = v.x * a - v.y * xy + v.z * zx;
vr.y = v.y * a - v.z * yz + v.x * xy;
vr.z = v.z * a - v.x * zx + v.y * yz;
return vr;
}

inout Rotor3 opBinary(string op)(inout float rhs) if (op == "+" || op == "-" || op == "*" || op == "/") {
Rotor3 opBinary(string op)(inout float rhs) const if (op == "+" || op == "-" || op == "*" || op == "/") {
return Rotor3(
mixin("a", op, "rhs"),
mixin("xy", op, "rhs"),
Expand All @@ -202,7 +203,7 @@ struct Rotor3
);
}

inout Rotor3 opBinaryRight(string op)(inout float lhs) if (op == "+" || op == "-" || op == "*" || op == "/") {
Rotor3 opBinaryRight(string op)(inout float lhs) const if (op == "+" || op == "-" || op == "*" || op == "/") {
return Rotor3(
mixin("lhs", op, "a"),
mixin("lhs", op, "xy"),
Expand Down Expand Up @@ -247,6 +248,7 @@ unittest
float length(T)(T v)
{
enum fragment = () {
import std.traits : FieldNameTuple;
string result;
foreach(string fn; FieldNameTuple!T)
result ~= fn ~ "*" ~ fn ~ "+";
Expand All @@ -268,6 +270,7 @@ float distance(T)(T lhs, T rhs)
float dot(T)(T lhs, T rhs)
{
enum fragment = {
import std.traits : FieldNameTuple;
string result;
foreach(fn; FieldNameTuple!T)
result ~= "lhs." ~ fn ~ "*" ~ "rhs." ~ fn ~ "+";
Expand Down

0 comments on commit 1cc76b8

Please sign in to comment.