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/tutorial01/tutorial01_device.cpp
Vendored Regular → Executable
+69 -27
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,6 +16,8 @@
#include "../common/tutorial/tutorial_device.h"
#if 0
const int numSpheres = 1000;
const int numPhi = 5;
@@ -28,16 +30,36 @@ const int numTheta = 2*numPhi;
/* scene data */
RTCScene g_scene = NULL;
Vec3f position[numSpheres];
Vec3f colors[numSpheres+1];
Vec3fa position[numSpheres];
Vec3fa colors[numSpheres+1];
float radius[numSpheres];
int disabledID = -1;
/* 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();
}
/* adds a sphere to the scene */
unsigned int createSphere (RTCGeometryFlags flags, const Vec3f pos, const float r)
unsigned int createSphere (RTCGeometryFlags flags, const Vec3fa& pos, const float r)
{
/* create a triangulated sphere */
unsigned int mesh = rtcNewTriangleMesh (g_scene, flags, 2*numTheta*(numPhi-1), numTheta*(numPhi+1));
@@ -91,6 +113,13 @@ unsigned int createSphere (RTCGeometryFlags flags, const Vec3f pos, const float
return mesh;
}
/* 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 ground plane to the scene */
unsigned int addGroundPlane (RTCScene scene_i)
{
@@ -120,6 +149,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_DYNAMIC,RTC_INTERSECT1);
@@ -128,7 +160,8 @@ extern "C" void device_init (int8* cfg)
{
const float phi = i*2.0f*float(pi)/numSpheres;
const float r = 2.0f*float(pi)/numSpheres;
const Vec3f p = mul(2.0f,Vec3f(sin(phi),0.0f,-cos(phi)));
const Vec3fa p = 2.0f*Vec3fa(sin(phi),0.0f,-cos(phi));
//RTCGeometryFlags flags = i%3 == 0 ? RTC_GEOMETRY_STATIC : i%3 == 1 ? RTC_GEOMETRY_DEFORMABLE : RTC_GEOMETRY_DYNAMIC;
RTCGeometryFlags flags = i%2 ? RTC_GEOMETRY_DEFORMABLE : RTC_GEOMETRY_DYNAMIC;
//RTCGeometryFlags flags = RTC_GEOMETRY_DEFORMABLE;
int id = createSphere(flags,p,r);
@@ -141,10 +174,14 @@ extern "C" void device_init (int8* cfg)
/* add ground plane to scene */
int id = addGroundPlane(g_scene);
colors[id] = Vec3f(1.0f,1.0f,1.0f);
colors[id] = Vec3fa(1.0f,1.0f,1.0f);
/* commit changes to scene */
#if !defined(PARALLEL_COMMIT)
rtcCommit (g_scene);
#else
launch[ getNumHWThreads() ] parallelCommit(g_scene);
#endif
/* set start render mode */
renderPixel = renderPixelStandard;
@@ -154,7 +191,7 @@ extern "C" void device_init (int8* cfg)
void animateSphere (int taskIndex, Vertex* vertices,
const float rcpNumTheta,
const float rcpNumPhi,
const Vec3f pos,
const Vec3fa& pos,
const float r,
const float f)
{
@@ -171,12 +208,12 @@ void animateSphere (int taskIndex, Vertex* vertices,
}
/* 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;
@@ -188,16 +225,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.geomID];
color = add(color,mul(diffuse,0.1f));
Vec3f lightDir = normalize(Vec3f(-1,-1,-1));
Vec3fa diffuse = colors[ray.geomID];
color = color + diffuse*0.1f; // 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;
@@ -211,7 +248,7 @@ 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;
}
@@ -221,10 +258,10 @@ 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)
{
@@ -238,7 +275,7 @@ void renderTile(int taskIndex, int* pixels,
for (int y = y0; y<y1; y++) for (int x = x0; x<x1; x++)
{
/* calculate pixel color */
Vec3f color = renderPixel(x,y,vx,vy,vz,p);
Vec3fa color = renderPixel(x,y,vx,vy,vz,p);
/* write color to framebuffer */
unsigned int r = (unsigned int) (255.0f * clamp(color.x,0.0f,1.0f));
@@ -255,13 +292,13 @@ void animateSphere (int id, float time)
Vertex* vertices = (Vertex*) rtcMapBuffer(g_scene,id,RTC_VERTEX_BUFFER);
const float rcpNumTheta = rcp((float)numTheta);
const float rcpNumPhi = rcp((float)numPhi);
const Vec3f pos = position[id];
const Vec3fa pos = position[id];
const float r = radius[id];
const float f = 2.0f*(1.0f+0.5f*sin(time));
/* loop over all vertices */
#if 0
launch_animateSphere(numPhi+1,vertices,rcpNumTheta,rcpNumPhi,pos,r,f);
#if 1 // enables parallel execution
launch_animateSphere(animateSphere,numPhi+1,vertices,rcpNumTheta,rcpNumPhi,pos,r,f);
#else
for (int phi = 0; phi <numPhi+1; phi++) for (int theta = 0; theta<numTheta; theta++)
{
@@ -285,17 +322,22 @@ 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)
{
/* animate sphere */
for (int i=0; i<numSpheres; i++)
animateSphere(i,time+i);
/* commit changes to scene */
#if !defined(PARALLEL_COMMIT)
rtcCommit (g_scene);
#else
launch[ getNumHWThreads() ] parallelCommit(g_scene);
#endif
/* render all pixels */
const int numTilesX = (width +TILE_SIZE_X-1)/TILE_SIZE_X;