From c5afb3b9417d6fe524a24e6eac2c4d9fd62be9dc Mon Sep 17 00:00:00 2001 From: ChrisPHP Date: Fri, 4 Nov 2022 20:59:26 +0000 Subject: [PATCH 1/3] Added bindings for DrawCylinderWiresEx and DrawCylinderEx. --- raylib/rmodels.go | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/raylib/rmodels.go b/raylib/rmodels.go index aee6ea2..90990af 100644 --- a/raylib/rmodels.go +++ b/raylib/rmodels.go @@ -147,8 +147,18 @@ func DrawCylinder(position Vector3, radiusTop float32, radiusBottom float32, hei C.DrawCylinder(*cposition, cradiusTop, cradiusBottom, cheight, cslices, *ccolor) } +func DrawCylinderEx(startPos Vector3, endPos Vector3, startRadius float32, endRadius float32, sides int32, col color.RGBA) { + cstartPos := startPos.cptr() + cendPos := endPos.cptr() + cstartRadius := (C.float)(startRadius) + cendRadius := (C.float)(endRadius) + csides := (C.int)(sides) + ccolor := colorCptr(col) + C.DrawCylinderEx(*cposition, cradiusTop, cradiusBottom, cheight, cslices, *ccolor) +} + // DrawCylinderWires - Draw a cylinder/cone wires -func DrawCylinderWires(position Vector3, radiusTop float32, radiusBottom float32, height float32, slices int32, col color.RGBA) { +func DrawCylinderWires(cstartPos Vector3, cendPos Vector3, cstartRadius float32, cendRadius float32, csides int32, col color.RGBA) { cposition := position.cptr() cradiusTop := (C.float)(radiusTop) cradiusBottom := (C.float)(radiusBottom) @@ -158,6 +168,16 @@ func DrawCylinderWires(position Vector3, radiusTop float32, radiusBottom float32 C.DrawCylinderWires(*cposition, cradiusTop, cradiusBottom, cheight, cslices, *ccolor) } +func DrawCylinderWiresEx(startPos Vector3, endPos Vector3, startRadius float32, endRadius float32, sides int32, col color.RGBA) { + cstartPos := startPos.cptr() + cendPos := endPos.cptr() + cstartRadius := (C.float)(startRadius) + cendRadius := (C.float)(endRadius) + csides := (C.int)(sides) + ccolor := colorCptr(col) + C.DrawCylinderWiresEx(*cposition, cradiusTop, cradiusBottom, cheight, cslices, *ccolor) +} + // DrawCapsule - Draw a capsule with the center of its sphere caps at startPos and endPos func DrawCapsule(startPos, endPos Vector3, radius float32, slices, rings int32, col color.RGBA) { cstartPos := startPos.cptr() From a661bc65b222bc640a43c574bd7cfbcdc0557b53 Mon Sep 17 00:00:00 2001 From: ChrisPHP Date: Fri, 4 Nov 2022 21:18:26 +0000 Subject: [PATCH 2/3] Spelling mistakes --- raylib/rmodels.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/raylib/rmodels.go b/raylib/rmodels.go index 90990af..98a9874 100644 --- a/raylib/rmodels.go +++ b/raylib/rmodels.go @@ -154,11 +154,11 @@ func DrawCylinderEx(startPos Vector3, endPos Vector3, startRadius float32, endRa cendRadius := (C.float)(endRadius) csides := (C.int)(sides) ccolor := colorCptr(col) - C.DrawCylinderEx(*cposition, cradiusTop, cradiusBottom, cheight, cslices, *ccolor) + C.DrawCylinderEx(*cstartPos, *cendPos, cstartRadius, cendRadius, csides, *ccolor) } // DrawCylinderWires - Draw a cylinder/cone wires -func DrawCylinderWires(cstartPos Vector3, cendPos Vector3, cstartRadius float32, cendRadius float32, csides int32, col color.RGBA) { +func DrawCylinderWires(position Vector3, radiusTop float32, radiusBottom float32, height float32, slices int32, col color.RGBA) { cposition := position.cptr() cradiusTop := (C.float)(radiusTop) cradiusBottom := (C.float)(radiusBottom) @@ -175,7 +175,7 @@ func DrawCylinderWiresEx(startPos Vector3, endPos Vector3, startRadius float32, cendRadius := (C.float)(endRadius) csides := (C.int)(sides) ccolor := colorCptr(col) - C.DrawCylinderWiresEx(*cposition, cradiusTop, cradiusBottom, cheight, cslices, *ccolor) + C.DrawCylinderWiresEx(*cstartPos, *cendPos, cstartRadius, cendRadius, csides, *ccolor) } // DrawCapsule - Draw a capsule with the center of its sphere caps at startPos and endPos From cc37594632e8671be7f920f9a5cfa4c20b13fc3e Mon Sep 17 00:00:00 2001 From: ChrisPHP Date: Fri, 4 Nov 2022 22:04:54 +0000 Subject: [PATCH 3/3] Added necessary comments --- raylib/rmodels.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/raylib/rmodels.go b/raylib/rmodels.go index 98a9874..4181ee6 100644 --- a/raylib/rmodels.go +++ b/raylib/rmodels.go @@ -147,6 +147,7 @@ func DrawCylinder(position Vector3, radiusTop float32, radiusBottom float32, hei C.DrawCylinder(*cposition, cradiusTop, cradiusBottom, cheight, cslices, *ccolor) } +// DrawCylinderEx - Draw a cylinder with base at startPos and top at endPos func DrawCylinderEx(startPos Vector3, endPos Vector3, startRadius float32, endRadius float32, sides int32, col color.RGBA) { cstartPos := startPos.cptr() cendPos := endPos.cptr() @@ -168,6 +169,7 @@ func DrawCylinderWires(position Vector3, radiusTop float32, radiusBottom float32 C.DrawCylinderWires(*cposition, cradiusTop, cradiusBottom, cheight, cslices, *ccolor) } +// DrawCylinderWiresEx - Draw a cylinder wires with base at startPos and top at endPos func DrawCylinderWiresEx(startPos Vector3, endPos Vector3, startRadius float32, endRadius float32, sides int32, col color.RGBA) { cstartPos := startPos.cptr() cendPos := endPos.cptr()