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

Textures were suprisingly trivial with the plane intersection code hashed out

Browse Source
This commit is contained in:
MitchellHansen
2017-01-21 00:12:19 -08:00
parent ccdcb382fd
commit 1627fe4572
8 changed files with 84 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Hardware_Caster.cpp
View File

@@ -87,6 +87,9 @@ void Hardware_Caster::validate()
set_kernel_arg("raycaster", 7, "light_count");
set_kernel_arg("raycaster", 8, "image");
set_kernel_arg("raycaster", 9, "seed");
set_kernel_arg("raycaster", 10, "texture_atlas");
set_kernel_arg("raycaster", 11, "atlas_dim");
set_kernel_arg("raycaster", 12, "tile_dim");
//print_kernel_arguments();
}
@@ -94,6 +97,18 @@ void Hardware_Caster::validate()
}
void Hardware_Caster::create_texture_atlas(sf::Texture *t, sf::Vector2i tile_dim) {
create_image_buffer("texture_atlas", t->getSize().x * t->getSize().x * 4 * sizeof(float), t);
// create_buffer observes arg 3's
sf::Vector2u v = t->getSize();
create_buffer("atlas_dim", sizeof(sf::Vector2u) , &v);
create_buffer("tile_dim", sizeof(sf::Vector2i), &tile_dim);
}
void Hardware_Caster::compute()
{
// correlating work size with texture size? good, bad?
@@ -177,7 +192,7 @@ void Hardware_Caster::create_viewport(int width, int height, float v_fov, float
viewport_sprite.setTexture(viewport_texture);
// Pass the buffer to opencl
create_image_buffer("image", sizeof(sf::Uint8) * width * height * 4, viewport_image);
create_image_buffer("image", sizeof(sf::Uint8) * width * height * 4, &viewport_texture);
}
@@ -511,7 +526,7 @@ int Hardware_Caster::set_kernel_arg(
}
int Hardware_Caster::create_image_buffer(std::string buffer_name, cl_uint size, void* data) {
int Hardware_Caster::create_image_buffer(std::string buffer_name, cl_uint size, sf::Texture* texture) {
// I can imagine overwriting buffers will be common, so I think
// this is safe to overwrite / release old buffers quietly
@@ -522,7 +537,7 @@ int Hardware_Caster::create_image_buffer(std::string buffer_name, cl_uint size,
int error;
cl_mem buff = clCreateFromGLTexture(
getContext(), CL_MEM_WRITE_ONLY, GL_TEXTURE_2D,
0, viewport_texture.getNativeHandle(), &error);
0, texture->getNativeHandle(), &error);
if (assert(error, "clCreateFromGLTexture"))
return OPENCL_ERROR;

11
src/main.cpp
View File

@@ -124,11 +124,18 @@ int main() {
// *links* the lights to the GPU
raycaster->assign_lights(&light_vec);
// Load in the spritesheet texture
sf::Texture spritesheet;
spritesheet.loadFromFile("../assets/textures/minecraft_tiles.png");
spritesheet.getNativeHandle();
raycaster->create_texture_atlas(&spritesheet, sf::Vector2i(16, 16));
// Checks to see if proper data was uploaded, then sets the kernel args
// ALL DATA LOADING MUST BE FINISHED
raycaster->validate();
// ========== DEBUG ==========
fps_counter fps;