forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enabled opengl by default on Windows since dmd packages the libs (finally)

This commit is contained in:
Adam D. Ruppe 2016-04-07 12:39:05 -04:00
parent 5d2836489d
commit ad9eb11ee6
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
simpledisplay.d
View File

@ -355,8 +355,6 @@
To start, you create a `SimpleWindow` with OpenGL enabled by passing the argument `OpenGlOptions.yes` to the constructor. To start, you create a `SimpleWindow` with OpenGL enabled by passing the argument `OpenGlOptions.yes` to the constructor.
Important: the required import libraries are now packaged with dmd on 32 bit Windows for OpenGL support. You may download the necessary .libs from by github, put them in your dmd/windows/lib folder, then pass the `-version=with_opengl` flag to dmd when compiling to opt-in to this feature.
Next, you set `redrawOpenGlScene` to a delegate which draws your frame. Next, you set `redrawOpenGlScene` to a delegate which draws your frame.
To force a redraw of the scene, call `window.redrawOpenGlSceneNow()`. To force a redraw of the scene, call `window.redrawOpenGlSceneNow()`.
@ -366,14 +364,7 @@
This example program will draw a rectangle on your window: This example program will draw a rectangle on your window:
--- ---
// On Windows: dmd example.d simpledisplay.d color.d -version=with_opengl // dmd example.d simpledisplay.d color.d
//
// When compiling a 32 bit application on Windows, be sure you
// got opengl32.lib and glu32.lib from my github and added them
// to your `dmd2\windows\lib` directory. When you update dmd,
// remember to ensure those lib files are still there afterward.
//
// Elsewhere : dmd example.d simpledisplay.d color.d
import simpledisplay; import simpledisplay;
void main() { void main() {
@ -750,7 +741,6 @@ class SimpleWindow : CapableOfHandlingNativeEvent {
height = the height of the window's client area, in pixels height = the height of the window's client area, in pixels
title = the title of the window (seen in the title bar, taskbar, etc.). You can change it after construction with the $(LREF SimpleWindow._title) property. title = the title of the window (seen in the title bar, taskbar, etc.). You can change it after construction with the $(LREF SimpleWindow._title) property.
opengl = $(LREF OpenGlOptions) are yes and no. If yes, it creates an OpenGL context on the window. opengl = $(LREF OpenGlOptions) are yes and no. If yes, it creates an OpenGL context on the window.
$(TIP On Windows, you need to compile with `-version=with_opengl` to enable `OpenGlOptions.yes`)
resizable = $(LREF Resizablity) has three options: resizable = $(LREF Resizablity) has three options:
$(P `allowResizing`, which allows the window to be resized by the user. The `windowResized` delegate will be called when the size is changed.) $(P `allowResizing`, which allows the window to be resized by the user. The `windowResized` delegate will be called when the size is changed.)
$(P `fixedSize` will not allow the user to resize the window.) $(P `fixedSize` will not allow the user to resize the window.)
@ -1514,7 +1504,7 @@ void setClipboardText(SimpleWindow clipboardOwner, string text) {
data[text.length] = 0; data[text.length] = 0;
GlobalUnlock(handle); GlobalUnlock(handle);
SetClipboardData(1 /* CF_TEXT */, handle); SetClipboardData(1 /* CF_TEXT */, handle); // XXX
} }
} else version(X11) { } else version(X11) {
setX11Selection!"CLIPBOARD"(clipboardOwner, text); setX11Selection!"CLIPBOARD"(clipboardOwner, text);
@ -1864,13 +1854,6 @@ private string[] split(in void[] a, char c) {
return ret; return ret;
} }
version(Windows) {
// Since opengl32.lib isn't provided by default with dmd yet, OpenGL on Windows is opt in
// rather than opt out, so simpledisplay.d just works with a stock dmd.
version(with_opengl) {}
else version = without_opengl;
}
version(without_opengl) { version(without_opengl) {
enum OpenGlOptions { enum OpenGlOptions {
no, no,
@ -1880,7 +1863,7 @@ version(without_opengl) {
Determines if you want an OpenGL context created on the new window. Determines if you want an OpenGL context created on the new window.
Compile with `-version=with_opengl` on Windows if you want to use `yes`. See more: <a href="#topics-3d">in the 3d topic</a>. See more: <a href="#topics-3d">in the 3d topic</a>.
--- ---
import simpledisplay; import simpledisplay;