Skip to content

Commit 92fe70c

Browse files
dtschumpdtschump
committed
.
2 parents fb0d038 + 4a63418 commit 92fe70c

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎CImg.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
// Set version number of the library.
5656
#ifndef cimg_version
57-
#define cimg_version 356
57+
#define cimg_version 360
5858

5959
/*-----------------------------------------------------------
6060
#
@@ -54034,7 +54034,7 @@ namespace cimg_library {
5403454034
const unsigned int render_type=4,
5403554035
const bool is_double_sided=false, const float focale=700,
5403654036
const float lightx=0, const float lighty=0, const float lightz=-5e8,
54037-
const float specular_lightness=0.2f, const float specular_shininess=0.1f,
54037+
const float specular_lightness=0.25f, const float specular_shininess=0.1f,
5403854038
const float g_opacity=1, const bool is_multithreaded_rendering=false) {
5403954039
return draw_object3d(x0,y0,z0,vertices,primitives,colors,opacities,render_type,
5404054040
is_double_sided,focale,lightx,lighty,lightz,
@@ -54067,7 +54067,7 @@ namespace cimg_library {
5406754067
const unsigned int render_type=4,
5406854068
const bool is_double_sided=false, const float focale=700,
5406954069
const float lightx=0, const float lighty=0, const float lightz=-5e8,
54070-
const float specular_lightness=0.2f, const float specular_shininess=0.1f,
54070+
const float specular_lightness=0.25f, const float specular_shininess=0.1f,
5407154071
const float g_opacity=1, const bool is_multithreaded_rendering=false) {
5407254072
return draw_object3d(x0,y0,z0,vertices,primitives,colors,opacities,render_type,
5407354073
is_double_sided,focale,lightx,lighty,lightz,
@@ -54100,7 +54100,7 @@ namespace cimg_library {
5410054100
const unsigned int render_type=4,
5410154101
const bool is_double_sided=false, const float focale=700,
5410254102
const float lightx=0, const float lighty=0, const float lightz=-5e8,
54103-
const float specular_lightness=0.2f, const float specular_shininess=0.1f,
54103+
const float specular_lightness=0.25f, const float specular_shininess=0.1f,
5410454104
const float g_opacity=1, const bool is_multithreaded_rendering=false) {
5410554105
return draw_object3d(x0,y0,z0,vertices,primitives,colors,CImg<floatT>::const_empty(),
5410654106
render_type,is_double_sided,focale,lightx,lighty,lightz,
@@ -54172,8 +54172,8 @@ namespace cimg_library {
5417254172
if (render_type==5) cimg::mutex(10); // Static variable used in this case, breaks thread-safety
5417354173

5417454174
const float
54175-
nspec = 1 - (specular_lightness<0.f?0.f:(specular_lightness>1.f?1.f:specular_lightness)),
54176-
nspec2 = 1 + (specular_shininess<0.f?0.f:specular_shininess),
54175+
nspec = 1 - cimg::cut(specular_shininess,0.0f,1.0f),
54176+
nspec2 = 1 + std::max(specular_lightness,0.0f),
5417754177
nsl1 = (nspec2 - 1)/cimg::sqr(nspec - 1),
5417854178
nsl2 = 1 - 2*nsl1*nspec,
5417954179
nsl3 = nspec2 - nsl1 - nsl2;
@@ -60182,7 +60182,7 @@ namespace cimg_library {
6018260182
const int render_static=4, const int render_motion=1,
6018360183
const bool is_double_sided=true, const float focale=700,
6018460184
const float light_x=0, const float light_y=0, const float light_z=-5e8f,
60185-
const float specular_lightness=0.2f, const float specular_shininess=0.1f,
60185+
const float specular_lightness=0.25f, const float specular_shininess=0.1f,
6018660186
const bool display_axes=true, float *const pose_matrix=0,
6018760187
const bool exit_on_anykey=false) const {
6018860188
return _display_object3d(disp,0,vertices,primitives,colors,opacities,centering,render_static,
@@ -60202,7 +60202,7 @@ namespace cimg_library {
6020260202
const int render_static=4, const int render_motion=1,
6020360203
const bool is_double_sided=true, const float focale=700,
6020460204
const float light_x=0, const float light_y=0, const float light_z=-5e8f,
60205-
const float specular_lightness=0.2f, const float specular_shininess=0.1f,
60205+
const float specular_lightness=0.25f, const float specular_shininess=0.1f,
6020660206
const bool display_axes=true, float *const pose_matrix=0,
6020760207
const bool exit_on_anykey=false) const {
6020860208
CImgDisplay disp;
@@ -60222,7 +60222,7 @@ namespace cimg_library {
6022260222
const int render_static=4, const int render_motion=1,
6022360223
const bool is_double_sided=true, const float focale=700,
6022460224
const float light_x=0, const float light_y=0, const float light_z=-5e8f,
60225-
const float specular_lightness=0.2f, const float specular_shininess=0.1f,
60225+
const float specular_lightness=0.25f, const float specular_shininess=0.1f,
6022660226
const bool display_axes=true, float *const pose_matrix=0,
6022760227
const bool exit_on_anykey=false) const {
6022860228
return display_object3d(disp,vertices,primitives,colors,CImgList<floatT>(),centering,
@@ -60241,7 +60241,7 @@ namespace cimg_library {
6024160241
const int render_static=4, const int render_motion=1,
6024260242
const bool is_double_sided=true, const float focale=700,
6024360243
const float light_x=0, const float light_y=0, const float light_z=-5e8f,
60244-
const float specular_lightness=0.2f, const float specular_shininess=0.1f,
60244+
const float specular_lightness=0.25f, const float specular_shininess=0.1f,
6024560245
const bool display_axes=true, float *const pose_matrix=0,
6024660246
const bool exit_on_anykey=false) const {
6024760247
return display_object3d(title,vertices,primitives,colors,CImgList<floatT>(),centering,
@@ -60259,7 +60259,7 @@ namespace cimg_library {
6025960259
const int render_static=4, const int render_motion=1,
6026060260
const bool is_double_sided=true, const float focale=700,
6026160261
const float light_x=0, const float light_y=0, const float light_z=-5e8f,
60262-
const float specular_lightness=0.2f, const float specular_shininess=0.1f,
60262+
const float specular_lightness=0.25f, const float specular_shininess=0.1f,
6026360263
const bool display_axes=true, float *const pose_matrix=0,
6026460264
const bool exit_on_anykey=false) const {
6026560265
return display_object3d(disp,vertices,primitives,CImgList<T>(),centering,
@@ -60278,7 +60278,7 @@ namespace cimg_library {
6027860278
const int render_static=4, const int render_motion=1,
6027960279
const bool is_double_sided=true, const float focale=700,
6028060280
const float light_x=0, const float light_y=0, const float light_z=-5e8f,
60281-
const float specular_lightness=0.2f, const float specular_shininess=0.1f,
60281+
const float specular_lightness=0.25f, const float specular_shininess=0.1f,
6028260282
const bool display_axes=true, float *const pose_matrix=0,
6028360283
const bool exit_on_anykey=false) const {
6028460284
return display_object3d(title,vertices,primitives,CImgList<T>(),centering,
@@ -60295,7 +60295,7 @@ namespace cimg_library {
6029560295
const int render_static=4, const int render_motion=1,
6029660296
const bool is_double_sided=true, const float focale=700,
6029760297
const float light_x=0, const float light_y=0, const float light_z=-5e8f,
60298-
const float specular_lightness=0.2f, const float specular_shininess=0.1f,
60298+
const float specular_lightness=0.25f, const float specular_shininess=0.1f,
6029960299
const bool display_axes=true, float *const pose_matrix=0,
6030060300
const bool exit_on_anykey=false) const {
6030160301
return display_object3d(disp,vertices,CImgList<uintT>(),centering,
@@ -60312,7 +60312,7 @@ namespace cimg_library {
6031260312
const int render_static=4, const int render_motion=1,
6031360313
const bool is_double_sided=true, const float focale=700,
6031460314
const float light_x=0, const float light_y=0, const float light_z=-5e8f,
60315-
const float specular_lightness=0.2f, const float specular_shininess=0.1f,
60315+
const float specular_lightness=0.25f, const float specular_shininess=0.1f,
6031660316
const bool display_axes=true, float *const pose_matrix=0,
6031760317
const bool exit_on_anykey=false) const {
6031860318
return display_object3d(title,vertices,CImgList<uintT>(),centering,

‎html/header.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<div class="header">
2424
<a href="index.html"><img alt="Logo" src="img/logo_header.jpg" class="center_image" style="margin-top:1em;"/></a>
2525
<h2 style="padding-bottom: 1em">
26-
Latest stable version: <b><a href="http://cimg.eu/files/CImg_.zip">3.5.5</a></b> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Current pre-release: <b><a href="http://cimg.eu/files/CImg_latest.zip">3.5.6</a></b> (2025/06/19)
26+
Latest stable version: <b><a href="http://cimg.eu/files/CImg_.zip">3.5.5</a></b> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Current pre-release: <b><a href="http://cimg.eu/files/CImg_latest.zip">3.6.0</a></b> (2025/06/19)
2727
</h2>
2828

2929
<hr/>

‎html/header_doxygen.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div class="header">
2727
<a href="../index.html"><img alt="Logo" src="../img/logo_header.jpg" class="center_image" style="margin-top:1em;"/></a>
2828
<h2 style="padding-bottom: 1em">
29-
Latest stable version: <b><a href="http://cimg.eu/files/CImg_.zip">3.5.5</a></b> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Current pre-release: <b><a href="http://cimg.eu/files/CImg_latest.zip">3.5.6</a></b> (2025/06/19)
29+
Latest stable version: <b><a href="http://cimg.eu/files/CImg_.zip">3.5.5</a></b> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Current pre-release: <b><a href="http://cimg.eu/files/CImg_latest.zip">3.6.0</a></b> (2025/06/19)
3030
</h2>
3131

3232
<hr/>

0 commit comments

Comments
 (0)