diff --git a/DSFML/import/dsfml/graphics/drawableimpl.d b/DSFML/import/dsfml/graphics/drawableimpl.d index c7c731919..2360d44be 100644 --- a/DSFML/import/dsfml/graphics/drawableimpl.d +++ b/DSFML/import/dsfml/graphics/drawableimpl.d @@ -93,12 +93,12 @@ public: void render(IRenderTarget window) { - sfRenderWindow_DrawThis((cast(DSFMLObject)window).getNativePointer(), m_ptr); + sfRenderWindow_DrawThis((cast(DSFMLObject)window).nativePointer, m_ptr); } void renderWithShader(IRenderTarget window, Shader shader) { - sfRenderWindow_DrawThisWithShader((cast(DSFMLObject)window).getNativePointer, m_ptr, shader.getNativePointer); + sfRenderWindow_DrawThisWithShader((cast(DSFMLObject)window).nativePointer, m_ptr, shader.nativePointer); } void setPosition(float x, float y) diff --git a/DSFML/import/dsfml/graphics/image.d b/DSFML/import/dsfml/graphics/image.d index 190a03d43..2f902e7e4 100644 --- a/DSFML/import/dsfml/graphics/image.d +++ b/DSFML/import/dsfml/graphics/image.d @@ -183,7 +183,7 @@ public: // */ // void copyScreen(RenderWindow window, IntRect sourceRect = IntRect()) // { -// return cast(bool)sfImage_CopyScreen(m_ptr, window.getNativePointer, sourceRect); +// return cast(bool)sfImage_CopyScreen(m_ptr, window.nativePointer, sourceRect); // } /** @@ -199,7 +199,7 @@ public: */ void copy(Image source, uint destX, uint destY, IntRect sourceRect = IntRect()) { - sfImage_Copy(m_ptr, source.getNativePointer, destX, destY, sourceRect); + sfImage_Copy(m_ptr, source.nativePointer, destX, destY, sourceRect); } /** diff --git a/DSFML/import/dsfml/graphics/renderimage.d b/DSFML/import/dsfml/graphics/renderimage.d index 7c3d269f0..2754f1b43 100644 --- a/DSFML/import/dsfml/graphics/renderimage.d +++ b/DSFML/import/dsfml/graphics/renderimage.d @@ -165,7 +165,7 @@ public: _view.setHandled(false); } - sfRenderImage_SetView(m_ptr, view.getNativePointer); + sfRenderImage_SetView(m_ptr, view.nativePointer); _view = view; _view.setHandled(true); @@ -206,7 +206,7 @@ public: IntRect getViewport(View view = null) // TODO: is there a need to accept other Views than the currently assigned one? { - return sfRenderImage_GetViewport(m_ptr, view is null ? _view.getNativePointer : view.getNativePointer); + return sfRenderImage_GetViewport(m_ptr, view is null ? _view.nativePointer : view.nativePointer); } /** @@ -223,7 +223,7 @@ public: Vector2f convertCoords(uint imageX, uint imageY, View targetView = null) { Vector2f vec; - sfRenderImage_ConvertCoords(m_ptr, imageX, imageY, &vec.x, &vec.y, targetView is null ? null : targetView.getNativePointer); + sfRenderImage_ConvertCoords(m_ptr, imageX, imageY, &vec.x, &vec.y, targetView is null ? null : targetView.nativePointer); return vec; } diff --git a/DSFML/import/dsfml/graphics/renderwindow.d b/DSFML/import/dsfml/graphics/renderwindow.d index bce625664..7058b5d17 100644 --- a/DSFML/import/dsfml/graphics/renderwindow.d +++ b/DSFML/import/dsfml/graphics/renderwindow.d @@ -179,7 +179,7 @@ public: m_view.setHandled(false); } - sfRenderWindow_SetView(m_ptr, newView.getNativePointer); + sfRenderWindow_SetView(m_ptr, newView.nativePointer); m_view = newView; m_view.setHandled(true); @@ -231,7 +231,7 @@ public: Vector2f convertCoords(uint windowX, uint windowY, View targetView = null) { Vector2f vec; - sfRenderWindow_ConvertCoords(m_ptr, windowX, windowY, &vec.x, &vec.y, targetView is null ? null : targetView.getNativePointer); + sfRenderWindow_ConvertCoords(m_ptr, windowX, windowY, &vec.x, &vec.y, targetView is null ? null : targetView.nativePointer); return vec; } @@ -276,7 +276,7 @@ public: IntRect getViewport(View view = null) // TODO: is there a need to accept other Views than the currently assigned one? { - return sfRenderWindow_GetViewport(m_ptr, view is null ? m_view.getNativePointer : view.getNativePointer); + return sfRenderWindow_GetViewport(m_ptr, view is null ? m_view.nativePointer : view.nativePointer); } private: diff --git a/DSFML/import/dsfml/system/common.d b/DSFML/import/dsfml/system/common.d index 5bb29030c..b5c9ffce6 100644 --- a/DSFML/import/dsfml/system/common.d +++ b/DSFML/import/dsfml/system/common.d @@ -41,7 +41,7 @@ package // alias immutable(void) ivoid; alias const(void) cvoid; - typedef void* SFMLClass; + alias void* SFMLClass; } // used to mixin code function