mirror of
https://github.com/Kapendev/parin.git
synced 2025-04-27 21:49:57 +03:00
Fixed a raylib-d bug with DUB.
This commit is contained in:
Kapendev
parent
5ca28d6340
commit
1b4e5f4736
3 changed files with 183 additions and 179 deletions
|
|
@ -53,6 +53,7 @@ While DUB simplifies the setup process, Popka itself doesn't require DUB.
|
|||
```
|
||||
|
||||
Popka doesn't require raylib-d, but we include it as a dependency for its convenient raylib download script.
|
||||
It is recommended to remove raylib-d from your dub.json file after the installation is complete.
|
||||
|
||||
2. **Compile example**
|
||||
|
||||
|
|
|
|||
249
source/popka/vendor/ray/raylibpp.d
vendored
249
source/popka/vendor/ray/raylibpp.d
vendored
|
|
@ -7,85 +7,88 @@ module popka.vendor.ray.raylibpp;
|
|||
|
||||
import popka.vendor.ray.raylib;
|
||||
|
||||
// Basic shapes drawing functions
|
||||
alias drawPixel = DrawPixel;
|
||||
alias drawPixel = DrawPixelV;
|
||||
enum isRaylibPackageAvailable = is(typeof((){import raylib;}));
|
||||
|
||||
alias drawLine = DrawLine;
|
||||
alias drawLine = DrawLineV;
|
||||
alias drawLine = DrawLineEx;
|
||||
alias drawLine = DrawLineStrip;
|
||||
alias drawLineBezier = DrawLineBezier;
|
||||
static if (!isRaylibPackageAvailable) {
|
||||
// Basic shapes drawing functions
|
||||
alias drawPixel = DrawPixel;
|
||||
alias drawPixel = DrawPixelV;
|
||||
|
||||
alias drawCircle = DrawCircle;
|
||||
alias drawCircleSector = DrawCircleSector;
|
||||
alias drawCircleSectorLines = DrawCircleSectorLines;
|
||||
alias drawCircle = DrawCircleGradient;
|
||||
alias drawCircle = DrawCircleV;
|
||||
alias drawCircleLines = DrawCircleLines;
|
||||
alias drawCircleLines = DrawCircleLinesV;
|
||||
alias drawLine = DrawLine;
|
||||
alias drawLine = DrawLineV;
|
||||
alias drawLine = DrawLineEx;
|
||||
alias drawLine = DrawLineStrip;
|
||||
alias drawLineBezier = DrawLineBezier;
|
||||
|
||||
alias drawEllipse = DrawEllipse;
|
||||
alias drawEllipseLines = DrawEllipseLines;
|
||||
alias drawCircle = DrawCircle;
|
||||
alias drawCircleSector = DrawCircleSector;
|
||||
alias drawCircleSectorLines = DrawCircleSectorLines;
|
||||
alias drawCircle = DrawCircleGradient;
|
||||
alias drawCircle = DrawCircleV;
|
||||
alias drawCircleLines = DrawCircleLines;
|
||||
alias drawCircleLines = DrawCircleLinesV;
|
||||
|
||||
alias drawRing = DrawRing;
|
||||
alias drawRingLines = DrawRingLines;
|
||||
alias drawEllipse = DrawEllipse;
|
||||
alias drawEllipseLines = DrawEllipseLines;
|
||||
|
||||
alias drawRectangle = DrawRectangle;
|
||||
alias drawRectangle = DrawRectangleV;
|
||||
alias drawRectangle = DrawRectangleRec;
|
||||
alias drawRectangle = DrawRectanglePro;
|
||||
alias drawRectangleGradientV = DrawRectangleGradientV;
|
||||
alias drawRectangleGradientH = DrawRectangleGradientH;
|
||||
alias drawRectangle = DrawRectangleGradientEx;
|
||||
alias drawRectangleLines = DrawRectangleLines;
|
||||
alias drawRectangleLines = DrawRectangleLinesEx;
|
||||
alias drawRectangleRounded = DrawRectangleRounded;
|
||||
alias drawRectangleRoundedLines = DrawRectangleRoundedLines;
|
||||
alias drawRing = DrawRing;
|
||||
alias drawRingLines = DrawRingLines;
|
||||
|
||||
alias drawTriangle = DrawTriangle;
|
||||
alias drawTriangleLines = DrawTriangleLines;
|
||||
alias drawTriangleFan = DrawTriangleFan;
|
||||
alias drawTriangleStrip = DrawTriangleStrip;
|
||||
alias drawPoly = DrawPoly;
|
||||
alias drawPolyLines = DrawPolyLines;
|
||||
alias drawPolyLines = DrawPolyLinesEx;
|
||||
alias drawRectangle = DrawRectangle;
|
||||
alias drawRectangle = DrawRectangleV;
|
||||
alias drawRectangle = DrawRectangleRec;
|
||||
alias drawRectangle = DrawRectanglePro;
|
||||
alias drawRectangleGradientV = DrawRectangleGradientV;
|
||||
alias drawRectangleGradientH = DrawRectangleGradientH;
|
||||
alias drawRectangle = DrawRectangleGradientEx;
|
||||
alias drawRectangleLines = DrawRectangleLines;
|
||||
alias drawRectangleLines = DrawRectangleLinesEx;
|
||||
alias drawRectangleRounded = DrawRectangleRounded;
|
||||
alias drawRectangleRoundedLines = DrawRectangleRoundedLines;
|
||||
|
||||
// Splines drawing functions
|
||||
alias drawSplineLinear = DrawSplineLinear;
|
||||
alias drawSplineBasis = DrawSplineBasis;
|
||||
alias drawSplineCatmullRom = DrawSplineCatmullRom;
|
||||
alias drawSplineBezierQuadratic = DrawSplineBezierQuadratic;
|
||||
alias drawSplineBezierCubic = DrawSplineBezierCubic;
|
||||
alias drawSplineSegmentLinear = DrawSplineSegmentLinear;
|
||||
alias drawSplineSegmentBasis = DrawSplineSegmentBasis;
|
||||
alias drawSplineSegmentCatmullRom = DrawSplineSegmentCatmullRom;
|
||||
alias drawSplineSegmentBezierQuadratic = DrawSplineSegmentBezierQuadratic;
|
||||
alias drawSplineSegmentBezierCubic = DrawSplineSegmentBezierCubic;
|
||||
alias drawTriangle = DrawTriangle;
|
||||
alias drawTriangleLines = DrawTriangleLines;
|
||||
alias drawTriangleFan = DrawTriangleFan;
|
||||
alias drawTriangleStrip = DrawTriangleStrip;
|
||||
alias drawPoly = DrawPoly;
|
||||
alias drawPolyLines = DrawPolyLines;
|
||||
alias drawPolyLines = DrawPolyLinesEx;
|
||||
|
||||
// Texture drawing functions
|
||||
alias drawTexture = DrawTexture;
|
||||
alias drawTexture = DrawTextureV;
|
||||
alias drawTexture = DrawTextureEx;
|
||||
alias drawTexture = DrawTextureRec;
|
||||
alias drawTexture = DrawTexturePro;
|
||||
alias drawTexture = DrawTextureNPatch;
|
||||
// Splines drawing functions
|
||||
alias drawSplineLinear = DrawSplineLinear;
|
||||
alias drawSplineBasis = DrawSplineBasis;
|
||||
alias drawSplineCatmullRom = DrawSplineCatmullRom;
|
||||
alias drawSplineBezierQuadratic = DrawSplineBezierQuadratic;
|
||||
alias drawSplineBezierCubic = DrawSplineBezierCubic;
|
||||
alias drawSplineSegmentLinear = DrawSplineSegmentLinear;
|
||||
alias drawSplineSegmentBasis = DrawSplineSegmentBasis;
|
||||
alias drawSplineSegmentCatmullRom = DrawSplineSegmentCatmullRom;
|
||||
alias drawSplineSegmentBezierQuadratic = DrawSplineSegmentBezierQuadratic;
|
||||
alias drawSplineSegmentBezierCubic = DrawSplineSegmentBezierCubic;
|
||||
|
||||
// Text drawing functions
|
||||
alias drawFPS = DrawFPS;
|
||||
// Texture drawing functions
|
||||
alias drawTexture = DrawTexture;
|
||||
alias drawTexture = DrawTextureV;
|
||||
alias drawTexture = DrawTextureEx;
|
||||
alias drawTexture = DrawTextureRec;
|
||||
alias drawTexture = DrawTexturePro;
|
||||
alias drawTexture = DrawTextureNPatch;
|
||||
|
||||
@nogc nothrow
|
||||
void drawText(const(char)[] text, float posX, float posY, float fontSize, Color color) {
|
||||
// Text drawing functions
|
||||
alias drawFPS = DrawFPS;
|
||||
|
||||
@nogc nothrow
|
||||
void drawText(const(char)[] text, float posX, float posY, float fontSize, Color color) {
|
||||
drawText(GetFontDefault(), text, Vector2(posX, posY), Vector2(0.0f, 0.0f), 0.0f, fontSize, 2.0f, color);
|
||||
}
|
||||
}
|
||||
|
||||
@nogc nothrow
|
||||
void drawText(Font font, const(char)[] text, Vector2 position, float fontSize, float spacing, Color tint) {
|
||||
@nogc nothrow
|
||||
void drawText(Font font, const(char)[] text, Vector2 position, float fontSize, float spacing, Color tint) {
|
||||
drawText(font, text, position, Vector2(0.0f, 0.0f), 0.0f, fontSize, spacing, tint);
|
||||
}
|
||||
}
|
||||
|
||||
@nogc nothrow
|
||||
void drawText(Font font, const(char)[] text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint) {
|
||||
@nogc nothrow
|
||||
void drawText(Font font, const(char)[] text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint) {
|
||||
static char[1024] buffer = void;
|
||||
auto text2 = buffer[];
|
||||
foreach (i, c; text) {
|
||||
|
|
@ -93,22 +96,22 @@ void drawText(Font font, const(char)[] text, Vector2 position, Vector2 origin, f
|
|||
}
|
||||
text2[text.length] = '\0';
|
||||
DrawTextPro(font, text2.ptr, position, origin, rotation, fontSize, spacing, tint);
|
||||
}
|
||||
}
|
||||
|
||||
alias drawText = DrawTextCodepoint;
|
||||
alias drawText = DrawTextCodepoint;
|
||||
|
||||
@nogc nothrow
|
||||
void drawText(Font font, const(int)[] codepoints, Vector2 position, float fontSize, float spacing, Color tint) {
|
||||
@nogc nothrow
|
||||
void drawText(Font font, const(int)[] codepoints, Vector2 position, float fontSize, float spacing, Color tint) {
|
||||
DrawTextCodepoints(font, codepoints.ptr, cast(int) codepoints.length, position, fontSize, spacing, tint);
|
||||
}
|
||||
}
|
||||
|
||||
@nogc nothrow
|
||||
float measureText(const(char)[] text, float fontSize) {
|
||||
@nogc nothrow
|
||||
float measureText(const(char)[] text, float fontSize) {
|
||||
return measureText(GetFontDefault(), text, fontSize, 2.0f).x;
|
||||
}
|
||||
}
|
||||
|
||||
@nogc nothrow
|
||||
Vector2 measureText(Font font, const(char)[] text, float fontSize, float spacing) {
|
||||
@nogc nothrow
|
||||
Vector2 measureText(Font font, const(char)[] text, float fontSize, float spacing) {
|
||||
static char[1024] buffer = void;
|
||||
auto text2 = buffer[];
|
||||
foreach (i, c; text) {
|
||||
|
|
@ -116,63 +119,53 @@ Vector2 measureText(Font font, const(char)[] text, float fontSize, float spacing
|
|||
}
|
||||
text2[text.length] = '\0';
|
||||
return MeasureTextEx(font, text2.ptr, fontSize, spacing);
|
||||
}
|
||||
}
|
||||
|
||||
// Basic geometric 3D shapes drawing functions
|
||||
alias drawLine3D = DrawLine3D;
|
||||
alias drawPoint3D = DrawPoint3D;
|
||||
alias drawCircle3D = DrawCircle3D;
|
||||
// Basic geometric 3D shapes drawing functions
|
||||
alias drawLine3D = DrawLine3D;
|
||||
alias drawPoint3D = DrawPoint3D;
|
||||
alias drawCircle3D = DrawCircle3D;
|
||||
|
||||
alias drawTriangle3D = DrawTriangle3D;
|
||||
alias drawTriangle3D = DrawTriangleStrip3D;
|
||||
alias drawTriangle3D = DrawTriangle3D;
|
||||
alias drawTriangle3D = DrawTriangleStrip3D;
|
||||
|
||||
alias drawCube = DrawCube;
|
||||
alias drawCube = DrawCubeV;
|
||||
alias drawCubeWires = DrawCubeWires;
|
||||
alias drawCubeWires = DrawCubeWiresV;
|
||||
alias drawCube = DrawCube;
|
||||
alias drawCube = DrawCubeV;
|
||||
alias drawCubeWires = DrawCubeWires;
|
||||
alias drawCubeWires = DrawCubeWiresV;
|
||||
|
||||
alias drawSphere = DrawSphere;
|
||||
alias drawSphere = DrawSphereEx;
|
||||
alias drawSphereWires = DrawSphereWires;
|
||||
alias drawSphere = DrawSphere;
|
||||
alias drawSphere = DrawSphereEx;
|
||||
alias drawSphereWires = DrawSphereWires;
|
||||
|
||||
alias drawCylinder = DrawCylinder;
|
||||
alias drawCylinder = DrawCylinderEx;
|
||||
alias drawCylinderWires = DrawCylinderWires;
|
||||
alias drawCylinderWires = DrawCylinderWiresEx;
|
||||
alias drawCylinder = DrawCylinder;
|
||||
alias drawCylinder = DrawCylinderEx;
|
||||
alias drawCylinderWires = DrawCylinderWires;
|
||||
alias drawCylinderWires = DrawCylinderWiresEx;
|
||||
|
||||
alias drawCapsule = DrawCapsule;
|
||||
alias drawCapsuleWires = DrawCapsuleWires;
|
||||
alias drawPlane = DrawPlane;
|
||||
alias drawRay = DrawRay;
|
||||
alias drawGrid = DrawGrid;
|
||||
alias drawCapsule = DrawCapsule;
|
||||
alias drawCapsuleWires = DrawCapsuleWires;
|
||||
alias drawPlane = DrawPlane;
|
||||
alias drawRay = DrawRay;
|
||||
alias drawGrid = DrawGrid;
|
||||
|
||||
// Model drawing functions
|
||||
alias drawModel = DrawModel;
|
||||
alias drawModel = DrawModelEx;
|
||||
alias drawModelWires = DrawModelWires;
|
||||
alias drawModelWires = DrawModelWiresEx;
|
||||
// Model drawing functions
|
||||
alias drawModel = DrawModel;
|
||||
alias drawModel = DrawModelEx;
|
||||
alias drawModelWires = DrawModelWires;
|
||||
alias drawModelWires = DrawModelWiresEx;
|
||||
|
||||
alias drawBoundingBox = DrawBoundingBox;
|
||||
alias drawBoundingBox = DrawBoundingBox;
|
||||
|
||||
alias drawBillboard = DrawBillboard;
|
||||
alias drawBillboard = DrawBillboardRec;
|
||||
alias drawBillboard = DrawBillboardPro;
|
||||
alias drawBillboard = DrawBillboard;
|
||||
alias drawBillboard = DrawBillboardRec;
|
||||
alias drawBillboard = DrawBillboardPro;
|
||||
|
||||
// Mesh management functions
|
||||
alias drawMesh = DrawMesh;
|
||||
alias drawMeshInstanced = DrawMeshInstanced;
|
||||
// Mesh management functions
|
||||
alias drawMesh = DrawMesh;
|
||||
alias drawMeshInstanced = DrawMeshInstanced;
|
||||
|
||||
version (WebAssembly) {
|
||||
@nogc nothrow extern(C)
|
||||
void emscripten_set_main_loop(void* ptr, int fps, int loop);
|
||||
@nogc nothrow extern(C)
|
||||
void emscripten_cancel_main_loop();
|
||||
}
|
||||
|
||||
// We intentionally leave attributes out to provide maximum flexibility for any use case.
|
||||
// The given function should return a bool value.
|
||||
// A return value of true will exit the loop, while false will allow it to continue.
|
||||
void updateWindow(alias loopFunc)() {
|
||||
void updateWindow(alias loopFunc)() {
|
||||
version(WebAssembly) {
|
||||
static void __loopFunc() {
|
||||
loopFunc();
|
||||
|
|
@ -185,9 +178,9 @@ void updateWindow(alias loopFunc)() {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mixin template addRayStart(alias startFunc) {
|
||||
mixin template addRayStart(alias startFunc) {
|
||||
version (D_BetterC) {
|
||||
extern(C)
|
||||
void main(int argc, immutable(char)** argv) {
|
||||
|
|
@ -206,4 +199,14 @@ mixin template addRayStart(alias startFunc) {
|
|||
startFunc(args[0]);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
pragma(msg, "Helper functions are not available when raylib-d is a DUB dependecy. Remove raylib-d from your dub.json file.");
|
||||
}
|
||||
|
||||
version (WebAssembly) {
|
||||
@nogc nothrow extern(C)
|
||||
void emscripten_set_main_loop(void* ptr, int fps, int loop);
|
||||
@nogc nothrow extern(C)
|
||||
void emscripten_cancel_main_loop();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ int main(string[] args) {
|
|||
auto mode = args.length > 1 ? args[1] : "";
|
||||
if (mode != "build" && mode != "run") {
|
||||
writeln("Error: `", mode, "` isn't a mode.\nAvailable modes: [build, run]");
|
||||
return -1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Can pass extra flags to ldc if needed.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue