Commit db610156 authored by Eric Bruneton's avatar Eric Bruneton
Browse files

Fix compiler and linker errors, fix typo in doc.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/ork/trunk@38 28599a00-4e59-401b-b2d8-d34d4661a6c9
parent 7d200d4a
......@@ -26,7 +26,7 @@ to build:
For the Code::Blocks project you need to define the following global compiler
variables:
- glut (base) : either glut32 or freeglut
- glut (cflags) : either USE_GLUT or USE_FREEGLUT
- glut (cflags) : either USEGLUT or USEFREEGLUT
- glew : the path to the glew DLL, e.g. C:\Progra~1\glew\glew32.dll
You also need to set the "Explicitly add project's top-level directory to
compiler search dirs" options in "Global compiler settings/Other settings"
......@@ -83,11 +83,11 @@ command lines:
- ork-examples render examples
- ork-examples resource examples
- ork-examples scenegraph examples
- ork-examples scenegraphresource exampleScene
- ork-examples scenegraphresource examples exampleScene
- ork-examples scenegraphresource postprocessScene
- ork-examples scenegraphresource skyboxScene
- ork-examples scenegraphresource cubesScene
- ork-examples scenegraphresource examples postprocessScene
- ork-examples scenegraphresource examples skyboxScene
- ork-examples scenegraphresource examples cubesScene
- ork-examples tessellation
......
......@@ -17,7 +17,8 @@
<Add option="-mthreads" />
</Compiler>
<Linker>
<Add library="pthreadGCE2" />
<Add library="pthread" />
<Add library="glew32" />
<Add library="$(#glut)" />
<Add library="glu32" />
<Add library="opengl32" />
......@@ -53,7 +54,8 @@
<Add option="-DNDEBUG" />
</Compiler>
<Linker>
<Add library="pthreadGCE2" />
<Add library="pthread" />
<Add library="glew32" />
<Add library="$(#glut)" />
<Add library="glu32" />
<Add library="opengl32" />
......@@ -87,7 +89,8 @@
<Add option="-mthreads" />
</Compiler>
<Linker>
<Add library="pthreadGCE2" />
<Add library="pthread" />
<Add library="glew32" />
<Add library="$(#glut)" />
<Add library="glu32" />
<Add library="opengl32" />
......@@ -125,7 +128,8 @@
<Add option="-mthreads" />
</Compiler>
<Linker>
<Add library="pthreadGCE2" />
<Add library="pthread" />
<Add library="glew32" />
<Add library="$(#glut)" />
<Add library="glu32" />
<Add library="opengl32" />
......@@ -145,7 +149,8 @@
<Add option="-DNDEBUG" />
</Compiler>
<Linker>
<Add library="pthreadGCE2" />
<Add library="pthread" />
<Add library="glew32" />
<Add library="$(#glut)" />
<Add library="glu32" />
<Add library="opengl32" />
......
/*
* Ork: a small object-oriented OpenGL Rendering Kernel.
* Website : http://ork.gforge.inria.fr/
* Copyright (c) 2008-2015 INRIA - LJK (CNRS - Grenoble University)
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
/*
* Ork is distributed under the BSD3 Licence.
* For any assistance, feedback and remarks, you can check out the
* mailing list on the project page :
* http://ork.gforge.inria.fr/
/*
* Ork: a small object-oriented OpenGL Rendering Kernel.
* Website : http://ork.gforge.inria.fr/
* Copyright (c) 2008-2015 INRIA - LJK (CNRS - Grenoble University)
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
/*
* Ork is distributed under the BSD3 Licence.
* For any assistance, feedback and remarks, you can check out the
* mailing list on the project page :
* http://ork.gforge.inria.fr/
*/
/*
* Main authors: Eric Bruneton, Antoine Begault, Guillaume Piolat.
......@@ -98,7 +98,7 @@ struct box2
* Creates a new bounding box enclosing the two given points.
*/
box2(const vec2<type> &p, const vec2<type> &q) :
xmin(min(p.x, q.x)), xmax(max(p.x, q.x)), ymin(min(p.y, q.y)), ymax(max(p.y, q.y))
xmin(std::min(p.x, q.x)), xmax(std::max(p.x, q.x)), ymin(std::min(p.y, q.y)), ymax(std::max(p.y, q.y))
{
}
......@@ -151,7 +151,7 @@ struct box2
*/
box2 enlarge(const vec2<type> &p) const
{
return box2(min(xmin, p.x), max(xmax, p.x), min(ymin, p.y), max(ymax, p.y));
return box2(std::min(xmin, p.x), std::max(xmax, p.x), std::min(ymin, p.y), std::max(ymax, p.y));
}
/**
......@@ -161,7 +161,7 @@ struct box2
*/
box2 enlarge(const box2 &r) const
{
return box2(min(xmin, r.xmin), max(xmax, r.xmax), min(ymin, r.ymin), max(ymax, r.ymax));
return box2(std::min(xmin, r.xmin), std::max(xmax, r.xmax), std::min(ymin, r.ymin), std::max(ymax, r.ymax));
}
/**
......
/*
* Ork: a small object-oriented OpenGL Rendering Kernel.
* Website : http://ork.gforge.inria.fr/
* Copyright (c) 2008-2015 INRIA - LJK (CNRS - Grenoble University)
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
/*
* Ork is distributed under the BSD3 Licence.
* For any assistance, feedback and remarks, you can check out the
* mailing list on the project page :
* http://ork.gforge.inria.fr/
*/
/*
* Ork: a small object-oriented OpenGL Rendering Kernel.
* Website : http://ork.gforge.inria.fr/
* Copyright (c) 2008-2015 INRIA - LJK (CNRS - Grenoble University)
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
/*
* Ork is distributed under the BSD3 Licence.
* For any assistance, feedback and remarks, you can check out the
* mailing list on the project page :
* http://ork.gforge.inria.fr/
*/
/*
* Main authors: Eric Bruneton, Antoine Begault, Guillaume Piolat.
*/
......@@ -106,9 +106,9 @@ template <typename type> struct box3
* Creates a new bounding box enclosing the two given points.
*/
box3(const vec3<type> &p, const vec3<type> &q):
xmin(min(p.x, q.x)), xmax(max(p.x, q.x)),
ymin(min(p.y, q.y)), ymax(max(p.y, q.y)),
zmin(min(p.z, q.z)), zmax(max(p.z, q.z))
xmin(std::min(p.x, q.x)), xmax(std::max(p.x, q.x)),
ymin(std::min(p.y, q.y)), ymax(std::max(p.y, q.y)),
zmin(std::min(p.z, q.z)), zmax(std::max(p.z, q.z))
{
}
......@@ -127,7 +127,7 @@ template <typename type> struct box3
*/
box3<type> enlarge(const vec3<type> &p) const
{
return box3<type>(min(xmin, p.x), max(xmax, p.x), min(ymin, p.y), max(ymax, p.y), min(zmin, p.z), max(zmax, p.z));
return box3<type>(std::min(xmin, p.x), std::max(xmax, p.x), std::min(ymin, p.y), std::max(ymax, p.y), std::min(zmin, p.z), std::max(zmax, p.z));
}
/**
......@@ -137,7 +137,7 @@ template <typename type> struct box3
*/
box3<type> enlarge(const box3<type> &r) const
{
return box3<type>(min(xmin, r.xmin), max(xmax, r.xmax), min(ymin, r.ymin), max(ymax, r.ymax), min(zmin, r.zmin), max(zmax, r.zmax));
return box3<type>(std::min(xmin, r.xmin), std::max(xmax, r.xmax), std::min(ymin, r.ymin), std::max(ymax, r.ymax), std::min(zmin, r.zmin), std::max(zmax, r.zmax));
}
/**
......
/*
* Ork: a small object-oriented OpenGL Rendering Kernel.
* Website : http://ork.gforge.inria.fr/
* Copyright (c) 2008-2015 INRIA - LJK (CNRS - Grenoble University)
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
/*
* Ork is distributed under the BSD3 Licence.
* For any assistance, feedback and remarks, you can check out the
* mailing list on the project page :
* http://ork.gforge.inria.fr/
/*
* Ork: a small object-oriented OpenGL Rendering Kernel.
* Website : http://ork.gforge.inria.fr/
* Copyright (c) 2008-2015 INRIA - LJK (CNRS - Grenoble University)
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
/*
* Ork is distributed under the BSD3 Licence.
* For any assistance, feedback and remarks, you can check out the
* mailing list on the project page :
* http://ork.gforge.inria.fr/
*/
/*
* Main authors: Eric Bruneton, Antoine Begault, Guillaume Piolat.
......@@ -72,7 +72,7 @@ namespace ork
void CALLBACK debugCallback(unsigned int source, unsigned int type,
unsigned int id, unsigned int severity,
int length, const char* message, void* userParam)
int length, const char* message, const void* userParam)
{
char debSource[16];
switch (source) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment