cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove expired ports:

Browse Source 
2019-09-04 graphics/luxrender14: Depends on expiring graphics/embree, broken with boost 1.70
2019-09-04 graphics/luxrender: Depends on expiring graphics/embree, broken with boost 1.70
This commit is contained in:
Rene Ladan 2019-09-07 11:38:09 +00:00
parent 836ef591f9
commit 9a3514e3bc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=511403
22 changed files with 2 additions and 1274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MOVED
View File

@ -12952,3 +12952,5 @@ x11-toolkits/p5-Wx-Perl-ProcessStream||2019-09-05|Has expired: Depends on expiri
x11-wm/golem||2019-09-05|Has expired: Broken for more than 6 months
x11-wm/pawm||2019-09-05|Has expired: Broken for more than 6 months
x11-toolkits/p5-Wx||2019-09-07|Has expired: Broken for more than 6 months
graphics/luxrender14||2019-09-07|Has expired: Depends on expiring graphics/embree, broken with boost 1.70
graphics/luxrender||2019-09-07|Has expired: Depends on expiring graphics/embree, broken with boost 1.70

2
graphics/Makefile
View File

@ -534,8 +534,6 @@
SUBDIR += linux-c7-wayland
SUBDIR += lua-gd
SUBDIR += luminance-qt5
SUBDIR += luxrender
SUBDIR += luxrender14
SUBDIR += lximage-qt
SUBDIR += magnum
SUBDIR += magnum-examples

81
graphics/luxrender/Makefile
View File

@ -1,81 +0,0 @@
# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
# $FreeBSD$
PORTNAME= luxrender
DISTVERSION?= 1.6
PORTREVISION= 15
CATEGORIES= graphics
MASTER_SITES= https://bitbucket.org/luxrender/lux/get/ \
https://bitbucket.org/luxrender/luxrays/get/:lr
DISTFILES= v${DISTVERSION:C/[.-]//g}${EXTRACT_SUFX} \
${PORTNAME}_v${DISTVERSION:S/-//}${EXTRACT_SUFX}:lr
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= danfe@FreeBSD.org
COMMENT= Physically based and unbiased rendering system
LICENSE= GPLv3
BROKEN= fails to build with boost 1.70, see bug 236599
DEPRECATED= Depends on expiring graphics/embree
EXPIRATION_DATE= 2019-09-04
LIB_DEPENDS= ${PY_BOOST} \
libfftw3.so:math/fftw3 \
libOpenImageIO.so:graphics/openimageio
.if ${DISTVERSION} != 1.4
LIB_DEPENDS+= libembree.so:graphics/embree
.endif
CONFLICTS_INSTALL?= ${PORTNAME}14-1.4*
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= uses SSE instructions
USES+= bison cmake:noninja python:build tar:bzip2
USE_GL= glu
WRKSRC= ${WRKDIR}/${PORTNAME}-lux-${LUX_REV}
LUXRAYS_WRKSRC= ${WRKDIR}/${PORTNAME}-luxrays-${LUXRAYS_REV}
CMAKE_ARGS= -DLUXCORE_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \
-DLUXCORE_LIBRARY:STRING="${LUXRAYS_WRKSRC}/lib/libluxcore.a" \
-DLUXRAYS_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \
-DLUXRAYS_LIBRARY:STRING="${LUXRAYS_WRKSRC}/lib/libluxrays.a" \
-DSLG_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \
-DSLG_LIBRARY:PATH="${LUXRAYS_WRKSRC}/lib/libsmallluxgpu.a" \
-DLUXRAYS_DISABLE_OPENCL:BOOL=ON
LUX_REV?= b3f85cf7742f
LUXRAYS_REV?= 61352e6aae3f
OPTIONS_DEFINE= FREEIMAGE X11
OPTIONS_DEFAULT= X11
FREEIMAGE_DESC= Build with FreeImage (otherwise use OIIO only)
FREEIMAGE_CMAKE_ON= -DLUX_USE_FREEIMAGE:BOOL=ON
FREEIMAGE_LIB_DEPENDS= libfreeimage.so:graphics/freeimage
post-extract:
@${LN} -sf ${PORTNAME}-luxrays-${LUXRAYS_REV} ${WRKDIR}/luxrays
post-patch:
@${REINPLACE_CMD} -e 's/__APPLE__/__FreeBSD__/' \
${WRKSRC}/core/osfunc.h \
${WRKSRC}/shapes/mikktspace/weldmesh.c
# Avoid infamous "local symbol discarded in section `.text...' errors
@${REINPLACE_CMD} -e '/^set(Boost_USE_STATIC_LIBS/s,ON,OFF,' \
${LUXRAYS_WRKSRC}/cmake/Dependencies.cmake
# Avoid picking up Python 3.x bits if they're installed
@${REINPLACE_CMD} -e 's,PythonLibs,& ${PYTHON_VER} EXACT REQUIRED,' \
${LUXRAYS_WRKSRC}/cmake/Dependencies.cmake \
${WRKSRC}/cmake/pylux.cmake
pre-configure:
-${PYTHON_CMD} ${WRKSRC}/makeBuildNumber.py ${WRKSRC}/core/version.h
cd ${LUXRAYS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \
${CMAKE_ARGS} .
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
${_MAKE_JOBS} ${MAKE_ARGS} -C ${LUXRAYS_WRKSRC}
.include <bsd.port.mk>

4
graphics/luxrender/distinfo
View File

@ -1,4 +0,0 @@
SHA256 (luxrender/v16.tar.bz2) = 29144f657087644086928a66421df5d25fc4dccd05970200932f5693650ddecf
SIZE (luxrender/v16.tar.bz2) = 2421141
SHA256 (luxrender/luxrender_v1.6.tar.bz2) = eb38489e4bcb1336027efc8fa991f506bf78e8cb9edc7b73794e0cdcf998b15a
SIZE (luxrender/luxrender_v1.6.tar.bz2) = 36615450

19
graphics/luxrender/files/patch-CMakeLists.txt
View File

@ -1,19 +0,0 @@
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -210,7 +210,6 @@ IF(NOT APPLE AND NOT WIN32)
STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _mach_x86_64 ${MACHINE})
IF (_mach_x86_64)
SET(ARCH_X86_64 1)
- SET(LIB_SUFFIX 64)
#jromang - Hack to avoid boost bug on x64 Ubuntu 8.10 and Fedora 10 (http://www.luxrender.net/mantis/view.php?id=433)
ADD_DEFINITIONS(-DBOOST_NO_INTRINSIC_INT64_T)
ENDIF (_mach_x86_64)
@@ -402,7 +401,7 @@ ELSEIF(MSVC)
ELSE(APPLE)
# Dade - default compiler options
# Removed "-O3" from definitions in order to have CMake Release/Debug options to work
- ADD_DEFINITIONS(-msse2 -mfpmath=sse -ftree-vectorize -funroll-loops -Wall -fPIC -DHAVE_PTHREAD_H)
+ ADD_DEFINITIONS(-msse -Wall -fPIC -DHAVE_PTHREAD_H)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fvisibility=hidden -fvisibility-inlines-hidden")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fvisibility=hidden -fvisibility-inlines-hidden")
# The QBVH accelerator needs to be compiled with much reduced optimizations

23
graphics/luxrender/files/patch-accelerators_bvhaccel.cpp
View File

@ -1,23 +0,0 @@
After http://github.com/boostorg/range/commit/69409ed63a9e1 build fails:
accelerators/bvhaccel.cpp:149:19: error: call to 'distance' is ambiguous
u_int middle = distance(list.begin(), it);
^~~~~~~~
/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = std::__1::__wrap_iter<boost::shared_ptr<lux::BVHAccelTreeNode> *>]
distance(_InputIter __first, _InputIter __last)
^
/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = std::__1::__wrap_iter<boost::shared_ptr<lux::BVHAccelTreeNode> *>]
distance(SinglePassIterator first, SinglePassIterator last)
^
--- accelerators/bvhaccel.cpp.orig 2016-05-09 21:21:17 UTC
+++ accelerators/bvhaccel.cpp
@@ -146,7 +146,7 @@ boost::shared_ptr<BVHAccelTreeNode> BVHAccel::BuildHie
vector<boost::shared_ptr<BVHAccelTreeNode> >::iterator it =
partition(list.begin()+splits[j], list.begin()+splits[j+1], bind2nd(ptr_fun(bvh_ltf[splitAxis]), splitValue));
- u_int middle = distance(list.begin(), it);
+ u_int middle = std::distance(list.begin(), it);
middle = max(splits[j]+1, min(splits[j+1]-1, middle)); // Make sure coincidental BBs are still split
splits.insert(splits.begin()+j+1, middle);
}

40
graphics/luxrender/files/patch-c++14-fixes
View File

@ -1,40 +0,0 @@
--- core/queryable/queryable.h.orig 2016-05-09 21:21:17 UTC
+++ core/queryable/queryable.h
@@ -194,7 +194,7 @@ class LUX_EXPORT Queryable (public)
}
template<class T> friend void AddStringAttribute(T &object,
const std::string &name, const std::string &description,
- const boost::function<std::string (void)> &get, const boost::function<void (std::string)> set = NULL) {
+ const boost::function<std::string (void)> &get, const boost::function<void (std::string)> set = 0x0) {
AddAttrib<QueryableStringAttribute>(object, name, description, get, set);
}
--- core/scheduler.cpp.orig 2016-05-09 21:21:17 UTC
+++ core/scheduler.cpp
@@ -43,7 +43,7 @@ void NullTask(Range*){}
Scheduler::Scheduler(unsigned step)
{
- current_task = NULL;
+ current_task = 0x0;
default_step = step;
state = RUNNING;
@@ -127,7 +127,7 @@ TaskType Scheduler::GetTask()
condition.wait(lock);
if(current_task == NullTask)
- return NULL;
+ return 0x0;
return current_task;
}
@@ -152,7 +152,7 @@ bool Scheduler::EndTask(Thread* thread)
if(counter == 0)
{
- current_task = NULL;
+ current_task = 0x0;
condition.notify_all();
}
else

394
graphics/luxrender/files/patch-gcc42-fixes
View File

@ -1,394 +0,0 @@
--- ../luxrays/include/luxrays/core/geometry/frame.h.orig
+++ ../luxrays/include/luxrays/core/geometry/frame.h
@@ -46,11 +46,11 @@ public:
SetFromZ(z);
}
- Frame(const Normal &z) {
+ Frame(const luxrays::Normal &z) {
SetFromZ(Vector(z));
}
- void SetFromZ(const Normal &z) {
+ void SetFromZ(const luxrays::Normal &z) {
SetFromZ(Vector(z));
}
--- textures/bilerp.h.orig
+++ textures/bilerp.h
@@ -39,7 +39,7 @@ public:
// BilerpTexture Public Methods
BilerpFloatTexture(TextureMapping2D *m,
float t00, float t01, float t10, float t11) :
- Texture("BilerpFloatTexture-" + boost::lexical_cast<string>(this)) {
+ lux::Texture<float>::Texture("BilerpFloatTexture-" + boost::lexical_cast<string>(this)) {
mapping = m;
v00 = t00;
v01 = t01;
@@ -87,7 +87,7 @@ public:
BilerpSpectrumTexture(TextureMapping2D *m,
const RGBColor &t00, const RGBColor &t01,
const RGBColor &t10, const RGBColor &t11) :
- Texture("BilerpSpectrumTexture-" + boost::lexical_cast<string>(this)) {
+ lux::Texture<lux::SWCSpectrum>::Texture("BilerpSpectrumTexture-" + boost::lexical_cast<string>(this)) {
mapping = m;
v00 = t00;
v01 = t01;
@@ -145,7 +145,7 @@ public:
const boost::shared_ptr<Texture<FresnelGeneral> > &t01,
const boost::shared_ptr<Texture<FresnelGeneral> > &t10,
const boost::shared_ptr<Texture<FresnelGeneral> > &t11) :
- Texture("BilerpFresnelTexture-" + boost::lexical_cast<string>(this)) {
+ lux::Texture<lux::FresnelGeneral>::Texture("BilerpFresnelTexture-" + boost::lexical_cast<string>(this)) {
mapping = m;
v00 = t00;
v01 = t01;
--- textures/blackbody.h.orig
+++ textures/blackbody.h
@@ -34,7 +34,7 @@ namespace lux
class BlackBodyTexture : public Texture<SWCSpectrum> {
public:
// BlackBodyTexture Public Methods
- BlackBodyTexture(float t) : Texture("BlackBodyTexture-" + boost::lexical_cast<string>(this)),
+ BlackBodyTexture(float t) : lux::Texture<lux::SWCSpectrum>::Texture("BlackBodyTexture-" + boost::lexical_cast<string>(this)),
BBSPD(t) { }
virtual ~BlackBodyTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
--- textures/blender_base.h.orig
+++ textures/blender_base.h
@@ -34,7 +34,7 @@ public:
virtual ~BlenderTexture3D() { }
BlenderTexture3D(const std::string &name, const Transform &tex2world, const ParamSet &tp,
- short type) : Texture(name) {
+ short type) : lux::Texture<float>::Texture(name) {
// Read mapping coordinates
mapping = TextureMapping3D::Create(tex2world, tp);
tex1 = tp.GetFloatTexture("tex1", 0.f);
--- textures/cauchytexture.h.orig
+++ textures/cauchytexture.h
@@ -35,7 +35,7 @@ class CauchyTexture : public Texture<Fre
public:
// ConstantTexture Public Methods
CauchyTexture(float cauchya, float cauchyb) :
- Texture("CauchyTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::FresnelGeneral>::Texture("CauchyTexture-" + boost::lexical_cast<string>(this)),
fresnel(cauchya, cauchyb, 0.f), index(cauchya + cauchyb * 1e6f /
(WAVELENGTH_END * WAVELENGTH_START)) { }
virtual ~CauchyTexture() { }
--- textures/checkerboard.h.orig
+++ textures/checkerboard.h
@@ -42,7 +42,7 @@ public:
Checkerboard2D(TextureMapping2D *m,
boost::shared_ptr<Texture<float> > &c1,
boost::shared_ptr<Texture<float> > &c2, const string &aa) :
- Texture("Checkerboard2D-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("Checkerboard2D-" + boost::lexical_cast<string>(this)),
tex1(c1), tex2(c2), mapping(m) {
// Select anti-aliasing method for _Checkerboard2D_
if (aa == "none")
@@ -226,7 +226,7 @@ public:
Checkerboard3D(TextureMapping3D *m,
boost::shared_ptr<Texture<float> > &c1,
boost::shared_ptr<Texture<float> > &c2) :
- Texture("Checkerboard3D-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("Checkerboard3D-" + boost::lexical_cast<string>(this)),
tex1(c1), tex2(c2), mapping(m) { }
virtual ~Checkerboard3D() { delete mapping; }
virtual float Evaluate(const SpectrumWavelengths &sw,
--- textures/cloud.h.orig
+++ textures/cloud.h
@@ -47,7 +47,7 @@ public:
const u_int octaves, const float o, const float offset,
const u_int numspheres, const float spheresize,
TextureMapping3D *map) :
- Texture("CloudTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("CloudTexture-" + boost::lexical_cast<string>(this)),
radius(r), numSpheres(numspheres), sphereSize(spheresize),
sharpness(sharp), baseFlatness(baseflatness), variability(v),
omega(o), firstNoiseScale(noiseScale), noiseOffset(offset),
--- textures/colordepth.h.orig
+++ textures/colordepth.h
@@ -34,7 +34,7 @@ class ColorDepthTexture : public Texture
public:
// ColorDepthTexture Public Methods
ColorDepthTexture(float t, boost::shared_ptr<Texture<SWCSpectrum> > &c) :
- Texture("ColorDepthTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::SWCSpectrum>::Texture("ColorDepthTexture-" + boost::lexical_cast<string>(this)),
d(-max(1e-3f, t)), color(c) { }
virtual ~ColorDepthTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
--- textures/constant.h.orig
+++ textures/constant.h
@@ -36,7 +36,7 @@ class ConstantFloatTexture : public Text
public:
// ConstantTexture Public Methods
ConstantFloatTexture(float v) :
- Texture("ConstantFloatTexture-" + boost::lexical_cast<string>(this)), value(v) {
+ lux::Texture<float>::Texture("ConstantFloatTexture-" + boost::lexical_cast<string>(this)), value(v) {
AddFloatAttribute(*this, "value", "ConstantFloatTexture value", &ConstantFloatTexture::value);
}
virtual ~ConstantFloatTexture() { }
@@ -60,7 +60,7 @@ class ConstantRGBColorTexture : public T
public:
// ConstantTexture Public Methods
ConstantRGBColorTexture(const RGBColor &s) :
- Texture("ConstantRGBColorTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::SWCSpectrum>::Texture("ConstantRGBColorTexture-" + boost::lexical_cast<string>(this)),
color(s) {
RGBSPD = new RGBReflSPD(color);
@@ -99,7 +99,7 @@ class ConstantFresnelTexture : public Te
public:
// ConstantTexture Public Methods
ConstantFresnelTexture(float v) :
- Texture("ConstantFresnelTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::FresnelGeneral>::Texture("ConstantFresnelTexture-" + boost::lexical_cast<string>(this)),
value(DIELECTRIC_FRESNEL, SWCSpectrum(v), 0.f), val(v) {
AddFloatAttribute(*this, "value", "ConstantFresnelTexture value", &ConstantFresnelTexture::val);
}
--- textures/densitygrid.h.orig
+++ textures/densitygrid.h
@@ -39,7 +39,7 @@ public:
// DensityGridTexture Public Methods
DensityGridTexture(int x, int y, int z, const float *d,
enum WrapMode w, TextureMapping3D *map) :
- Texture("DensityGridTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("DensityGridTexture-" + boost::lexical_cast<string>(this)),
nx(x), ny(y), nz(z), wrapMode(w), mapping(map) {
density.assign(d, d + nx * ny * nz);
dMin = *std::min_element(density.begin(), density.end());
--- textures/dots.h.orig
+++ textures/dots.h
@@ -37,7 +37,7 @@ public:
// DotsTexture Public Methods
DotsTexture(TextureMapping2D *m, boost::shared_ptr<Texture<float> > &c1,
boost::shared_ptr<Texture<float> > &c2) :
- Texture("DotsTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("DotsTexture-" + boost::lexical_cast<string>(this)),
outsideDot(c1), insideDot(c2), mapping(m) { }
virtual ~DotsTexture() { delete mapping; }
virtual float Evaluate(const SpectrumWavelengths &sw,
--- textures/equalenergy.h.orig
+++ textures/equalenergy.h
@@ -35,7 +35,7 @@ class EqualEnergyTexture : public Textur
public:
// EqualEnergyTexture Public Methods
EqualEnergyTexture(float t) :
- Texture("EqualEnergyTexture-" + boost::lexical_cast<string>(this)), e(t) { }
+ lux::Texture<lux::SWCSpectrum>::Texture("EqualEnergyTexture-" + boost::lexical_cast<string>(this)), e(t) { }
virtual ~EqualEnergyTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
const DifferentialGeometry &) const {
--- textures/exponential.h.orig
+++ textures/exponential.h
@@ -36,7 +36,7 @@ public:
// ExponentialTexture Public Methods
ExponentialTexture(const Point &o, const Vector &up, float d,
TextureMapping3D *map) :
- Texture("ExponentialTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("ExponentialTexture-" + boost::lexical_cast<string>(this)),
origin(o), upDir(up), decay(d), mapping(map) { }
virtual ~ExponentialTexture() { delete mapping; }
virtual float Evaluate(const SpectrumWavelengths &sw,
--- textures/fbm.h.orig
+++ textures/fbm.h
@@ -37,7 +37,7 @@ class FBmTexture : public Texture<float>
public:
// FBmTexture Public Methods
FBmTexture(int oct, float roughness, TextureMapping3D *map) :
- Texture("FBmTexture-" + boost::lexical_cast<string>(this)) {
+ lux::Texture<float>::Texture("FBmTexture-" + boost::lexical_cast<string>(this)) {
omega = roughness;
octaves = oct;
mapping = map;
--- textures/frequencytexture.h.orig
+++ textures/frequencytexture.h
@@ -35,7 +35,7 @@ class FrequencyTexture : public Texture<
public:
// FrequencyTexture Public Methods
FrequencyTexture(float w, float p, float r)
- : Texture("FrequencyTexture-" + boost::lexical_cast<string>(this)),
+ : lux::Texture<lux::SWCSpectrum>::Texture("FrequencyTexture-" + boost::lexical_cast<string>(this)),
FSPD(w, p, r) { }
virtual ~FrequencyTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
--- textures/fresnelcolor.h.orig
+++ textures/fresnelcolor.h
@@ -34,7 +34,7 @@ class FresnelColorTexture : public Textu
public:
// FresnelColorTexture Public Methods
FresnelColorTexture(const boost::shared_ptr<Texture<SWCSpectrum> > &c) :
- Texture("FresnelColorTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::FresnelGeneral>::Texture("FresnelColorTexture-" + boost::lexical_cast<string>(this)),
color(c) { }
virtual ~FresnelColorTexture() { }
virtual FresnelGeneral Evaluate(const SpectrumWavelengths &sw,
--- textures/gaussiantexture.h.orig
+++ textures/gaussiantexture.h
@@ -35,7 +35,7 @@ class GaussianTexture : public Texture<S
public:
// GaussianTexture Public Methods
GaussianTexture(float m, float w, float r) :
- Texture("GaussianTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::SWCSpectrum>::Texture("GaussianTexture-" + boost::lexical_cast<string>(this)),
GSPD(m, w, r) { }
virtual ~GaussianTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
--- textures/harlequin.h.orig
+++ textures/harlequin.h
@@ -40,7 +40,7 @@ namespace lux
class HarlequinTexture : public Texture<SWCSpectrum> {
public:
// Harlequin Public Methods
- HarlequinTexture() : Texture("HarlequinTexture-" + boost::lexical_cast<string>(this)) {
+ HarlequinTexture() : lux::Texture<lux::SWCSpectrum>::Texture("HarlequinTexture-" + boost::lexical_cast<string>(this)) {
float c[3];
for (int i = 0; i < HARLEQUIN_TEXTURE_PALETTE_SIZE; i++) {
c[0] = RadicalInverse(i * COLOR_SAMPLES + 1, 2);
--- textures/hitpointcolor.h.orig
+++ textures/hitpointcolor.h
@@ -34,7 +34,7 @@ namespace lux
class HitPointAlphaTexture : public Texture<float> {
public:
HitPointAlphaTexture() :
- Texture("HitPointAlphaTexture-" + boost::lexical_cast<string>(this)) { }
+ lux::Texture<float>::Texture("HitPointAlphaTexture-" + boost::lexical_cast<string>(this)) { }
virtual ~HitPointAlphaTexture() { }
virtual float Evaluate(const SpectrumWavelengths &sw,
const DifferentialGeometry &dgs) const {
@@ -58,7 +58,7 @@ public:
class HitPointRGBColorTexture : public Texture<SWCSpectrum> {
public:
HitPointRGBColorTexture() :
- Texture("HitPointRGBColorTexture-" + boost::lexical_cast<string>(this)) { }
+ lux::Texture<lux::SWCSpectrum>::Texture("HitPointRGBColorTexture-" + boost::lexical_cast<string>(this)) { }
virtual ~HitPointRGBColorTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
const DifferentialGeometry &dgs) const {
@@ -83,7 +83,7 @@ public:
class HitPointGreyTexture : public Texture<float> {
public:
HitPointGreyTexture(const u_int ch) :
- Texture("HitPointGreyTexture-" + boost::lexical_cast<string>(this)), channel(ch) { }
+ lux::Texture<float>::Texture("HitPointGreyTexture-" + boost::lexical_cast<string>(this)), channel(ch) { }
virtual ~HitPointGreyTexture() { }
virtual float Evaluate(const SpectrumWavelengths &sw,
const DifferentialGeometry &dgs) const {
--- textures/imagemap.h.orig
+++ textures/imagemap.h
@@ -112,7 +112,7 @@ class ImageFloatTexture : public Texture
public:
// ImageFloatTexture Public Methods
ImageFloatTexture(const TexInfo &texInfo, TextureMapping2D *m, Channel ch) :
- Texture("ImageFloatTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("ImageFloatTexture-" + boost::lexical_cast<string>(this)),
ImageTexture(texInfo, m) { channel = ch; }
virtual ~ImageFloatTexture() { }
@@ -152,7 +152,7 @@ class ImageSpectrumTexture : public Text
public:
// ImageSpectrumTexture Public Methods
ImageSpectrumTexture(const TexInfo &texInfo, TextureMapping2D *m) :
- Texture("ImageSpectrumTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::SWCSpectrum>::Texture("ImageSpectrumTexture-" + boost::lexical_cast<string>(this)),
ImageTexture(texInfo, m), isIlluminant(false) { }
virtual ~ImageSpectrumTexture() { }
@@ -200,7 +200,7 @@ class NormalMapTexture : public Texture<
public:
// NormalMapTexture Public Methods
NormalMapTexture(const TexInfo &texInfo, TextureMapping2D *m) :
- Texture("NormalMapTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("NormalMapTexture-" + boost::lexical_cast<string>(this)),
ImageTexture(texInfo, m) { }
virtual ~NormalMapTexture() { }
--- textures/irregulardata.h.orig
+++ textures/irregulardata.h
@@ -36,7 +36,7 @@ public:
// IrregularDataSpectrumTexture Public Methods
IrregularDataTexture(u_int n, const float *wl, const float *data,
float resolution = 5.f) :
- Texture("IrregularDataTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::SWCSpectrum>::Texture("IrregularDataTexture-" + boost::lexical_cast<string>(this)),
SPD(wl, data, n, resolution) { }
virtual ~IrregularDataTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
--- textures/marble.h.orig
+++ textures/marble.h
@@ -39,7 +39,7 @@ public:
// MarbleTexture Public Methods
virtual ~MarbleTexture() { delete mapping; }
MarbleTexture(int oct, float roughness, float sc, float var,
- TextureMapping3D *map) : Texture("MarbleTexture-" + boost::lexical_cast<string>(this)) {
+ TextureMapping3D *map) : lux::Texture<lux::SWCSpectrum>::Texture("MarbleTexture-" + boost::lexical_cast<string>(this)) {
omega = roughness;
octaves = oct;
mapping = map;
--- textures/regulardata.h.orig
+++ textures/regulardata.h
@@ -35,7 +35,7 @@ class RegularDataTexture : public Textur
public:
// RegularDataSpectrumTexture Public Methods
RegularDataTexture(float s, float e, u_int n, const float *data)
- : Texture("RegularDataTexture-" + boost::lexical_cast<string>(this)),
+ : lux::Texture<lux::SWCSpectrum>::Texture("RegularDataTexture-" + boost::lexical_cast<string>(this)),
SPD(data, s, e, n) { }
virtual ~RegularDataTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
--- textures/sellmeiertexture.h.orig
+++ textures/sellmeiertexture.h
@@ -36,7 +36,7 @@ class SellmeierTexture : public Texture<
public:
// SellmeierTexture Public Methods
SellmeierTexture(float a_, u_int n, const float *b_, const float *c_) :
- Texture("SellmeierTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::FresnelGeneral>::Texture("SellmeierTexture-" + boost::lexical_cast<string>(this)),
b(b_, b_ + n), c(c_, c_ + n), a(a_) {
// Sellmeier expects wavelength in µm but we have it in nm
for (u_int i = 0; i < n; ++i)
--- textures/tabulatedfresnel.h.orig
+++ textures/tabulatedfresnel.h
@@ -37,7 +37,7 @@ public:
// TabulatedFresnel Public Methods
TabulatedFresnel(const vector<float> &wl, const vector<float> &n,
const vector<float> &k) :
- Texture("TabulatedFresnel-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::FresnelGeneral>::Texture("TabulatedFresnel-" + boost::lexical_cast<string>(this)),
N(&wl[0], &n[0], wl.size()), K(&wl[0], &k[0], wl.size()),
index(N.Filter()) { }
virtual ~TabulatedFresnel() { }
--- textures/uv.h.orig
+++ textures/uv.h
@@ -36,7 +36,7 @@ namespace lux
class UVTexture : public Texture<SWCSpectrum> {
public:
// UVTexture Public Methods
- UVTexture(TextureMapping2D *m) : Texture("UVTexture-" + boost::lexical_cast<string>(this)) {
+ UVTexture(TextureMapping2D *m) : lux::Texture<lux::SWCSpectrum>::Texture("UVTexture-" + boost::lexical_cast<string>(this)) {
mapping = m;
}
virtual ~UVTexture() {
--- textures/windy.h.orig
+++ textures/windy.h
@@ -37,7 +37,7 @@ class WindyTexture : public Texture<floa
public:
// WindyTexture Public Methods
WindyTexture(TextureMapping3D *map) :
- Texture("WindyTexture-" + boost::lexical_cast<string>(this)) { mapping = map; }
+ lux::Texture<float>::Texture("WindyTexture-" + boost::lexical_cast<string>(this)) { mapping = map; }
virtual ~WindyTexture() { delete mapping; }
virtual float Evaluate(const SpectrumWavelengths &sw,
const DifferentialGeometry &dg) const {
--- textures/wrinkled.h.orig
+++ textures/wrinkled.h
@@ -37,7 +37,7 @@ class WrinkledTexture : public Texture<f
public:
// WrinkledTexture Public Methods
WrinkledTexture(int oct, float roughness, TextureMapping3D *map) :
- Texture("WrinkledTexture-" + boost::lexical_cast<string>(this)) {
+ lux::Texture<float>::Texture("WrinkledTexture-" + boost::lexical_cast<string>(this)) {
omega = roughness;
octaves = oct;
mapping = map;

47
graphics/luxrender/files/patch-luxrays-CMakeLists.txt
View File

@ -1,47 +0,0 @@
--- ../luxrays/CMakeLists.txt.orig
+++ ../luxrays/CMakeLists.txt
@@ -91,14 +91,6 @@ if (NOT OPENGL_FOUND AND NOT LUXRAYS_DIS
SET(LUXRAYS_DISABLE_OPENCL 1)
endif()
-if (NOT GLEW_FOUND)
- MESSAGE(FATAL_ERROR "--> Could not locate required GLEW files, disabling samples build - Please check ${GLEW_SEARCH_PATH}")
-endif()
-
-if (NOT GLUT_FOUND)
- MESSAGE(FATAL_ERROR "--> Could not locate required GLUT files, disabling samples build - Please check ${GLUT_SEARCH_PATH}")
-endif()
-
if (NOT EMBREE_FOUND)
MESSAGE(FATAL_ERROR "--> Could not locate required Intel Embree files - Please check ${EMBREE_SEARCH_PATH}")
endif()
@@ -124,29 +116,6 @@ add_subdirectory(src/luxcore)
################################################################################
#
-# Samples
-#
-################################################################################
-
-if(NOT APPLE OR OSX_BUILD_DEMOS)
- add_subdirectory(samples/benchsimple)
- add_subdirectory(samples/luxcoredemo)
- add_subdirectory(samples/luxcorescenedemo)
- add_subdirectory(samples/luxcoreimplserializationdemo)
-endif()
-
-if(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)
- add_subdirectory(samples/smallluxgpu4)
-endif(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)
-
-add_subdirectory(samples/luxcoreconsole)
-if(OPENGL_FOUND)
- add_subdirectory(samples/luxcoreui)
-endif(OPENGL_FOUND)
-
-
-################################################################################
-#
# For non win32 we'll have to copy everything to a single dir
#
################################################################################

26
graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake
View File

@ -1,26 +0,0 @@
--- ../luxrays/cmake/PlatformSpecific.cmake.orig
+++ ../luxrays/cmake/PlatformSpecific.cmake
@@ -138,18 +138,17 @@ ENDIF(MSVC)
-IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+#IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
# Update if necessary
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -mssse3")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
IF(NOT CYGWIN)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
ENDIF(NOT CYGWIN)
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
- SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -ftree-vectorize -fvariable-expansion-in-unroller")
-
-ENDIF()
+ SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
+#ENDIF()
# Setting Universal Binary Properties, only for Mac OS X

20
graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h
View File

@ -1,20 +0,0 @@
--- ../luxrays/include/luxcore/luxcore.h.orig
+++ ../luxrays/include/luxcore/luxcore.h
@@ -63,7 +63,7 @@
*/
namespace luxcore {
-CPP_EXPORT CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler
+extern CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler
#define LC_LOG(a) { if (luxcore::LuxCore_LogHandler) { std::stringstream _LUXCORE_LOG_LOCAL_SS; _LUXCORE_LOG_LOCAL_SS << a; luxcore::LuxCore_LogHandler(_LUXCORE_LOG_LOCAL_SS.str().c_str()); } }
@@ -603,7 +603,7 @@ public:
*
* \return the default Properties.
*/
- static const luxrays::Properties &GetDefaultProperties();
+ const luxrays::Properties &GetDefaultProperties();
friend class RenderSession;

25
graphics/luxrender/pkg-descr
View File

@ -1,25 +0,0 @@
LuxRender is a physically based and unbiased rendering engine. Based on
state of the art algorithms, LuxRender simulates the flow of light according
to physical equations, thus producing realistic images of photographic
quality. Some of the main features of LuxRender are:
* biased and unbiased rendering: Users can choose between physical
accuracy (unbiased) and speed (biased);
* full spectral rendering: Instead of the RGB colour spectrum, full
spectra are used for internal calculations;
* hierarchical procedural and image based texture system: Procedural and
image based textures can be mixed in various ways, making it possible to
create complex materials;
* displacement mapping and subdivision: Based on procedural or image
textures, object surfaces can be transformed;
* network and co-operative rendering: Rendering time can be reduced by
combining the processing power of multiple computers;
* perspective (including shift lens), orthographic, and environment
cameras;
* HDR output: Render output can be saved in various file formats,
including .png, .tga, and .exr.
Fully functional exporters are available for Blender and Maya, while
exporters for a growing number of 3D applications are under development.
WWW: http://www.luxrender.net/

6
graphics/luxrender/pkg-plist
View File

@ -1,6 +0,0 @@
bin/luxconsole
bin/luxmerger
include/luxrender/api.h
lib/liblux.so
share/pixmaps/luxrender.svg
share/applications/luxrender.desktop

23
graphics/luxrender14/Makefile
View File

@ -1,23 +0,0 @@
# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
# $FreeBSD$
DISTVERSION= 1.4
PORTREVISION= 5
LUX_REV= dfd211d6faa0
LUXRAYS_REV= 7c7127ee1fa4
MASTERDIR= ${.CURDIR}/../luxrender
PKGNAMESUFFIX= 14
DISTINFO_FILE= ${.CURDIR}/distinfo
PATCHDIR= ${.CURDIR}/files
CONFLICTS_INSTALL= ${PORTNAME}-*
USES= dos2unix
DOS2UNIX_FILES= ../luxrays/CMakeLists.txt
OPTIONS_SLAVE= FREEIMAGE
.include "${MASTERDIR}/Makefile"

4
graphics/luxrender14/distinfo
View File

@ -1,4 +0,0 @@
SHA256 (luxrender/v14.tar.bz2) = 87389167496037e22cbf420efd610474d6a02395c4f4e4a39e2bd50453676b0b
SIZE (luxrender/v14.tar.bz2) = 2642639
SHA256 (luxrender/luxrender_v1.4.tar.bz2) = 8229a814807fed2810eefd4a5ba051e7b05a4b30862ee066a3c205d6bd730205
SIZE (luxrender/luxrender_v1.4.tar.bz2) = 26682611

19
graphics/luxrender14/files/patch-CMakeLists.txt
View File

@ -1,19 +0,0 @@
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -210,7 +210,6 @@ IF(NOT APPLE AND NOT WIN32)
STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _mach_x86_64 ${MACHINE})
IF (_mach_x86_64)
SET(ARCH_X86_64 1)
- SET(LIB_SUFFIX 64)
#jromang - Hack to avoid boost bug on x64 Ubuntu 8.10 and Fedora 10 (http://www.luxrender.net/mantis/view.php?id=433)
ADD_DEFINITIONS(-DBOOST_NO_INTRINSIC_INT64_T)
ENDIF (_mach_x86_64)
@@ -402,7 +401,7 @@ ELSEIF(MSVC)
ELSE(APPLE)
# Dade - default compiler options
# Removed "-O3" from definitions in order to have CMake Release/Debug options to work
- ADD_DEFINITIONS(-msse2 -mfpmath=sse -ftree-vectorize -funroll-loops -Wall -fPIC -DHAVE_PTHREAD_H)
+ ADD_DEFINITIONS(-msse -Wall -fPIC -DHAVE_PTHREAD_H)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fvisibility=hidden -fvisibility-inlines-hidden")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fvisibility=hidden -fvisibility-inlines-hidden")
# The QBVH accelerator needs to be compiled with much reduced optimizations

23
graphics/luxrender14/files/patch-accelerators_bvhaccel.cpp
View File

@ -1,23 +0,0 @@
After http://github.com/boostorg/range/commit/69409ed63a9e1 build fails:
accelerators/bvhaccel.cpp:149:19: error: call to 'distance' is ambiguous
u_int middle = distance(list.begin(), it);
^~~~~~~~
/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = std::__1::__wrap_iter<boost::shared_ptr<lux::BVHAccelTreeNode> *>]
distance(_InputIter __first, _InputIter __last)
^
/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = std::__1::__wrap_iter<boost::shared_ptr<lux::BVHAccelTreeNode> *>]
distance(SinglePassIterator first, SinglePassIterator last)
^
--- accelerators/bvhaccel.cpp.orig 2015-01-20 23:10:10 UTC
+++ accelerators/bvhaccel.cpp
@@ -146,7 +146,7 @@ boost::shared_ptr<BVHAccelTreeNode> BVHAccel::BuildHie
vector<boost::shared_ptr<BVHAccelTreeNode> >::iterator it =
partition(list.begin()+splits[j], list.begin()+splits[j+1], bind2nd(ptr_fun(bvh_ltf[splitAxis]), splitValue));
- u_int middle = distance(list.begin(), it);
+ u_int middle = std::distance(list.begin(), it);
middle = max(splits[j]+1, min(splits[j+1]-1, middle)); // Make sure coincidental BBs are still split
splits.insert(splits.begin()+j+1, middle);
}

40
graphics/luxrender14/files/patch-c++14-fixes
View File

@ -1,40 +0,0 @@
--- core/queryable/queryable.h.orig 2015-01-20 23:10:10 UTC
+++ core/queryable/queryable.h
@@ -194,7 +194,7 @@ class LUX_EXPORT Queryable (public)
}
template<class T> friend void AddStringAttribute(T &object,
const std::string &name, const std::string &description,
- const boost::function<std::string (void)> &get, const boost::function<void (std::string)> set = NULL) {
+ const boost::function<std::string (void)> &get, const boost::function<void (std::string)> set = 0x0) {
AddAttrib<QueryableStringAttribute>(object, name, description, get, set);
}
--- core/scheduler.cpp.orig 2015-01-20 23:10:10 UTC
+++ core/scheduler.cpp
@@ -43,7 +43,7 @@ void NullTask(Range*){}
Scheduler::Scheduler(unsigned step)
{
- current_task = NULL;
+ current_task = 0x0;
default_step = step;
state = RUNNING;
@@ -127,7 +127,7 @@ TaskType Scheduler::GetTask()
condition.wait(lock);
if(current_task == NullTask)
- return NULL;
+ return 0x0;
return current_task;
}
@@ -152,7 +152,7 @@ bool Scheduler::EndTask(Thread* thread)
if(counter == 0)
{
- current_task = NULL;
+ current_task = 0x0;
condition.notify_all();
}
else

394
graphics/luxrender14/files/patch-gcc42-fixes
View File

@ -1,394 +0,0 @@
--- ../luxrays/include/luxrays/core/geometry/frame.h.orig
+++ ../luxrays/include/luxrays/core/geometry/frame.h
@@ -46,11 +46,11 @@ public:
SetFromZ(z);
}
- Frame(const Normal &z) {
+ Frame(const luxrays::Normal &z) {
SetFromZ(Vector(z));
}
- void SetFromZ(const Normal &z) {
+ void SetFromZ(const luxrays::Normal &z) {
SetFromZ(Vector(z));
}
--- textures/bilerp.h.orig
+++ textures/bilerp.h
@@ -39,7 +39,7 @@ public:
// BilerpTexture Public Methods
BilerpFloatTexture(TextureMapping2D *m,
float t00, float t01, float t10, float t11) :
- Texture("BilerpFloatTexture-" + boost::lexical_cast<string>(this)) {
+ lux::Texture<float>::Texture("BilerpFloatTexture-" + boost::lexical_cast<string>(this)) {
mapping = m;
v00 = t00;
v01 = t01;
@@ -87,7 +87,7 @@ public:
BilerpSpectrumTexture(TextureMapping2D *m,
const RGBColor &t00, const RGBColor &t01,
const RGBColor &t10, const RGBColor &t11) :
- Texture("BilerpSpectrumTexture-" + boost::lexical_cast<string>(this)) {
+ lux::Texture<lux::SWCSpectrum>::Texture("BilerpSpectrumTexture-" + boost::lexical_cast<string>(this)) {
mapping = m;
v00 = t00;
v01 = t01;
@@ -145,7 +145,7 @@ public:
const boost::shared_ptr<Texture<FresnelGeneral> > &t01,
const boost::shared_ptr<Texture<FresnelGeneral> > &t10,
const boost::shared_ptr<Texture<FresnelGeneral> > &t11) :
- Texture("BilerpFresnelTexture-" + boost::lexical_cast<string>(this)) {
+ lux::Texture<lux::FresnelGeneral>::Texture("BilerpFresnelTexture-" + boost::lexical_cast<string>(this)) {
mapping = m;
v00 = t00;
v01 = t01;
--- textures/blackbody.h.orig
+++ textures/blackbody.h
@@ -34,7 +34,7 @@ namespace lux
class BlackBodyTexture : public Texture<SWCSpectrum> {
public:
// BlackBodyTexture Public Methods
- BlackBodyTexture(float t) : Texture("BlackBodyTexture-" + boost::lexical_cast<string>(this)),
+ BlackBodyTexture(float t) : lux::Texture<lux::SWCSpectrum>::Texture("BlackBodyTexture-" + boost::lexical_cast<string>(this)),
BBSPD(t) { }
virtual ~BlackBodyTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
--- textures/blender_base.h.orig
+++ textures/blender_base.h
@@ -34,7 +34,7 @@ public:
virtual ~BlenderTexture3D() { }
BlenderTexture3D(const std::string &name, const Transform &tex2world, const ParamSet &tp,
- short type) : Texture(name) {
+ short type) : lux::Texture<float>::Texture(name) {
// Read mapping coordinates
mapping = TextureMapping3D::Create(tex2world, tp);
tex1 = tp.GetFloatTexture("tex1", 0.f);
--- textures/cauchytexture.h.orig
+++ textures/cauchytexture.h
@@ -35,7 +35,7 @@ class CauchyTexture : public Texture<Fre
public:
// ConstantTexture Public Methods
CauchyTexture(float cauchya, float cauchyb) :
- Texture("CauchyTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::FresnelGeneral>::Texture("CauchyTexture-" + boost::lexical_cast<string>(this)),
fresnel(cauchya, cauchyb, 0.f), index(cauchya + cauchyb * 1e6f /
(WAVELENGTH_END * WAVELENGTH_START)) { }
virtual ~CauchyTexture() { }
--- textures/checkerboard.h.orig
+++ textures/checkerboard.h
@@ -42,7 +42,7 @@ public:
Checkerboard2D(TextureMapping2D *m,
boost::shared_ptr<Texture<float> > &c1,
boost::shared_ptr<Texture<float> > &c2, const string &aa) :
- Texture("Checkerboard2D-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("Checkerboard2D-" + boost::lexical_cast<string>(this)),
tex1(c1), tex2(c2), mapping(m) {
// Select anti-aliasing method for _Checkerboard2D_
if (aa == "none")
@@ -226,7 +226,7 @@ public:
Checkerboard3D(TextureMapping3D *m,
boost::shared_ptr<Texture<float> > &c1,
boost::shared_ptr<Texture<float> > &c2) :
- Texture("Checkerboard3D-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("Checkerboard3D-" + boost::lexical_cast<string>(this)),
tex1(c1), tex2(c2), mapping(m) { }
virtual ~Checkerboard3D() { delete mapping; }
virtual float Evaluate(const SpectrumWavelengths &sw,
--- textures/cloud.h.orig
+++ textures/cloud.h
@@ -47,7 +47,7 @@ public:
const u_int octaves, const float o, const float offset,
const u_int numspheres, const float spheresize,
TextureMapping3D *map) :
- Texture("CloudTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("CloudTexture-" + boost::lexical_cast<string>(this)),
radius(r), numSpheres(numspheres), sphereSize(spheresize),
sharpness(sharp), baseFlatness(baseflatness), variability(v),
omega(o), firstNoiseScale(noiseScale), noiseOffset(offset),
--- textures/colordepth.h.orig
+++ textures/colordepth.h
@@ -34,7 +34,7 @@ class ColorDepthTexture : public Texture
public:
// ColorDepthTexture Public Methods
ColorDepthTexture(float t, boost::shared_ptr<Texture<SWCSpectrum> > &c) :
- Texture("ColorDepthTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::SWCSpectrum>::Texture("ColorDepthTexture-" + boost::lexical_cast<string>(this)),
d(-max(1e-3f, t)), color(c) { }
virtual ~ColorDepthTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
--- textures/constant.h.orig
+++ textures/constant.h
@@ -36,7 +36,7 @@ class ConstantFloatTexture : public Text
public:
// ConstantTexture Public Methods
ConstantFloatTexture(float v) :
- Texture("ConstantFloatTexture-" + boost::lexical_cast<string>(this)), value(v) {
+ lux::Texture<float>::Texture("ConstantFloatTexture-" + boost::lexical_cast<string>(this)), value(v) {
AddFloatAttribute(*this, "value", "ConstantFloatTexture value", &ConstantFloatTexture::value);
}
virtual ~ConstantFloatTexture() { }
@@ -60,7 +60,7 @@ class ConstantRGBColorTexture : public T
public:
// ConstantTexture Public Methods
ConstantRGBColorTexture(const RGBColor &s) :
- Texture("ConstantRGBColorTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::SWCSpectrum>::Texture("ConstantRGBColorTexture-" + boost::lexical_cast<string>(this)),
color(s) {
RGBSPD = new RGBReflSPD(color);
@@ -99,7 +99,7 @@ class ConstantFresnelTexture : public Te
public:
// ConstantTexture Public Methods
ConstantFresnelTexture(float v) :
- Texture("ConstantFresnelTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::FresnelGeneral>::Texture("ConstantFresnelTexture-" + boost::lexical_cast<string>(this)),
value(DIELECTRIC_FRESNEL, SWCSpectrum(v), 0.f), val(v) {
AddFloatAttribute(*this, "value", "ConstantFresnelTexture value", &ConstantFresnelTexture::val);
}
--- textures/densitygrid.h.orig
+++ textures/densitygrid.h
@@ -39,7 +39,7 @@ public:
// DensityGridTexture Public Methods
DensityGridTexture(int x, int y, int z, const float *d,
enum WrapMode w, TextureMapping3D *map) :
- Texture("DensityGridTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("DensityGridTexture-" + boost::lexical_cast<string>(this)),
nx(x), ny(y), nz(z), wrapMode(w), mapping(map) {
density.assign(d, d + nx * ny * nz);
dMin = *std::min_element(density.begin(), density.end());
--- textures/dots.h.orig
+++ textures/dots.h
@@ -37,7 +37,7 @@ public:
// DotsTexture Public Methods
DotsTexture(TextureMapping2D *m, boost::shared_ptr<Texture<float> > &c1,
boost::shared_ptr<Texture<float> > &c2) :
- Texture("DotsTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("DotsTexture-" + boost::lexical_cast<string>(this)),
outsideDot(c1), insideDot(c2), mapping(m) { }
virtual ~DotsTexture() { delete mapping; }
virtual float Evaluate(const SpectrumWavelengths &sw,
--- textures/equalenergy.h.orig
+++ textures/equalenergy.h
@@ -35,7 +35,7 @@ class EqualEnergyTexture : public Textur
public:
// EqualEnergyTexture Public Methods
EqualEnergyTexture(float t) :
- Texture("EqualEnergyTexture-" + boost::lexical_cast<string>(this)), e(t) { }
+ lux::Texture<lux::SWCSpectrum>::Texture("EqualEnergyTexture-" + boost::lexical_cast<string>(this)), e(t) { }
virtual ~EqualEnergyTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
const DifferentialGeometry &) const {
--- textures/exponential.h.orig
+++ textures/exponential.h
@@ -36,7 +36,7 @@ public:
// ExponentialTexture Public Methods
ExponentialTexture(const Point &o, const Vector &up, float d,
TextureMapping3D *map) :
- Texture("ExponentialTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("ExponentialTexture-" + boost::lexical_cast<string>(this)),
origin(o), upDir(up), decay(d), mapping(map) { }
virtual ~ExponentialTexture() { delete mapping; }
virtual float Evaluate(const SpectrumWavelengths &sw,
--- textures/fbm.h.orig
+++ textures/fbm.h
@@ -37,7 +37,7 @@ class FBmTexture : public Texture<float>
public:
// FBmTexture Public Methods
FBmTexture(int oct, float roughness, TextureMapping3D *map) :
- Texture("FBmTexture-" + boost::lexical_cast<string>(this)) {
+ lux::Texture<float>::Texture("FBmTexture-" + boost::lexical_cast<string>(this)) {
omega = roughness;
octaves = oct;
mapping = map;
--- textures/frequencytexture.h.orig
+++ textures/frequencytexture.h
@@ -35,7 +35,7 @@ class FrequencyTexture : public Texture<
public:
// FrequencyTexture Public Methods
FrequencyTexture(float w, float p, float r)
- : Texture("FrequencyTexture-" + boost::lexical_cast<string>(this)),
+ : lux::Texture<lux::SWCSpectrum>::Texture("FrequencyTexture-" + boost::lexical_cast<string>(this)),
FSPD(w, p, r) { }
virtual ~FrequencyTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
--- textures/fresnelcolor.h.orig
+++ textures/fresnelcolor.h
@@ -34,7 +34,7 @@ class FresnelColorTexture : public Textu
public:
// FresnelColorTexture Public Methods
FresnelColorTexture(const boost::shared_ptr<Texture<SWCSpectrum> > &c) :
- Texture("FresnelColorTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::FresnelGeneral>::Texture("FresnelColorTexture-" + boost::lexical_cast<string>(this)),
color(c) { }
virtual ~FresnelColorTexture() { }
virtual FresnelGeneral Evaluate(const SpectrumWavelengths &sw,
--- textures/gaussiantexture.h.orig
+++ textures/gaussiantexture.h
@@ -35,7 +35,7 @@ class GaussianTexture : public Texture<S
public:
// GaussianTexture Public Methods
GaussianTexture(float m, float w, float r) :
- Texture("GaussianTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::SWCSpectrum>::Texture("GaussianTexture-" + boost::lexical_cast<string>(this)),
GSPD(m, w, r) { }
virtual ~GaussianTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
--- textures/harlequin.h.orig
+++ textures/harlequin.h
@@ -40,7 +40,7 @@ namespace lux
class HarlequinTexture : public Texture<SWCSpectrum> {
public:
// Harlequin Public Methods
- HarlequinTexture() : Texture("HarlequinTexture-" + boost::lexical_cast<string>(this)) {
+ HarlequinTexture() : lux::Texture<lux::SWCSpectrum>::Texture("HarlequinTexture-" + boost::lexical_cast<string>(this)) {
float c[3];
for (int i = 0; i < HARLEQUIN_TEXTURE_PALETTE_SIZE; i++) {
c[0] = RadicalInverse(i * COLOR_SAMPLES + 1, 2);
--- textures/hitpointcolor.h.orig
+++ textures/hitpointcolor.h
@@ -34,7 +34,7 @@ namespace lux
class HitPointAlphaTexture : public Texture<float> {
public:
HitPointAlphaTexture() :
- Texture("HitPointAlphaTexture-" + boost::lexical_cast<string>(this)) { }
+ lux::Texture<float>::Texture("HitPointAlphaTexture-" + boost::lexical_cast<string>(this)) { }
virtual ~HitPointAlphaTexture() { }
virtual float Evaluate(const SpectrumWavelengths &sw,
const DifferentialGeometry &dgs) const {
@@ -58,7 +58,7 @@ public:
class HitPointRGBColorTexture : public Texture<SWCSpectrum> {
public:
HitPointRGBColorTexture() :
- Texture("HitPointRGBColorTexture-" + boost::lexical_cast<string>(this)) { }
+ lux::Texture<lux::SWCSpectrum>::Texture("HitPointRGBColorTexture-" + boost::lexical_cast<string>(this)) { }
virtual ~HitPointRGBColorTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
const DifferentialGeometry &dgs) const {
@@ -83,7 +83,7 @@ public:
class HitPointGreyTexture : public Texture<float> {
public:
HitPointGreyTexture(const u_int ch) :
- Texture("HitPointGreyTexture-" + boost::lexical_cast<string>(this)), channel(ch) { }
+ lux::Texture<float>::Texture("HitPointGreyTexture-" + boost::lexical_cast<string>(this)), channel(ch) { }
virtual ~HitPointGreyTexture() { }
virtual float Evaluate(const SpectrumWavelengths &sw,
const DifferentialGeometry &dgs) const {
--- textures/imagemap.h.orig
+++ textures/imagemap.h
@@ -112,7 +112,7 @@ class ImageFloatTexture : public Texture
public:
// ImageFloatTexture Public Methods
ImageFloatTexture(const TexInfo &texInfo, TextureMapping2D *m, Channel ch) :
- Texture("ImageFloatTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("ImageFloatTexture-" + boost::lexical_cast<string>(this)),
ImageTexture(texInfo, m) { channel = ch; }
virtual ~ImageFloatTexture() { }
@@ -152,7 +152,7 @@ class ImageSpectrumTexture : public Text
public:
// ImageSpectrumTexture Public Methods
ImageSpectrumTexture(const TexInfo &texInfo, TextureMapping2D *m) :
- Texture("ImageSpectrumTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::SWCSpectrum>::Texture("ImageSpectrumTexture-" + boost::lexical_cast<string>(this)),
ImageTexture(texInfo, m), isIlluminant(false) { }
virtual ~ImageSpectrumTexture() { }
@@ -200,7 +200,7 @@ class NormalMapTexture : public Texture<
public:
// NormalMapTexture Public Methods
NormalMapTexture(const TexInfo &texInfo, TextureMapping2D *m) :
- Texture("NormalMapTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<float>::Texture("NormalMapTexture-" + boost::lexical_cast<string>(this)),
ImageTexture(texInfo, m) { }
virtual ~NormalMapTexture() { }
--- textures/irregulardata.h.orig
+++ textures/irregulardata.h
@@ -36,7 +36,7 @@ public:
// IrregularDataSpectrumTexture Public Methods
IrregularDataTexture(u_int n, const float *wl, const float *data,
float resolution = 5.f) :
- Texture("IrregularDataTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::SWCSpectrum>::Texture("IrregularDataTexture-" + boost::lexical_cast<string>(this)),
SPD(wl, data, n, resolution) { }
virtual ~IrregularDataTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
--- textures/marble.h.orig
+++ textures/marble.h
@@ -39,7 +39,7 @@ public:
// MarbleTexture Public Methods
virtual ~MarbleTexture() { delete mapping; }
MarbleTexture(int oct, float roughness, float sc, float var,
- TextureMapping3D *map) : Texture("MarbleTexture-" + boost::lexical_cast<string>(this)) {
+ TextureMapping3D *map) : lux::Texture<lux::SWCSpectrum>::Texture("MarbleTexture-" + boost::lexical_cast<string>(this)) {
omega = roughness;
octaves = oct;
mapping = map;
--- textures/regulardata.h.orig
+++ textures/regulardata.h
@@ -35,7 +35,7 @@ class RegularDataTexture : public Textur
public:
// RegularDataSpectrumTexture Public Methods
RegularDataTexture(float s, float e, u_int n, const float *data)
- : Texture("RegularDataTexture-" + boost::lexical_cast<string>(this)),
+ : lux::Texture<lux::SWCSpectrum>::Texture("RegularDataTexture-" + boost::lexical_cast<string>(this)),
SPD(data, s, e, n) { }
virtual ~RegularDataTexture() { }
virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
--- textures/sellmeiertexture.h.orig
+++ textures/sellmeiertexture.h
@@ -36,7 +36,7 @@ class SellmeierTexture : public Texture<
public:
// SellmeierTexture Public Methods
SellmeierTexture(float a_, u_int n, const float *b_, const float *c_) :
- Texture("SellmeierTexture-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::FresnelGeneral>::Texture("SellmeierTexture-" + boost::lexical_cast<string>(this)),
b(b_, b_ + n), c(c_, c_ + n), a(a_) {
// Sellmeier expects wavelength in µm but we have it in nm
for (u_int i = 0; i < n; ++i)
--- textures/tabulatedfresnel.h.orig
+++ textures/tabulatedfresnel.h
@@ -37,7 +37,7 @@ public:
// TabulatedFresnel Public Methods
TabulatedFresnel(const vector<float> &wl, const vector<float> &n,
const vector<float> &k) :
- Texture("TabulatedFresnel-" + boost::lexical_cast<string>(this)),
+ lux::Texture<lux::FresnelGeneral>::Texture("TabulatedFresnel-" + boost::lexical_cast<string>(this)),
N(&wl[0], &n[0], wl.size()), K(&wl[0], &k[0], wl.size()),
index(N.Filter()) { }
virtual ~TabulatedFresnel() { }
--- textures/uv.h.orig
+++ textures/uv.h
@@ -36,7 +36,7 @@ namespace lux
class UVTexture : public Texture<SWCSpectrum> {
public:
// UVTexture Public Methods
- UVTexture(TextureMapping2D *m) : Texture("UVTexture-" + boost::lexical_cast<string>(this)) {
+ UVTexture(TextureMapping2D *m) : lux::Texture<lux::SWCSpectrum>::Texture("UVTexture-" + boost::lexical_cast<string>(this)) {
mapping = m;
}
virtual ~UVTexture() {
--- textures/windy.h.orig
+++ textures/windy.h
@@ -37,7 +37,7 @@ class WindyTexture : public Texture<floa
public:
// WindyTexture Public Methods
WindyTexture(TextureMapping3D *map) :
- Texture("WindyTexture-" + boost::lexical_cast<string>(this)) { mapping = map; }
+ lux::Texture<float>::Texture("WindyTexture-" + boost::lexical_cast<string>(this)) { mapping = map; }
virtual ~WindyTexture() { delete mapping; }
virtual float Evaluate(const SpectrumWavelengths &sw,
const DifferentialGeometry &dg) const {
--- textures/wrinkled.h.orig
+++ textures/wrinkled.h
@@ -37,7 +37,7 @@ class WrinkledTexture : public Texture<f
public:
// WrinkledTexture Public Methods
WrinkledTexture(int oct, float roughness, TextureMapping3D *map) :
- Texture("WrinkledTexture-" + boost::lexical_cast<string>(this)) {
+ lux::Texture<float>::Texture("WrinkledTexture-" + boost::lexical_cast<string>(this)) {
omega = roughness;
octaves = oct;
mapping = map;

38
graphics/luxrender14/files/patch-luxrays-CMakeLists.txt
View File

@ -1,38 +0,0 @@
--- ../luxrays/CMakeLists.txt.orig
+++ ../luxrays/CMakeLists.txt
@@ -91,14 +91,6 @@ if (NOT OPENGL_FOUND AND NOT LUXRAYS_DIS
SET(LUXRAYS_DISABLE_OPENCL 1)
endif()
-if (NOT GLEW_FOUND)
- MESSAGE(FATAL_ERROR "--> Could not locate required GLEW files, disabling samples build - Please check ${GLEW_SEARCH_PATH}")
-endif()
-
-if (NOT GLUT_FOUND)
- MESSAGE(FATAL_ERROR "--> Could not locate required GLUT files, disabling samples build - Please check ${GLUT_SEARCH_PATH}")
-endif()
-
if (LUXRAYS_DISABLE_OPENCL)
ADD_DEFINITIONS("-DLUXRAYS_DISABLE_OPENCL")
endif()
@@ -120,20 +112,6 @@ add_subdirectory(src/luxcore)
################################################################################
#
-# Samples
-#
-################################################################################
-
-add_subdirectory(samples/benchsimple)
-add_subdirectory(samples/luxcoredemo)
-add_subdirectory(samples/luxcorescenedemo)
-if(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)
- add_subdirectory(samples/smallluxgpu4)
-endif(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)
-
-
-################################################################################
-#
# For non win32 we'll have to copy everything to a single dir
#
################################################################################

26
graphics/luxrender14/files/patch-luxrays-cmake-PlatformSpecific.cmake
View File

@ -1,26 +0,0 @@
--- ../luxrays/cmake/PlatformSpecific.cmake.orig
+++ ../luxrays/cmake/PlatformSpecific.cmake
@@ -138,18 +138,17 @@ ENDIF(MSVC)
-IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+#IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
# Update if necessary
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -mssse3")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
IF(NOT CYGWIN)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
ENDIF(NOT CYGWIN)
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
- SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -ftree-vectorize -fvariable-expansion-in-unroller")
-
-ENDIF()
+ SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
+#ENDIF()
# Setting Universal Binary Properties, only for Mac OS X

20
graphics/luxrender14/files/patch-luxrays-include-luxcore-luxcore.h
View File

@ -1,20 +0,0 @@
--- ../luxrays/include/luxcore/luxcore.h.orig
+++ ../luxrays/include/luxcore/luxcore.h
@@ -63,7 +63,7 @@
*/
namespace luxcore {
-CPP_EXPORT CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler
+extern CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler
#define LC_LOG(a) { if (luxcore::LuxCore_LogHandler) { std::stringstream _LUXCORE_LOG_LOCAL_SS; _LUXCORE_LOG_LOCAL_SS << a; luxcore::LuxCore_LogHandler(_LUXCORE_LOG_LOCAL_SS.str().c_str()); } }
@@ -603,7 +603,7 @@ public:
*
* \return the default Properties.
*/
- static const luxrays::Properties &GetDefaultProperties();
+ const luxrays::Properties &GetDefaultProperties();
friend class RenderSession;