From 9dd006a2c991dedd90a7ea0cd42375e1f54c5ac7 Mon Sep 17 00:00:00 2001
From: Milan Nikolic <gen2brain@gmail.com>
Date: Thu, 7 Dec 2017 15:49:19 +0100
Subject: [PATCH] Unexport New*FromPointer functions

---
 raylib/audio.go    | 24 +++++++++++-----------
 raylib/core.go     | 46 +++++++++++++++++++++---------------------
 raylib/gestures.go |  4 ++--
 raylib/models.go   | 46 +++++++++++++++++++++---------------------
 raylib/shaders.go  | 26 ++++++++++++------------
 raylib/shapes.go   |  2 +-
 raylib/text.go     | 16 +++++++--------
 raylib/textures.go | 50 +++++++++++++++++++++++-----------------------
 8 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/raylib/audio.go b/raylib/audio.go
index 989eceb..73eda11 100644
--- a/raylib/audio.go
+++ b/raylib/audio.go
@@ -35,8 +35,8 @@ func NewWave(sampleCount, sampleRate, sampleSize, channels uint32, data unsafe.P
 	return Wave{sampleCount, sampleRate, sampleSize, channels, data}
 }
 
-// NewWaveFromPointer - Returns new Wave from pointer
-func NewWaveFromPointer(ptr unsafe.Pointer) Wave {
+// newWaveFromPointer - Returns new Wave from pointer
+func newWaveFromPointer(ptr unsafe.Pointer) Wave {
 	return *(*Wave)(ptr)
 }
 
@@ -59,8 +59,8 @@ func NewSound(source, buffer uint32, format int32) Sound {
 	return Sound{source, buffer, format}
 }
 
-// NewSoundFromPointer - Returns new Sound from pointer
-func NewSoundFromPointer(ptr unsafe.Pointer) Sound {
+// newSoundFromPointer - Returns new Sound from pointer
+func newSoundFromPointer(ptr unsafe.Pointer) Sound {
 	return *(*Sound)(ptr)
 }
 
@@ -94,8 +94,8 @@ func NewAudioStream(sampleRate, sampleSize, channels uint32, format int32, sourc
 	return AudioStream{sampleRate, sampleSize, channels, format, source, buffers}
 }
 
-// NewAudioStreamFromPointer - Returns new AudioStream from pointer
-func NewAudioStreamFromPointer(ptr unsafe.Pointer) AudioStream {
+// newAudioStreamFromPointer - Returns new AudioStream from pointer
+func newAudioStreamFromPointer(ptr unsafe.Pointer) AudioStream {
 	return *(*AudioStream)(ptr)
 }
 
@@ -127,7 +127,7 @@ func LoadWave(fileName string) Wave {
 	cfileName := C.CString(fileName)
 	defer C.free(unsafe.Pointer(cfileName))
 	ret := C.LoadWave(cfileName)
-	v := NewWaveFromPointer(unsafe.Pointer(&ret))
+	v := newWaveFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -139,7 +139,7 @@ func LoadWaveEx(data []byte, sampleCount int32, sampleRate int32, sampleSize int
 	csampleSize := (C.int)(sampleSize)
 	cchannels := (C.int)(channels)
 	ret := C.LoadWaveEx(cdata, csampleCount, csampleRate, csampleSize, cchannels)
-	v := NewWaveFromPointer(unsafe.Pointer(&ret))
+	v := newWaveFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -148,7 +148,7 @@ func LoadSound(fileName string) Sound {
 	cfileName := C.CString(fileName)
 	defer C.free(unsafe.Pointer(cfileName))
 	ret := C.LoadSound(cfileName)
-	v := NewSoundFromPointer(unsafe.Pointer(&ret))
+	v := newSoundFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -156,7 +156,7 @@ func LoadSound(fileName string) Sound {
 func LoadSoundFromWave(wave Wave) Sound {
 	cwave := wave.cptr()
 	ret := C.LoadSoundFromWave(*cwave)
-	v := NewSoundFromPointer(unsafe.Pointer(&ret))
+	v := newSoundFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -239,7 +239,7 @@ func WaveFormat(wave Wave, sampleRate int32, sampleSize int32, channels int32) {
 func WaveCopy(wave Wave) Wave {
 	cwave := wave.cptr()
 	ret := C.WaveCopy(*cwave)
-	v := NewWaveFromPointer(unsafe.Pointer(&ret))
+	v := newWaveFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -362,7 +362,7 @@ func InitAudioStream(sampleRate uint32, sampleSize uint32, channels uint32) Audi
 	csampleSize := (C.uint)(sampleSize)
 	cchannels := (C.uint)(channels)
 	ret := C.InitAudioStream(csampleRate, csampleSize, cchannels)
-	v := NewAudioStreamFromPointer(unsafe.Pointer(&ret))
+	v := newAudioStreamFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
diff --git a/raylib/core.go b/raylib/core.go
index 9aa0a7c..6e5a932 100644
--- a/raylib/core.go
+++ b/raylib/core.go
@@ -251,8 +251,8 @@ func NewVector2(x, y float32) Vector2 {
 	return Vector2{x, y}
 }
 
-// NewVector2FromPointer - Returns new Vector2 from pointer
-func NewVector2FromPointer(ptr unsafe.Pointer) Vector2 {
+// newVector2FromPointer - Returns new Vector2 from pointer
+func newVector2FromPointer(ptr unsafe.Pointer) Vector2 {
 	return *(*Vector2)(ptr)
 }
 
@@ -272,8 +272,8 @@ func NewVector3(X, Y, Z float32) Vector3 {
 	return Vector3{X, Y, Z}
 }
 
-// NewVector3FromPointer - Returns new Vector3 from pointer
-func NewVector3FromPointer(ptr unsafe.Pointer) Vector3 {
+// newVector3FromPointer - Returns new Vector3 from pointer
+func newVector3FromPointer(ptr unsafe.Pointer) Vector3 {
 	return *(*Vector3)(ptr)
 }
 
@@ -294,8 +294,8 @@ func NewMatrix(m0, m4, m8, m12, m1, m5, m9, m13, m2, m6, m10, m14, m3, m7, m11,
 	return Matrix{m0, m4, m8, m12, m1, m5, m9, m13, m2, m6, m10, m14, m3, m7, m11, m15}
 }
 
-// NewMatrixFromPointer - Returns new Matrix from pointer
-func NewMatrixFromPointer(ptr unsafe.Pointer) Matrix {
+// newMatrixFromPointer - Returns new Matrix from pointer
+func newMatrixFromPointer(ptr unsafe.Pointer) Matrix {
 	return *(*Matrix)(ptr)
 }
 
@@ -342,8 +342,8 @@ func NewColor(r, g, b, a uint8) Color {
 	return Color{r, g, b, a}
 }
 
-// NewColorFromPointer - Returns new Color from pointer
-func NewColorFromPointer(ptr unsafe.Pointer) Color {
+// newColorFromPointer - Returns new Color from pointer
+func newColorFromPointer(ptr unsafe.Pointer) Color {
 	return *(*Color)(ptr)
 }
 
@@ -364,8 +364,8 @@ func NewRectangle(x, y, width, height int32) Rectangle {
 	return Rectangle{x, y, width, height}
 }
 
-// NewRectangleFromPointer - Returns new Rectangle from pointer
-func NewRectangleFromPointer(ptr unsafe.Pointer) Rectangle {
+// newRectangleFromPointer - Returns new Rectangle from pointer
+func newRectangleFromPointer(ptr unsafe.Pointer) Rectangle {
 	return *(*Rectangle)(ptr)
 }
 
@@ -390,8 +390,8 @@ func NewCamera(pos, target, up Vector3, fovy float32) Camera {
 	return Camera{pos, target, up, fovy}
 }
 
-// NewCameraFromPointer - Returns new Camera from pointer
-func NewCameraFromPointer(ptr unsafe.Pointer) Camera {
+// newCameraFromPointer - Returns new Camera from pointer
+func newCameraFromPointer(ptr unsafe.Pointer) Camera {
 	return *(*Camera)(ptr)
 }
 
@@ -416,8 +416,8 @@ func NewCamera2D(offset, target Vector2, rotation, zoom float32) Camera2D {
 	return Camera2D{offset, target, rotation, zoom}
 }
 
-// NewCamera2DFromPointer - Returns new Camera2D from pointer
-func NewCamera2DFromPointer(ptr unsafe.Pointer) Camera2D {
+// newCamera2DFromPointer - Returns new Camera2D from pointer
+func newCamera2DFromPointer(ptr unsafe.Pointer) Camera2D {
 	return *(*Camera2D)(ptr)
 }
 
@@ -438,8 +438,8 @@ func NewBoundingBox(min, max Vector3) BoundingBox {
 	return BoundingBox{min, max}
 }
 
-// NewBoundingBoxFromPointer - Returns new BoundingBox from pointer
-func NewBoundingBoxFromPointer(ptr unsafe.Pointer) BoundingBox {
+// newBoundingBoxFromPointer - Returns new BoundingBox from pointer
+func newBoundingBoxFromPointer(ptr unsafe.Pointer) BoundingBox {
 	return *(*BoundingBox)(ptr)
 }
 
@@ -567,7 +567,7 @@ func GetMouseRay(mousePosition Vector2, camera Camera) Ray {
 	cmousePosition := mousePosition.cptr()
 	ccamera := camera.cptr()
 	ret := C.GetMouseRay(*cmousePosition, *ccamera)
-	v := NewRayFromPointer(unsafe.Pointer(&ret))
+	v := newRayFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -576,7 +576,7 @@ func GetWorldToScreen(position Vector3, camera Camera) Vector2 {
 	cposition := position.cptr()
 	ccamera := camera.cptr()
 	ret := C.GetWorldToScreen(*cposition, *ccamera)
-	v := NewVector2FromPointer(unsafe.Pointer(&ret))
+	v := newVector2FromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -584,7 +584,7 @@ func GetWorldToScreen(position Vector3, camera Camera) Vector2 {
 func GetCameraMatrix(camera Camera) Matrix {
 	ccamera := camera.cptr()
 	ret := C.GetCameraMatrix(*ccamera)
-	v := NewMatrixFromPointer(unsafe.Pointer(&ret))
+	v := newMatrixFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -612,7 +612,7 @@ func GetFrameTime() float32 {
 func GetColor(hexValue int32) Color {
 	chexValue := (C.int)(hexValue)
 	ret := C.GetColor(chexValue)
-	v := NewColorFromPointer(unsafe.Pointer(&ret))
+	v := newColorFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -683,7 +683,7 @@ func Fade(color Color, alpha float32) Color {
 	ccolor := color.cptr()
 	calpha := (C.float)(alpha)
 	ret := C.Fade(*ccolor, calpha)
-	v := NewColorFromPointer(unsafe.Pointer(&ret))
+	v := newColorFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -900,7 +900,7 @@ func GetMouseY() int32 {
 // GetMousePosition - Returns mouse position XY
 func GetMousePosition() Vector2 {
 	ret := C.GetMousePosition()
-	v := NewVector2FromPointer(unsafe.Pointer(&ret))
+	v := newVector2FromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -935,6 +935,6 @@ func GetTouchY() int32 {
 func GetTouchPosition(index int32) Vector2 {
 	cindex := (C.int)(index)
 	ret := C.GetTouchPosition(cindex)
-	v := NewVector2FromPointer(unsafe.Pointer(&ret))
+	v := newVector2FromPointer(unsafe.Pointer(&ret))
 	return v
 }
diff --git a/raylib/gestures.go b/raylib/gestures.go
index 74bece1..c1a137f 100644
--- a/raylib/gestures.go
+++ b/raylib/gestures.go
@@ -63,7 +63,7 @@ func GetGestureHoldDuration() float32 {
 // GetGestureDragVector - Get gesture drag vector
 func GetGestureDragVector() Vector2 {
 	ret := C.GetGestureDragVector()
-	v := NewVector2FromPointer(unsafe.Pointer(&ret))
+	v := newVector2FromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -77,7 +77,7 @@ func GetGestureDragAngle() float32 {
 // GetGesturePinchVector - Get gesture pinch delta
 func GetGesturePinchVector() Vector2 {
 	ret := C.GetGesturePinchVector()
-	v := NewVector2FromPointer(unsafe.Pointer(&ret))
+	v := newVector2FromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
diff --git a/raylib/models.go b/raylib/models.go
index bbb0e11..03a1605 100644
--- a/raylib/models.go
+++ b/raylib/models.go
@@ -106,8 +106,8 @@ func NewMesh(vertexCount, triangleCount int32, vertices, texcoords, texcoords2,
 	return Mesh{vertexCount, triangleCount, vertices, texcoords, texcoords2, normals, tangents, colors, indices, vaoID, vboID}
 }
 
-// NewMeshFromPointer - Returns new Mesh from pointer
-func NewMeshFromPointer(ptr unsafe.Pointer) Mesh {
+// newMeshFromPointer - Returns new Mesh from pointer
+func newMeshFromPointer(ptr unsafe.Pointer) Mesh {
 	return *(*Mesh)(ptr)
 }
 
@@ -132,8 +132,8 @@ func NewMaterial(shader Shader, maps [MaxMaterialMaps]MaterialMap, params *[]flo
 	return Material{shader, maps, [4]byte{}, params}
 }
 
-// NewMaterialFromPointer - Returns new Material from pointer
-func NewMaterialFromPointer(ptr unsafe.Pointer) Material {
+// newMaterialFromPointer - Returns new Material from pointer
+func newMaterialFromPointer(ptr unsafe.Pointer) Material {
 	return *(*Material)(ptr)
 }
 
@@ -168,8 +168,8 @@ func NewModel(mesh Mesh, transform Matrix, material Material) Model {
 	return Model{mesh, transform, material, [4]byte{}}
 }
 
-// NewModelFromPointer - Returns new Model from pointer
-func NewModelFromPointer(ptr unsafe.Pointer) Model {
+// newModelFromPointer - Returns new Model from pointer
+func newModelFromPointer(ptr unsafe.Pointer) Model {
 	return *(*Model)(ptr)
 }
 
@@ -190,8 +190,8 @@ func NewRay(position, direction Vector3) Ray {
 	return Ray{position, direction}
 }
 
-// NewRayFromPointer - Returns new Ray from pointer
-func NewRayFromPointer(ptr unsafe.Pointer) Ray {
+// newRayFromPointer - Returns new Ray from pointer
+func newRayFromPointer(ptr unsafe.Pointer) Ray {
 	return *(*Ray)(ptr)
 }
 
@@ -335,7 +335,7 @@ func LoadMesh(fileName string) Mesh {
 	cfileName := C.CString(fileName)
 	defer C.free(unsafe.Pointer(cfileName))
 	ret := C.LoadMesh(cfileName)
-	v := NewMeshFromPointer(unsafe.Pointer(&ret))
+	v := newMeshFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -344,7 +344,7 @@ func LoadModel(fileName string) Model {
 	cfileName := C.CString(fileName)
 	defer C.free(unsafe.Pointer(cfileName))
 	ret := C.LoadModel(cfileName)
-	v := NewModelFromPointer(unsafe.Pointer(&ret))
+	v := newModelFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -352,7 +352,7 @@ func LoadModel(fileName string) Model {
 func LoadModelFromMesh(data Mesh) Model {
 	cdata := data.cptr()
 	ret := C.LoadModelFromMesh(*cdata)
-	v := NewModelFromPointer(unsafe.Pointer(&ret))
+	v := newModelFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -376,7 +376,7 @@ func GenMeshPlane(width, length float32, resX, resZ int) Mesh {
 	cresZ := (C.int)(resZ)
 
 	ret := C.GenMeshPlane(cwidth, clength, cresX, cresZ)
-	v := NewMeshFromPointer(unsafe.Pointer(&ret))
+	v := newMeshFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -387,7 +387,7 @@ func GenMeshCube(width, height, length float32) Mesh {
 	clength := (C.float)(length)
 
 	ret := C.GenMeshCube(cwidth, cheight, clength)
-	v := NewMeshFromPointer(unsafe.Pointer(&ret))
+	v := newMeshFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -398,7 +398,7 @@ func GenMeshSphere(radius float32, rings, slices int) Mesh {
 	cslices := (C.int)(slices)
 
 	ret := C.GenMeshSphere(cradius, crings, cslices)
-	v := NewMeshFromPointer(unsafe.Pointer(&ret))
+	v := newMeshFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -409,7 +409,7 @@ func GenMeshHemiSphere(radius float32, rings, slices int) Mesh {
 	cslices := (C.int)(slices)
 
 	ret := C.GenMeshHemiSphere(cradius, crings, cslices)
-	v := NewMeshFromPointer(unsafe.Pointer(&ret))
+	v := newMeshFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -420,7 +420,7 @@ func GenMeshCylinder(radius, height float32, slices int) Mesh {
 	cslices := (C.int)(slices)
 
 	ret := C.GenMeshCylinder(cradius, cheight, cslices)
-	v := NewMeshFromPointer(unsafe.Pointer(&ret))
+	v := newMeshFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -432,7 +432,7 @@ func GenMeshTorus(radius, size float32, radSeg, sides int) Mesh {
 	csides := (C.int)(sides)
 
 	ret := C.GenMeshTorus(cradius, csize, cradSeg, csides)
-	v := NewMeshFromPointer(unsafe.Pointer(&ret))
+	v := newMeshFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -444,7 +444,7 @@ func GenMeshKnot(radius, size float32, radSeg, sides int) Mesh {
 	csides := (C.int)(sides)
 
 	ret := C.GenMeshKnot(cradius, csize, cradSeg, csides)
-	v := NewMeshFromPointer(unsafe.Pointer(&ret))
+	v := newMeshFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -454,7 +454,7 @@ func GenMeshHeightmap(heightmap Image, size Vector3) Mesh {
 	csize := size.cptr()
 
 	ret := C.GenMeshHeightmap(*cheightmap, *csize)
-	v := NewMeshFromPointer(unsafe.Pointer(&ret))
+	v := newMeshFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -464,7 +464,7 @@ func GenMeshCubicmap(cubicmap Image, size Vector3) Mesh {
 	csize := size.cptr()
 
 	ret := C.GenMeshCubicmap(*ccubicmap, *csize)
-	v := NewMeshFromPointer(unsafe.Pointer(&ret))
+	v := newMeshFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -473,14 +473,14 @@ func LoadMaterial(fileName string) Material {
 	cfileName := C.CString(fileName)
 	defer C.free(unsafe.Pointer(cfileName))
 	ret := C.LoadMaterial(cfileName)
-	v := NewMaterialFromPointer(unsafe.Pointer(&ret))
+	v := newMaterialFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
 // LoadMaterialDefault - Load default material (Supports: DIFFUSE, SPECULAR, NORMAL maps)
 func LoadMaterialDefault() Material {
 	ret := C.LoadMaterialDefault()
-	v := NewMaterialFromPointer(unsafe.Pointer(&ret))
+	v := newMaterialFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -562,7 +562,7 @@ func DrawBillboardRec(camera Camera, texture Texture2D, sourceRec Rectangle, cen
 func CalculateBoundingBox(mesh Mesh) BoundingBox {
 	cmesh := mesh.cptr()
 	ret := C.CalculateBoundingBox(*cmesh)
-	v := NewBoundingBoxFromPointer(unsafe.Pointer(&ret))
+	v := newBoundingBoxFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
diff --git a/raylib/shaders.go b/raylib/shaders.go
index e5482a4..feee45a 100644
--- a/raylib/shaders.go
+++ b/raylib/shaders.go
@@ -57,8 +57,8 @@ func NewVrDeviceInfo(hResolution, vResolution int, hScreenSize, vScreenSize, vSc
 		lensSeparationDistance, interpupillaryDistance, lensDistortionValues, chromaAbCorrection}
 }
 
-// NewVrDeviceInfoFromPointer - Returns new VrDeviceInfo from pointer
-func NewVrDeviceInfoFromPointer(ptr unsafe.Pointer) VrDeviceInfo {
+// newVrDeviceInfoFromPointer - Returns new VrDeviceInfo from pointer
+func newVrDeviceInfoFromPointer(ptr unsafe.Pointer) VrDeviceInfo {
 	return *(*VrDeviceInfo)(ptr)
 }
 
@@ -89,8 +89,8 @@ func NewShader(id uint32, locs [MaxShaderLocations]int32) Shader {
 	return Shader{id, locs}
 }
 
-// NewShaderFromPointer - Returns new Shader from pointer
-func NewShaderFromPointer(ptr unsafe.Pointer) Shader {
+// newShaderFromPointer - Returns new Shader from pointer
+func newShaderFromPointer(ptr unsafe.Pointer) Shader {
 	return *(*Shader)(ptr)
 }
 
@@ -105,10 +105,10 @@ func LoadShader(vsFileName string, fsFileName string) Shader {
 	var v Shader
 	if vsFileName == "" {
 		ret := C.LoadShader(nil, cfsFileName)
-		v = NewShaderFromPointer(unsafe.Pointer(&ret))
+		v = newShaderFromPointer(unsafe.Pointer(&ret))
 	} else {
 		ret := C.LoadShader(cvsFileName, cfsFileName)
-		v = NewShaderFromPointer(unsafe.Pointer(&ret))
+		v = newShaderFromPointer(unsafe.Pointer(&ret))
 	}
 
 	return v
@@ -123,14 +123,14 @@ func UnloadShader(shader Shader) {
 // GetShaderDefault - Get default shader
 func GetShaderDefault() Shader {
 	ret := C.GetShaderDefault()
-	v := NewShaderFromPointer(unsafe.Pointer(&ret))
+	v := newShaderFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
 // GetTextureDefault - Get default texture
 func GetTextureDefault() *Texture2D {
 	ret := C.GetTextureDefault()
-	v := NewTexture2DFromPointer(unsafe.Pointer(&ret))
+	v := newTexture2DFromPointer(unsafe.Pointer(&ret))
 	return &v
 }
 
@@ -190,7 +190,7 @@ func GenTextureCubemap(shader Shader, skyHDR Texture2D, size int) Texture2D {
 	csize := (C.int)(size)
 
 	ret := C.GenTextureCubemap(*cshader, *cskyHDR, csize)
-	v := NewTexture2DFromPointer(unsafe.Pointer(&ret))
+	v := newTexture2DFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -201,7 +201,7 @@ func GenTextureIrradiance(shader Shader, cubemap Texture2D, size int) Texture2D
 	csize := (C.int)(size)
 
 	ret := C.GenTextureIrradiance(*cshader, *ccubemap, csize)
-	v := NewTexture2DFromPointer(unsafe.Pointer(&ret))
+	v := newTexture2DFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -212,7 +212,7 @@ func GenTexturePrefilter(shader Shader, cubemap Texture2D, size int) Texture2D {
 	csize := (C.int)(size)
 
 	ret := C.GenTexturePrefilter(*cshader, *ccubemap, csize)
-	v := NewTexture2DFromPointer(unsafe.Pointer(&ret))
+	v := newTexture2DFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -223,7 +223,7 @@ func GenTextureBRDF(shader Shader, cubemap Texture2D, size int) Texture2D {
 	csize := (C.int)(size)
 
 	ret := C.GenTextureBRDF(*cshader, *ccubemap, csize)
-	v := NewTexture2DFromPointer(unsafe.Pointer(&ret))
+	v := newTexture2DFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -253,7 +253,7 @@ func EndBlendMode() {
 func GetVrDeviceInfo(vrDevice VrDevice) VrDeviceInfo {
 	cvrDevice := (C.int)(vrDevice)
 	ret := C.GetVrDeviceInfo(cvrDevice)
-	v := NewVrDeviceInfoFromPointer(unsafe.Pointer(&ret))
+	v := newVrDeviceInfoFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
diff --git a/raylib/shapes.go b/raylib/shapes.go
index 1a74b34..5deed7b 100644
--- a/raylib/shapes.go
+++ b/raylib/shapes.go
@@ -259,7 +259,7 @@ func GetCollisionRec(rec1, rec2 Rectangle) Rectangle {
 	crec1 := rec1.cptr()
 	crec2 := rec2.cptr()
 	ret := C.GetCollisionRec(*crec1, *crec2)
-	v := NewRectangleFromPointer(unsafe.Pointer(&ret))
+	v := newRectangleFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
diff --git a/raylib/text.go b/raylib/text.go
index 5188a8a..5f7693c 100644
--- a/raylib/text.go
+++ b/raylib/text.go
@@ -30,8 +30,8 @@ func NewCharInfo(value int32, rec Rectangle, offsetX, offsetY, advanceX int32) C
 	return CharInfo{value, rec, offsetX, offsetY, advanceX}
 }
 
-// NewCharInfoFromPointer - Returns new SpriteFont from pointer
-func NewCharInfoFromPointer(ptr unsafe.Pointer) CharInfo {
+// newCharInfoFromPointer - Returns new SpriteFont from pointer
+func newCharInfoFromPointer(ptr unsafe.Pointer) CharInfo {
 	return *(*CharInfo)(ptr)
 }
 
@@ -56,15 +56,15 @@ func NewSpriteFont(texture Texture2D, baseSize, charsCount int32, chars *CharInf
 	return SpriteFont{texture, baseSize, charsCount, chars}
 }
 
-// NewSpriteFontFromPointer - Returns new SpriteFont from pointer
-func NewSpriteFontFromPointer(ptr unsafe.Pointer) SpriteFont {
+// newSpriteFontFromPointer - Returns new SpriteFont from pointer
+func newSpriteFontFromPointer(ptr unsafe.Pointer) SpriteFont {
 	return *(*SpriteFont)(ptr)
 }
 
 // GetDefaultFont - Get the default SpriteFont
 func GetDefaultFont() SpriteFont {
 	ret := C.GetDefaultFont()
-	v := NewSpriteFontFromPointer(unsafe.Pointer(&ret))
+	v := newSpriteFontFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -73,7 +73,7 @@ func LoadSpriteFont(fileName string) SpriteFont {
 	cfileName := C.CString(fileName)
 	defer C.free(unsafe.Pointer(cfileName))
 	ret := C.LoadSpriteFont(cfileName)
-	v := NewSpriteFontFromPointer(unsafe.Pointer(&ret))
+	v := newSpriteFontFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -85,7 +85,7 @@ func LoadSpriteFontEx(fileName string, fontSize int32, charsCount int32, fontCha
 	ccharsCount := (C.int)(charsCount)
 	cfontChars := (*C.int)(unsafe.Pointer(fontChars))
 	ret := C.LoadSpriteFontEx(cfileName, cfontSize, ccharsCount, cfontChars)
-	v := NewSpriteFontFromPointer(unsafe.Pointer(&ret))
+	v := newSpriteFontFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -136,7 +136,7 @@ func MeasureTextEx(spriteFont SpriteFont, text string, fontSize float32, spacing
 	cfontSize := (C.float)(fontSize)
 	cspacing := (C.int)(spacing)
 	ret := C.MeasureTextEx(*cspriteFont, ctext, cfontSize, cspacing)
-	v := NewVector2FromPointer(unsafe.Pointer(&ret))
+	v := newVector2FromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
diff --git a/raylib/textures.go b/raylib/textures.go
index 2fe8ac5..67e8d8f 100644
--- a/raylib/textures.go
+++ b/raylib/textures.go
@@ -122,8 +122,8 @@ func NewImage(data unsafe.Pointer, width, height, mipmaps int32, format TextureF
 	return &Image{data, width, height, mipmaps, format}
 }
 
-// NewImageFromPointer - Returns new Image from pointer
-func NewImageFromPointer(ptr unsafe.Pointer) *Image {
+// newImageFromPointer - Returns new Image from pointer
+func newImageFromPointer(ptr unsafe.Pointer) *Image {
 	return (*Image)(ptr)
 }
 
@@ -167,8 +167,8 @@ func NewTexture2D(id uint32, width, height, mipmaps int32, format TextureFormat)
 	return Texture2D{id, width, height, mipmaps, format}
 }
 
-// NewTexture2DFromPointer - Returns new Texture2D from pointer
-func NewTexture2DFromPointer(ptr unsafe.Pointer) Texture2D {
+// newTexture2DFromPointer - Returns new Texture2D from pointer
+func newTexture2DFromPointer(ptr unsafe.Pointer) Texture2D {
 	return *(*Texture2D)(ptr)
 }
 
@@ -191,8 +191,8 @@ func NewRenderTexture2D(id uint32, texture, depth Texture2D) RenderTexture2D {
 	return RenderTexture2D{id, texture, depth}
 }
 
-// NewRenderTexture2DFromPointer - Returns new RenderTexture2D from pointer
-func NewRenderTexture2DFromPointer(ptr unsafe.Pointer) RenderTexture2D {
+// newRenderTexture2DFromPointer - Returns new RenderTexture2D from pointer
+func newRenderTexture2DFromPointer(ptr unsafe.Pointer) RenderTexture2D {
 	return *(*RenderTexture2D)(ptr)
 }
 
@@ -201,7 +201,7 @@ func LoadImage(fileName string) *Image {
 	cfileName := C.CString(fileName)
 	defer C.free(unsafe.Pointer(cfileName))
 	ret := C.LoadImage(cfileName)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -211,7 +211,7 @@ func LoadImageEx(pixels []Color, width, height int32) *Image {
 	cwidth := (C.int)(width)
 	cheight := (C.int)(height)
 	ret := C.LoadImageEx(cpixels, cwidth, cheight)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -222,7 +222,7 @@ func LoadImagePro(data []byte, width, height int32, format TextureFormat) *Image
 	cheight := (C.int)(height)
 	cformat := (C.int)(format)
 	ret := C.LoadImagePro(cdata, cwidth, cheight, cformat)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -235,7 +235,7 @@ func LoadImageRaw(fileName string, width, height int32, format TextureFormat, he
 	cformat := (C.int)(format)
 	cheaderSize := (C.int)(headerSize)
 	ret := C.LoadImageRaw(cfileName, cwidth, cheight, cformat, cheaderSize)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -244,7 +244,7 @@ func LoadTexture(fileName string) Texture2D {
 	cfileName := C.CString(fileName)
 	defer C.free(unsafe.Pointer(cfileName))
 	ret := C.LoadTexture(cfileName)
-	v := NewTexture2DFromPointer(unsafe.Pointer(&ret))
+	v := newTexture2DFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -252,7 +252,7 @@ func LoadTexture(fileName string) Texture2D {
 func LoadTextureFromImage(image *Image) Texture2D {
 	cimage := image.cptr()
 	ret := C.LoadTextureFromImage(*cimage)
-	v := NewTexture2DFromPointer(unsafe.Pointer(&ret))
+	v := newTexture2DFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -261,7 +261,7 @@ func LoadRenderTexture(width, height int32) RenderTexture2D {
 	cwidth := (C.int)(width)
 	cheight := (C.int)(height)
 	ret := C.LoadRenderTexture(cwidth, cheight)
-	v := NewRenderTexture2DFromPointer(unsafe.Pointer(&ret))
+	v := newRenderTexture2DFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -294,7 +294,7 @@ func GetImageData(image *Image) unsafe.Pointer {
 func GetTextureData(texture Texture2D) *Image {
 	ctexture := texture.cptr()
 	ret := C.GetTextureData(*ctexture)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -349,7 +349,7 @@ func ImageDither(image *Image, rBpp, gBpp, bBpp, aBpp int32) {
 func ImageCopy(image *Image) *Image {
 	cimage := image.cptr()
 	ret := C.ImageCopy(*cimage)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -383,7 +383,7 @@ func ImageText(text string, fontSize int32, color Color) *Image {
 	cfontSize := (C.int)(fontSize)
 	ccolor := color.cptr()
 	ret := C.ImageText(ctext, cfontSize, *ccolor)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -396,7 +396,7 @@ func ImageTextEx(font SpriteFont, text string, fontSize float32, spacing int32,
 	cspacing := (C.int)(spacing)
 	ctint := tint.cptr()
 	ret := C.ImageTextEx(*cfont, ctext, cfontSize, cspacing, *ctint)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -485,7 +485,7 @@ func GenImageColor(width, height int, color Color) *Image {
 	ccolor := color.cptr()
 
 	ret := C.GenImageColor(cwidth, cheight, *ccolor)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -497,7 +497,7 @@ func GenImageGradientV(width, height int, top, bottom Color) *Image {
 	cbottom := bottom.cptr()
 
 	ret := C.GenImageGradientV(cwidth, cheight, *ctop, *cbottom)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -509,7 +509,7 @@ func GenImageGradientH(width, height int, left, right Color) *Image {
 	cright := right.cptr()
 
 	ret := C.GenImageGradientH(cwidth, cheight, *cleft, *cright)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -522,7 +522,7 @@ func GenImageGradientRadial(width, height int, density float32, inner, outer Col
 	couter := outer.cptr()
 
 	ret := C.GenImageGradientRadial(cwidth, cheight, cdensity, *cinner, *couter)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -536,7 +536,7 @@ func GenImageChecked(width, height, checksX, checksY int, col1, col2 Color) *Ima
 	ccol2 := col2.cptr()
 
 	ret := C.GenImageChecked(cwidth, cheight, cchecksX, cchecksY, *ccol1, *ccol2)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -547,7 +547,7 @@ func GenImageWhiteNoise(width, height int, factor float32) *Image {
 	cfactor := (C.float)(factor)
 
 	ret := C.GenImageWhiteNoise(cwidth, cheight, cfactor)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -558,7 +558,7 @@ func GenImagePerlinNoise(width, height int, scale float32) *Image {
 	cscale := (C.float)(scale)
 
 	ret := C.GenImagePerlinNoise(cwidth, cheight, cscale)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }
 
@@ -569,7 +569,7 @@ func GenImageCellular(width, height, tileSize int) *Image {
 	ctileSize := (C.int)(tileSize)
 
 	ret := C.GenImageCellular(cwidth, cheight, ctileSize)
-	v := NewImageFromPointer(unsafe.Pointer(&ret))
+	v := newImageFromPointer(unsafe.Pointer(&ret))
 	return v
 }