mirror of
https://github.com/glfw/glfw.git
synced 2024-11-22 04:54:35 +00:00
Merge branch 'master' of git://85.24.143.198
This commit is contained in:
commit
66d65ef822
@ -5,6 +5,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include ${OPENGL_INCLUDE_DIR}
|
||||
|
||||
add_executable(defaults defaults.c)
|
||||
add_executable(events events.c)
|
||||
add_executable(fsaa fsaa.c getopt.c)
|
||||
add_executable(fsfocus fsfocus.c)
|
||||
add_executable(gamma gamma.c getopt.c)
|
||||
add_executable(iconify iconify.c getopt.c)
|
||||
@ -17,7 +18,6 @@ add_executable(version version.c getopt.c)
|
||||
if(APPLE)
|
||||
# Set fancy names for bundles
|
||||
add_executable(Accuracy MACOSX_BUNDLE accuracy.c)
|
||||
add_executable(FSAA MACOSX_BUNDLE fsaa.c)
|
||||
add_executable(Sharing MACOSX_BUNDLE sharing.c)
|
||||
add_executable(Tearing MACOSX_BUNDLE tearing.c)
|
||||
add_executable(Windows MACOSX_BUNDLE windows.c)
|
||||
@ -26,7 +26,6 @@ else()
|
||||
add_executable(accuracy WIN32 accuracy.c)
|
||||
add_executable(sharing WIN32 sharing.c)
|
||||
add_executable(tearing WIN32 tearing.c)
|
||||
add_executable(fsaa WIN32 fsaa.c)
|
||||
add_executable(windows WIN32 windows.c)
|
||||
endif(APPLE)
|
||||
|
||||
|
64
tests/fsaa.c
64
tests/fsaa.c
@ -30,33 +30,58 @@
|
||||
//========================================================================
|
||||
|
||||
#include <GL/glfw3.h>
|
||||
#include <GL/glext.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifndef GL_ARB_multisample
|
||||
#define GL_MULTISAMPLE_ARB 0x809D
|
||||
#endif
|
||||
#include "getopt.h"
|
||||
|
||||
static void window_size_callback(GLFWwindow window, int width, int height)
|
||||
{
|
||||
glViewport(0, 0, width, height);
|
||||
}
|
||||
|
||||
int main(void)
|
||||
static void usage(void)
|
||||
{
|
||||
int samples;
|
||||
printf("Usage: fsaa [-h] [-s SAMPLES]\n");
|
||||
}
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
int ch, samples = 4;
|
||||
GLFWwindow window;
|
||||
|
||||
while ((ch = getopt(argc, argv, "hs:")) != -1)
|
||||
{
|
||||
switch (ch)
|
||||
{
|
||||
case 'h':
|
||||
usage();
|
||||
exit(EXIT_SUCCESS);
|
||||
case 's':
|
||||
samples = atoi(optarg);
|
||||
break;
|
||||
default:
|
||||
usage();
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
if (!glfwInit())
|
||||
{
|
||||
fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError()));
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
glfwOpenWindowHint(GLFW_FSAA_SAMPLES, 4);
|
||||
if (samples)
|
||||
printf("Requesting FSAA with %i samples\n", samples);
|
||||
else
|
||||
printf("Requesting that FSAA not be available\n");
|
||||
|
||||
window = glfwOpenWindow(400, 400, GLFW_WINDOWED, "Aliasing Detector", NULL);
|
||||
glfwOpenWindowHint(GLFW_FSAA_SAMPLES, samples);
|
||||
|
||||
window = glfwOpenWindow(800, 400, GLFW_WINDOWED, "Aliasing Detector", NULL);
|
||||
if (!window)
|
||||
{
|
||||
glfwTerminate();
|
||||
@ -70,12 +95,13 @@ int main(void)
|
||||
|
||||
samples = glfwGetWindowParam(window, GLFW_FSAA_SAMPLES);
|
||||
if (samples)
|
||||
printf("Context reports FSAA is supported with %i samples\n", samples);
|
||||
printf("Context reports FSAA is available with %i samples\n", samples);
|
||||
else
|
||||
printf("Context reports FSAA is unsupported\n");
|
||||
printf("Context reports FSAA is unavailable\n");
|
||||
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
gluOrtho2D(0.f, 1.f, 0.f, 1.f);
|
||||
gluOrtho2D(0.f, 1.f, 0.f, 0.5f);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
|
||||
while (glfwIsWindow(window))
|
||||
{
|
||||
@ -83,21 +109,21 @@ int main(void)
|
||||
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
glLoadIdentity();
|
||||
glTranslatef(0.5f, 0.f, 0.f);
|
||||
glRotatef(time, 0.f, 0.f, 1.f);
|
||||
|
||||
glEnable(GL_MULTISAMPLE_ARB);
|
||||
glColor3f(1.f, 1.f, 1.f);
|
||||
glRectf(-0.25f, -0.25f, 0.25f, 0.25f);
|
||||
|
||||
glLoadIdentity();
|
||||
glTranslatef(-0.5f, 0.f, 0.f);
|
||||
glTranslatef(0.25f, 0.25f, 0.f);
|
||||
glRotatef(time, 0.f, 0.f, 1.f);
|
||||
|
||||
glDisable(GL_MULTISAMPLE_ARB);
|
||||
glColor3f(1.f, 1.f, 1.f);
|
||||
glRectf(-0.25f, -0.25f, 0.25f, 0.25f);
|
||||
glRectf(-0.15f, -0.15f, 0.15f, 0.15f);
|
||||
|
||||
glLoadIdentity();
|
||||
glTranslatef(0.75f, 0.25f, 0.f);
|
||||
glRotatef(time, 0.f, 0.f, 1.f);
|
||||
|
||||
glEnable(GL_MULTISAMPLE_ARB);
|
||||
glRectf(-0.15f, -0.15f, 0.15f, 0.15f);
|
||||
|
||||
glfwSwapBuffers();
|
||||
glfwPollEvents();
|
||||
|
Loading…
Reference in New Issue
Block a user