phynexis-deps/igl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated embree, fixed cmakefiles, still some bugs in the tutorial example

Browse Source
This commit is contained in:
Daniele Panozzo
2015-02-04 22:48:31 +01:00
parent a60ebfa801
commit 17c9429d26
744 changed files with 93222 additions and 82688 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/embree/tutorials/tutorial00/tutorial00_device.cpp
Vendored Regular → Executable
+107 -33
View File
@@ -1,5 +1,5 @@
// ======================================================================== //
// Copyright 2009-2013 Intel Corporation //
// Copyright 2009-2014 Intel Corporation //
// //
// Licensed under the Apache License, Version 2.0 (the "License"); //
// you may not use this file except in compliance with the License. //
@@ -16,13 +16,42 @@
#include "../common/tutorial/tutorial_device.h"
/* scene data */
RTCScene g_scene = NULL;
Vec3f* colors = NULL;
Vec3fa* colors = NULL;
/* render function to use */
renderPixelFunc renderPixel;
/* error reporting function */
void error_handler(const RTCError code, const int8* str)
{
printf("Embree: ");
switch (code) {
case RTC_UNKNOWN_ERROR : printf("RTC_UNKNOWN_ERROR"); break;
case RTC_INVALID_ARGUMENT : printf("RTC_INVALID_ARGUMENT"); break;
case RTC_INVALID_OPERATION: printf("RTC_INVALID_OPERATION"); break;
case RTC_OUT_OF_MEMORY : printf("RTC_OUT_OF_MEMORY"); break;
case RTC_UNSUPPORTED_CPU : printf("RTC_UNSUPPORTED_CPU"); break;
default : printf("invalid error code"); break;
}
if (str) {
printf(" (");
while (*str) putchar(*str++);
printf(")\n");
}
abort();
}
/* rtcCommitThread called by all ISPC worker threads to enable parallel build */
#if defined(PARALLEL_COMMIT)
task void parallelCommit(RTCScene scene) {
rtcCommitThread (scene,threadIndex,threadCount);
}
#endif
/* adds a cube to the scene */
unsigned int addCube (RTCScene scene_i)
{
@@ -42,35 +71,35 @@ unsigned int addCube (RTCScene scene_i)
rtcUnmapBuffer(scene_i,mesh,RTC_VERTEX_BUFFER);
/* create triangle color array */
colors = new Vec3f[12];
colors = (Vec3fa*) alignedMalloc(12*sizeof(Vec3fa));
/* set triangles and colors */
int tri = 0;
Triangle* triangles = (Triangle*) rtcMapBuffer(scene_i,mesh,RTC_INDEX_BUFFER);
// left side
colors[tri] = Vec3f(1,0,0); triangles[tri].v0 = 0; triangles[tri].v1 = 2; triangles[tri].v2 = 1; tri++;
colors[tri] = Vec3f(1,0,0); triangles[tri].v0 = 1; triangles[tri].v1 = 2; triangles[tri].v2 = 3; tri++;
colors[tri] = Vec3fa(1,0,0); triangles[tri].v0 = 0; triangles[tri].v1 = 2; triangles[tri].v2 = 1; tri++;
colors[tri] = Vec3fa(1,0,0); triangles[tri].v0 = 1; triangles[tri].v1 = 2; triangles[tri].v2 = 3; tri++;
// right side
colors[tri] = Vec3f(0,1,0); triangles[tri].v0 = 4; triangles[tri].v1 = 5; triangles[tri].v2 = 6; tri++;
colors[tri] = Vec3f(0,1,0); triangles[tri].v0 = 5; triangles[tri].v1 = 7; triangles[tri].v2 = 6; tri++;
colors[tri] = Vec3fa(0,1,0); triangles[tri].v0 = 4; triangles[tri].v1 = 5; triangles[tri].v2 = 6; tri++;
colors[tri] = Vec3fa(0,1,0); triangles[tri].v0 = 5; triangles[tri].v1 = 7; triangles[tri].v2 = 6; tri++;
// bottom side
colors[tri] = Vec3f(0.5f); triangles[tri].v0 = 0; triangles[tri].v1 = 1; triangles[tri].v2 = 4; tri++;
colors[tri] = Vec3f(0.5f); triangles[tri].v0 = 1; triangles[tri].v1 = 5; triangles[tri].v2 = 4; tri++;
colors[tri] = Vec3fa(0.5f); triangles[tri].v0 = 0; triangles[tri].v1 = 1; triangles[tri].v2 = 4; tri++;
colors[tri] = Vec3fa(0.5f); triangles[tri].v0 = 1; triangles[tri].v1 = 5; triangles[tri].v2 = 4; tri++;
// top side
colors[tri] = Vec3f(1.0f); triangles[tri].v0 = 2; triangles[tri].v1 = 6; triangles[tri].v2 = 3; tri++;
colors[tri] = Vec3f(1.0f); triangles[tri].v0 = 3; triangles[tri].v1 = 6; triangles[tri].v2 = 7; tri++;
colors[tri] = Vec3fa(1.0f); triangles[tri].v0 = 2; triangles[tri].v1 = 6; triangles[tri].v2 = 3; tri++;
colors[tri] = Vec3fa(1.0f); triangles[tri].v0 = 3; triangles[tri].v1 = 6; triangles[tri].v2 = 7; tri++;
// front side
colors[tri] = Vec3f(0,0,1); triangles[tri].v0 = 0; triangles[tri].v1 = 4; triangles[tri].v2 = 2; tri++;
colors[tri] = Vec3f(0,0,1); triangles[tri].v0 = 2; triangles[tri].v1 = 4; triangles[tri].v2 = 6; tri++;
colors[tri] = Vec3fa(0,0,1); triangles[tri].v0 = 0; triangles[tri].v1 = 4; triangles[tri].v2 = 2; tri++;
colors[tri] = Vec3fa(0,0,1); triangles[tri].v0 = 2; triangles[tri].v1 = 4; triangles[tri].v2 = 6; tri++;
// back side
colors[tri] = Vec3f(1,1,0); triangles[tri].v0 = 1; triangles[tri].v1 = 3; triangles[tri].v2 = 5; tri++;
colors[tri] = Vec3f(1,1,0); triangles[tri].v0 = 3; triangles[tri].v1 = 7; triangles[tri].v2 = 5; tri++;
colors[tri] = Vec3fa(1,1,0); triangles[tri].v0 = 1; triangles[tri].v1 = 3; triangles[tri].v2 = 5; tri++;
colors[tri] = Vec3fa(1,1,0); triangles[tri].v0 = 3; triangles[tri].v1 = 7; triangles[tri].v2 = 5; tri++;
rtcUnmapBuffer(scene_i,mesh,RTC_INDEX_BUFFER);
@@ -106,6 +135,9 @@ extern "C" void device_init (int8* cfg)
/* initialize ray tracing core */
rtcInit(cfg);
/* set error handler */
rtcSetErrorFunction(error_handler);
/* create scene */
g_scene = rtcNewScene(RTC_SCENE_STATIC,RTC_INTERSECT1);
@@ -116,19 +148,24 @@ extern "C" void device_init (int8* cfg)
addGroundPlane(g_scene);
/* commit changes to scene */
#if !defined(PARALLEL_COMMIT)
rtcCommit (g_scene);
#else
launch[ getNumHWThreads() ] parallelCommit(g_scene);
#endif
/* set start render mode */
renderPixel = renderPixelStandard;
}
/* task that renders a single screen tile */
Vec3fa renderPixelStandard(int x, int y, const Vec3fa& vx, const Vec3fa& vy, const Vec3fa& vz, const Vec3fa& p)
Vec3fa renderPixelStandard(float x, float y, const Vec3fa& vx, const Vec3fa& vy, const Vec3fa& vz, const Vec3fa& p)
{
/* initialize ray */
RTCRay ray;
ray.org = p;
ray.dir = normalize(add(mul(x,vx), mul(y,vy), vz));
ray.dir = normalize(x*vx + y*vy + vz);
ray.tnear = 0.0f;
ray.tfar = inf;
ray.geomID = RTC_INVALID_GEOMETRY_ID;
@@ -140,16 +177,16 @@ Vec3fa renderPixelStandard(int x, int y, const Vec3fa& vx, const Vec3fa& vy, con
rtcIntersect(g_scene,ray);
/* shade pixels */
Vec3f color = Vec3f(0.0f);
Vec3fa color = Vec3fa(0.0f);
if (ray.geomID != RTC_INVALID_GEOMETRY_ID)
{
Vec3f diffuse = colors[ray.primID];
color = add(color,mul(diffuse,0.5f));
Vec3f lightDir = normalize(Vec3f(-1,-1,-1));
Vec3fa diffuse = colors[ray.primID];
color = color + diffuse*0.5f; // FIXME: +=
Vec3fa lightDir = normalize(Vec3fa(-1,-1,-1));
/* initialize shadow ray */
RTCRay shadow;
shadow.org = add(ray.org,mul(ray.tfar,ray.dir));
shadow.org = ray.org + ray.tfar*ray.dir;
shadow.dir = neg(lightDir);
shadow.tnear = 0.001f;
shadow.tfar = inf;
@@ -163,20 +200,46 @@ Vec3fa renderPixelStandard(int x, int y, const Vec3fa& vx, const Vec3fa& vy, con
/* add light contribution */
if (shadow.geomID)
color = add(color,mul(diffuse,clamp(-dot(lightDir,normalize(ray.Ng)),0.0f,1.0f)));
color = color + diffuse*clamp(-dot(lightDir,normalize(ray.Ng)),0.0f,1.0f); // FIXME: +=
}
return color;
}
unsigned int rand_lcg(unsigned int &rng_state)
{
// LCG values from Numerical Recipes
rng_state = 1664525 * rng_state + 1013904223;
return rng_state;
}
unsigned int rand_xorshift(unsigned int &rng_state)
{
// Xorshift algorithm from George Marsaglia's paper
rng_state ^= (rng_state << 13);
rng_state ^= (rng_state >> 17);
rng_state ^= (rng_state << 5);
return rng_state;
}
unsigned int wang_hash(unsigned int &seed)
{
seed = (seed ^ 61) ^ (seed >> 16);
seed *= 9;
seed = seed ^ (seed >> 4);
seed *= 0x27d4eb2d;
seed = seed ^ (seed >> 15);
return seed;
}
/* task that renders a single screen tile */
void renderTile(int taskIndex, int* pixels,
const int width,
const int height,
const float time,
const Vec3f& vx,
const Vec3f& vy,
const Vec3f& vz,
const Vec3f& p,
const Vec3fa& vx,
const Vec3fa& vy,
const Vec3fa& vz,
const Vec3fa& p,
const int numTilesX,
const int numTilesY)
{
@@ -187,10 +250,21 @@ void renderTile(int taskIndex, int* pixels,
const int y0 = tileY * TILE_SIZE_Y;
const int y1 = min(y0+TILE_SIZE_Y,height);
//unsigned int seed = tileY*numTilesX+tileX+0;
//seed = wang_hash( seed );
for (int y = y0; y<y1; y++) for (int x = x0; x<x1; x++)
{
unsigned int seed = y * width + x + 0;
rand_xorshift(seed);
rand_xorshift(seed);
/* calculate pixel color */
Vec3f color = renderPixel(x,y,vx,vy,vz,p);
Vec3fa color = renderPixel(x,y,vx,vy,vz,p);
//float f = ((float)rand_xorshift(seed)) * (1.0f / 4294967296.0f);
//float f = ((float)wang_hash(seed)) * (1.0f / 4294967296.0f);
//Vec3fa color = Vec3fa(f);
/* write color to framebuffer */
unsigned int r = (unsigned int) (255.0f * clamp(color.x,0.0f,1.0f));
@@ -205,10 +279,10 @@ extern "C" void device_render (int* pixels,
const int width,
const int height,
const float time,
const Vec3f& vx,
const Vec3f& vy,
const Vec3f& vz,
const Vec3f& p)
const Vec3fa& vx,
const Vec3fa& vy,
const Vec3fa& vz,
const Vec3fa& p)
{
const int numTilesX = (width +TILE_SIZE_X-1)/TILE_SIZE_X;
const int numTilesY = (height+TILE_SIZE_Y-1)/TILE_SIZE_Y;
@@ -220,7 +294,7 @@ extern "C" void device_render (int* pixels,
extern "C" void device_cleanup ()
{
rtcDeleteScene (g_scene);
delete[] colors;
alignedFree(colors);
rtcExit();
}