3rd-party
/
poly2tri
mirror of https://github.com/jhasse/poly2tri.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Port from GLFW 2 to 3

This commit is contained in:
Jan Niklas Hasse 2014-08-12 22:14:01 +02:00
parent d5ecc71f74
commit 4f6fca0f62
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
testbed/main.cc
View File

@ -29,7 +29,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <cstdlib> #include <cstdlib>
#include <GL/glfw.h> #include <GLFW/glfw3.h>
#include <time.h> #include <time.h>
#include <fstream> #include <fstream>
#include <string> #include <string>
@ -77,6 +77,8 @@ bool draw_map = false;
/// Create a random distribution of points? /// Create a random distribution of points?
bool random_distribution = false; bool random_distribution = false;
GLFWwindow* window = NULL;
template <class C> void FreeClear( C & cntr ) { template <class C> void FreeClear( C & cntr ) {
for ( typename C::iterator it = cntr.begin(); for ( typename C::iterator it = cntr.begin();
it != cntr.end(); ++it ) { it != cntr.end(); ++it ) {
@ -230,10 +232,11 @@ void Init()
if (glfwInit() != GL_TRUE) if (glfwInit() != GL_TRUE)
ShutDown(1); ShutDown(1);
// 800 x 600, 16 bit color, no depth, alpha or stencil buffers, windowed // 800 x 600, 16 bit color, no depth, alpha or stencil buffers, windowed
if (glfwOpenWindow(window_width, window_height, 5, 6, 5, 0, 0, 0, GLFW_WINDOW) != GL_TRUE) window = glfwCreateWindow(window_width, window_height, "Poly2Tri - C++", NULL, NULL);
if (!window)
ShutDown(1); ShutDown(1);
glfwSetWindowTitle("Poly2Tri - C++"); glfwMakeContextCurrent(window);
glfwSwapInterval(1); glfwSwapInterval(1);
glEnable(GL_BLEND); glEnable(GL_BLEND);
@ -256,6 +259,8 @@ void MainLoop(const double zoom)
bool running = true; bool running = true;
while (running) { while (running) {
glfwPollEvents();
// calculate time elapsed, and the amount by which stuff rotates // calculate time elapsed, and the amount by which stuff rotates
double current_time = glfwGetTime(), double current_time = glfwGetTime(),
delta_rotate = (current_time - old_time) * rotations_per_tick * 360; delta_rotate = (current_time - old_time) * rotations_per_tick * 360;
@ -263,11 +268,11 @@ void MainLoop(const double zoom)
// escape to quit, arrow keys to rotate view // escape to quit, arrow keys to rotate view
// Check if ESC key was pressed or window was closed // Check if ESC key was pressed or window was closed
running = !glfwGetKey(GLFW_KEY_ESC) && glfwGetWindowParam(GLFW_OPENED); running = !glfwGetKey(window, GLFW_KEY_ESCAPE) && !glfwWindowShouldClose(window);
if (glfwGetKey(GLFW_KEY_LEFT) == GLFW_PRESS) if (glfwGetKey(window, GLFW_KEY_LEFT) == GLFW_PRESS)
rotate_y += delta_rotate; rotate_y += delta_rotate;
if (glfwGetKey(GLFW_KEY_RIGHT) == GLFW_PRESS) if (glfwGetKey(window, GLFW_KEY_RIGHT) == GLFW_PRESS)
rotate_y -= delta_rotate; rotate_y -= delta_rotate;
// z axis always rotates // z axis always rotates
rotate_z += delta_rotate; rotate_z += delta_rotate;
@ -280,7 +285,7 @@ void MainLoop(const double zoom)
} }
// swap back and front buffers // swap back and front buffers
glfwSwapBuffers(); glfwSwapBuffers(window);
} }
} }

4
wscript
View File

@ -19,9 +19,9 @@ from waflib.Tools.compiler_cxx import cxx_compiler
cxx_compiler['win32'] = ['g++'] cxx_compiler['win32'] = ['g++']
#Platform specific libs #Platform specific libs
if sys.platform == 'win32': if sys.platform in ['win32', 'msys']:
# MS Windows # MS Windows
sys_libs = ['glfw', 'opengl32'] sys_libs = ['glfw3', 'opengl32']
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
# Apple OSX # Apple OSX
sys_libs = ['glfw'] sys_libs = ['glfw']