mitchellhansen/voxel-raycaster
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modified CMake to now find and link GLEW

Browse Source 
Slight tweaks to how CMake interacts with VS
Added small OpenGL testing class which draws over the raycasted image
Going to use Gl to start helping with debug / enabling hybrid rendering
This commit is contained in:
MitchellHansen
2016-11-28 22:00:55 -08:00
parent 95ac8d4e5c
commit 5e58ade16f
7 changed files with 208 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main.cpp
View File

@@ -1,15 +1,14 @@
#ifdef linux
#include "GL_Testing.h"
#ifdef linux
#include <CL/cl.h>
#include <CL/opencl.h>
#elif defined _WIN32
#include <windows.h>
#include <CL/cl_gl.h>
#include <CL/cl.h>
#include <CL/opencl.h>
#include <windows.h>
#elif defined TARGET_OS_MAC
#include <OpenGL/gl.h>
# include <OpenGL/OpenGL.h>
@@ -24,6 +23,8 @@
#include <chrono>
#include <fstream>
#include <sstream>
#include <SFML/Graphics.hpp>
#include "Old_Map.h"
#include "util.hpp"
@@ -33,6 +34,7 @@
#include <Camera.h>
#include "Software_Caster.h"
const int WINDOW_X = 1920;
const int WINDOW_Y = 1080;
const int WORK_SIZE = WINDOW_X * WINDOW_Y;
@@ -66,6 +68,12 @@ int main() {
sf::RenderWindow window(sf::VideoMode(WINDOW_X, WINDOW_Y), "SFML");
GL_Testing t;
t.compile_shader("../shaders/passthrough.frag", GL_Testing::Shader_Type::FRAGMENT);
t.compile_shader("../shaders/passthrough.vert", GL_Testing::Shader_Type::VERTEX);
t.create_program();
t.create_buffers();
// Initialize the raycaster hardware, compat, or software
RayCaster *rc = new Hardware_Caster();
//RayCaster *rc = new Software_Caster();
@@ -190,7 +198,7 @@ int main() {
if (deltas != sf::Vector2i(0, 0) && mouse_enabled == true) {
// Mouse movement
//sf::Mouse::setPosition(fixed);
sf::Mouse::setPosition(fixed);
prev_pos = sf::Mouse::getPosition();
camera->slew_camera(sf::Vector2f(
deltas.y / 300.0f,
@@ -220,6 +228,14 @@ int main() {
// Run the raycast
rc->compute();
rc->draw(&window);
window.popGLStates();
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
t.draw();
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
window.pushGLStates();
// Give the frame counter the frame time and draw the average frame time
fps.frame(delta_time);
@@ -227,7 +243,7 @@ int main() {
cam_text_x.draw(&window);
cam_text_y.draw(&window);
window.display();
}