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/tutorial03/tutorial03_device.cpp
Vendored Regular → Executable
+82 -110
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. //
@@ -15,46 +15,9 @@
// ======================================================================== //
#include "../common/tutorial/tutorial_device.h"
#include "../common/tutorial/scene_device.h"
struct ISPCTriangle
{
int v0; /*< first triangle vertex */
int v1; /*< second triangle vertex */
int v2; /*< third triangle vertex */
int materialID; /*< material of triangle */
};
struct ISPCMaterial
{
int illum; /*< illumination model */
float d; /*< dissolve factor, 1=opaque, 0=transparent */
float Ns; /*< specular exponent */
float Ni; /*< optical density for the surface (index of refraction) */
Vec3f Ka; /*< ambient reflectivity */
Vec3f Kd; /*< diffuse reflectivity */
Vec3f Ks; /*< specular reflectivity */
Vec3f Tf; /*< transmission filter */
};
struct ISPCMesh
{
Vec3fa* positions; //!< vertex position array
Vec3fa* normals; //!< vertex normal array
Vec2f* texcoords; //!< vertex texcoord array
ISPCTriangle* triangles; //!< list of triangles
int numVertices;
int numTriangles;
};
struct ISPCScene
{
ISPCMesh** meshes; //!< list of meshes
ISPCMaterial* materials; //!< material list
int numMeshes;
int numMaterials;
};
/* scene data */
extern "C" ISPCScene* g_ispc_scene;
@@ -63,14 +26,41 @@ RTCScene g_scene = 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();
}
Vec3fa renderPixelEyeLight(float x, float y, const Vec3fa& vx, const Vec3fa& vy, const Vec3fa& vz, const Vec3fa& p);
/* called by the C++ code for initialization */
extern "C" void device_init (int8* cfg)
{
/* initialize ray tracing core */
rtcInit(cfg);
/* set error handler */
rtcSetErrorFunction(error_handler);
/* set start render mode */
renderPixel = renderPixelStandard;
//renderPixel = renderPixelEyeLight;
}
RTCScene convertScene(ISPCScene* scene_in)
@@ -78,6 +68,7 @@ RTCScene convertScene(ISPCScene* scene_in)
/* create scene */
RTCScene scene_out = rtcNewScene(RTC_SCENE_STATIC,RTC_INTERSECT1);
/* add all meshes to the scene */
for (int i=0; i<scene_in->numMeshes; i++)
{
@@ -87,63 +78,22 @@ RTCScene convertScene(ISPCScene* scene_in)
/* create a triangle mesh */
unsigned int geometry = rtcNewTriangleMesh (scene_out, RTC_GEOMETRY_STATIC, mesh->numTriangles, mesh->numVertices);
#if 1
/* share vertex buffer */
rtcSetBuffer(scene_out, geometry, RTC_VERTEX_BUFFER, mesh->positions, 0, sizeof(Vec3fa ));
//rtcSetBuffer(scene_out, geometry, RTC_INDEX_BUFFER, mesh->triangles, 0, sizeof(ISPCTriangle));
/* set triangles */
Triangle* triangles = (Triangle*) rtcMapBuffer(scene_out,geometry,RTC_INDEX_BUFFER);
for (int j=0; j<mesh->numTriangles; j++) {
triangles[j].v0 = mesh->triangles[j].v0;
triangles[j].v1 = mesh->triangles[j].v1;
triangles[j].v2 = mesh->triangles[j].v2;
}
rtcUnmapBuffer(scene_out,geometry,RTC_INDEX_BUFFER);
#elif 0
Vec3f* positions = new Vec3f[mesh->numVertices+1];
for (int j=0; j<mesh->numVertices; j++) {
positions[j].x = mesh->positions[j].x;
positions[j].y = mesh->positions[j].y;
positions[j].z = mesh->positions[j].z;
}
rtcSetBuffer(scene_out, geometry, RTC_VERTEX_BUFFER, positions, 0, sizeof(Vec3f));
rtcSetBuffer(scene_out, geometry, RTC_INDEX_BUFFER, mesh->triangles, 0, sizeof(ISPCTriangle));
#else
/* set vertices */
Vertex* vertices = (Vertex*) rtcMapBuffer(scene_out,geometry,RTC_VERTEX_BUFFER);
for (int j=0; j<mesh->numVertices; j++) {
vertices[j].x = mesh->positions[j].x;
vertices[j].y = mesh->positions[j].y;
vertices[j].z = mesh->positions[j].z;
}
rtcUnmapBuffer(scene_out,geometry,RTC_VERTEX_BUFFER);
/* set triangles */
Triangle* triangles = (Triangle*) rtcMapBuffer(scene_out,geometry,RTC_INDEX_BUFFER);
for (int j=0; j<mesh->numTriangles; j++) {
triangles[j].v0 = mesh->triangles[j].v0;
triangles[j].v1 = mesh->triangles[j].v1;
triangles[j].v2 = mesh->triangles[j].v2;
}
rtcUnmapBuffer(scene_out,geometry,RTC_INDEX_BUFFER);
#endif
}
/* commit changes to scene */
rtcCommit (scene_out);
return scene_out;
}
/* 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;
@@ -155,10 +105,12 @@ Vec3fa renderPixelStandard(int x, int y, const Vec3fa& vx, const Vec3fa& vy, con
rtcIntersect(g_scene,ray);
/* shade background black */
if (ray.geomID == RTC_INVALID_GEOMETRY_ID) return Vec3f(0.0f);
if (ray.geomID == RTC_INVALID_GEOMETRY_ID) return Vec3fa(0.0f);
/* shade all rays that hit something */
Vec3f color = Vec3f(0.0f);
Vec3fa color = Vec3fa(0.0f);
Vec3fa Ns = Vec3fa(0.0f);
#if 1 // FIXME: pointer gather not implemented on ISPC for Xeon Phi
ISPCMesh* mesh = g_ispc_scene->meshes[ray.geomID];
ISPCTriangle* tri = &mesh->triangles[ray.primID];
@@ -167,17 +119,19 @@ Vec3fa renderPixelStandard(int x, int y, const Vec3fa& vx, const Vec3fa& vy, con
int materialID = tri->materialID;
/* interpolate shading normal */
Vec3f n0 = Vec3f(mesh->normals[tri->v0]);
Vec3f n1 = Vec3f(mesh->normals[tri->v1]);
Vec3f n2 = Vec3f(mesh->normals[tri->v2]);
float u = ray.u, v = ray.v, w = 1.0f-ray.u-ray.v;
Vec3f Ns = add(add(mul(w,n0),mul(u,n1)),mul(v,n2));
Ns = normalize(Ns);
if (mesh->normals) {
Vec3fa n0 = Vec3fa(mesh->normals[tri->v0]);
Vec3fa n1 = Vec3fa(mesh->normals[tri->v1]);
Vec3fa n2 = Vec3fa(mesh->normals[tri->v2]);
float u = ray.u, v = ray.v, w = 1.0f-ray.u-ray.v;
Ns = normalize(w*n0 + u*n1 + v*n2);
} else {
Ns = normalize(ray.Ng);
}
#else
int materialID = 0;
Vec3f Ns = Vec3f(0.0f);
foreach_unique (geomID in ray.geomID)
{
ISPCMesh* mesh = g_ispc_scene->meshes[geomID];
@@ -190,23 +144,27 @@ Vec3fa renderPixelStandard(int x, int y, const Vec3fa& vx, const Vec3fa& vy, con
materialID = tri->materialID;
/* interpolate shading normal */
Vec3f n0 = Vec3f(mesh->normals[tri->v0]);
Vec3f n1 = Vec3f(mesh->normals[tri->v1]);
Vec3f n2 = Vec3f(mesh->normals[tri->v2]);
float u = ray.u, v = ray.v, w = 1.0f-ray.u-ray.v;
Ns = add(add(mul(w,n0),mul(u,n1)),mul(v,n2));
if (mesh->normals) {
Vec3fa n0 = Vec3fa(mesh->normals[tri->v0]);
Vec3fa n1 = Vec3fa(mesh->normals[tri->v1]);
Vec3fa n2 = Vec3fa(mesh->normals[tri->v2]);
float u = ray.u, v = ray.v, w = 1.0f-ray.u-ray.v;
Ns = w*n0 + u*n1 + v*n2;
} else {
Ns = normalize(ray.Ng);
}
}
}
Ns = normalize(Ns);
#endif
ISPCMaterial* material = &g_ispc_scene->materials[materialID];
color = material->Kd;
OBJMaterial* material = (OBJMaterial*) &g_ispc_scene->materials[materialID];
color = Vec3fa(material->Kd);
/* apply ambient light */
Vec3f Nf = faceforward(Ns,neg(ray.dir),ray.Ng);
Vec3fa Nf = faceforward(Ns,neg(ray.dir),Ns);
//Vec3fa Ng = normalize(ray.Ng);
//Vec3f Nf = dot(ray.dir,Ng) < 0.0f ? Ng : neg(Ng);
color = mul(color,dot(ray.dir,Nf));
//Vec3fa Nf = dot(ray.dir,Ng) < 0.0f ? Ng : neg(Ng);
color = color*dot(ray.dir,Nf); // FIXME: *=
return color;
}
@@ -215,10 +173,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)
{
@@ -232,7 +190,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));
@@ -242,19 +200,33 @@ void renderTile(int taskIndex, int* pixels,
}
}
/* 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
/* called by the C++ code to render */
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)
{
/* create scene */
if (g_scene == NULL)
{
g_scene = convertScene(g_ispc_scene);
#if !defined(PARALLEL_COMMIT)
rtcCommit (g_scene);
#else
launch[ getNumHWThreads() ] parallelCommit(g_scene);
#endif
}
/* render image */
const int numTilesX = (width +TILE_SIZE_X-1)/TILE_SIZE_X;