Skip to content

Commit 8add814

Browse files
c-lipkac-lipka
committed
Merge branch 'master' into autobuild/alpha and bump version number.
2 parents c1b37df + 66cef4e commit 8add814

File tree

24 files changed

+206
-72
lines changed

24 files changed

+206
-72
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ $RECYCLE.BIN/
186186
/source/Makefile.in
187187
/unix/Makefile.am
188188
/unix/Makefile.in
189+
/unix/config/compile
189190
/unix/config/config.guess
190191
/unix/config/config.sub
191192
/unix/config/depcomp

‎distribution/platform-specific/windows/Insert Menu/40 - Special shapes/15 - height_field and HF_macros/20 - HF_Square macro.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ----------------- HF_Square macro ------------------
1+
//-----------------------------------------------------
2+
#include "shapes.inc"
3+
// ----------------- HF_Square macro ------------------
24
#declare Fn_1 =
35
function(x, y, z)
46
{1-(-f_snoise3d(x*2,y*2,z*2)*0.25)}
@@ -11,7 +13,7 @@ object{ HF_Square( Fn_1, //Function,
1113
"",// FileName, ""=no file,
1214
<-1,0,-1>*2, //MnExt,
1315
<1,1,1>*2 //MxExt
14-
) //------------------------------
16+
) //------------------------------
1517
texture{ pigment{ checker
1618
color rgb<1,0.6,0>
1719
color rgb<1,1,1>*0.9
@@ -21,4 +23,4 @@ object{ HF_Square( Fn_1, //Function,
2123
scale<1,1,1>*1
2224
rotate<0,0,0>
2325
translate<0,-1.5,0>
24-
} // end of HF_Square ----------------------------------
26+
} // end of HF_Square ----------------------------------

‎distribution/platform-specific/windows/Insert Menu/40 - Special shapes/15 - height_field and HF_macros/30 - HF_Sphere macro.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ----------------- HF_Sphere macro ----------------------
1+
//----------------------------------------------------------
2+
#include "shapes.inc"
3+
// ----------------- HF_Sphere macro -----------------------
24
#declare Fn_1 =
35
function(x, y, z)
46
{1+f_snoise3d(x*7,y*7,z*7)*0.75 }
@@ -23,5 +25,5 @@ object{ HF_Sphere( Fn_1, //Function,
2325
scale<1,1,1>*1
2426
rotate<0,0,0>
2527
translate<0,0.00,0>
26-
} // end of HF_Sphere --------------------------------------
28+
} // end of HF_Sphere --------------------------------------
2729

‎distribution/platform-specific/windows/Insert Menu/40 - Special shapes/15 - height_field and HF_macros/40 - HF_Cylinder macro.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
//-----------------------------------------------------
2+
#include "shapes.inc"
13
// -------------- HF_Cylinder macro -------------------
24
#declare Fn_1 =
35
function(x, y, z)
4-
{1-(-f_snoise3d(x*3,y*3 , z*3)*0.8)}
6+
{1-(-f_snoise3d(x*3,y*3,z*3)*0.8)}
57

68
// ----------------------------------------------------
79
object{ HF_Cylinder( Fn_1, //Function,
@@ -24,4 +26,4 @@ object{ HF_Cylinder( Fn_1, //Function,
2426
scale<1,1,1>*1
2527
rotate<0,0,0>
2628
translate<0,0.00,0>
27-
} // end of HF_Cylinder -------------------------------
29+
} // end of HF_Cylinder -------------------------------

‎distribution/platform-specific/windows/Insert Menu/40 - Special shapes/15 - height_field and HF_macros/50 - HF_Torus macro.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
//-------------------------------------------------------
2+
#include "shapes.inc"
13
// ----------------- HF_Torus macro ---------------------
2-
#declare Fn_1 =
4+
#declare Fn_1 =
35
function(x, y, z)
46
{1-(-f_snoise3d(x*3,y*3,z*3)*0.8)}
57

@@ -13,8 +15,8 @@ object{ HF_Torus( Fn_1, //Function,
1315
2.00, 1.00 ,// R_Major, R_Minor// Radius
1416
-0.25 // Depth
1517
) //--------------------------------------
16-
texture{
17-
pigment{ gradient x+y
18+
texture{
19+
pigment{ gradient x+y
1820
color_map{
1921
[ 0.0 color rgb< 1.0,0.95, 0.9>*1]
2022
[ 0.5 color rgb< 1.0,0.95, 0.9>*1]
@@ -24,9 +26,9 @@ object{ HF_Torus( Fn_1, //Function,
2426
turbulence 0.0 scale< 1,3,1>*0.015
2527
} // end pigment
2628
finish { phong 1 reflection 0.01}
27-
} // end of texture
29+
} // end of texture
2830

2931
scale<1,1,1>*1
3032
rotate<0,0,0>
3133
translate<0,0.00,0>
32-
} // end of HF_Torus ------------------------------------
34+
} // end of HF_Torus ------------------------------------

‎distribution/scenes/templates/height_field_and_HF_macros/20_HF_Square_macro.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ----------------- HF_Square macro
1+
//-----------------------------------------------------
2+
#include "shapes.inc"
3+
// ----------------- HF_Square macro ------------------
24
#declare Fn_1 =
35
function(x, y, z)
46
{1-(-f_snoise3d(x*2,y*2,z*2)*0.25)}
@@ -22,4 +24,4 @@ HF_Square( Fn_1, //Function,
2224
scale<1,1,1>*1
2325
rotate<0,0,0>
2426
translate<0,-1.5,0>
25-
} // end of HF_Square ---------------------
27+
} // end of HF_Square --------------------------------

‎distribution/scenes/templates/height_field_and_HF_macros/30_HF_Sphere_macro.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ----------------- HF_Sphere macro
1+
//-----------------------------------------------------
2+
#include "shapes.inc"
3+
// ----------------- HF_Sphere macro ------------------
24
#declare Fn_1 =
35
function(x, y, z)
46
{1-(-f_snoise3d(x*7,y*7,z*7)*0.5) }
@@ -23,5 +25,5 @@ HF_Sphere( Fn_1, //Function,
2325
scale<1,1,1>*1
2426
rotate<0,0,0>
2527
translate<0,0.00,0>
26-
} // end of HF_Sphere -------------------
28+
} // end of HF_Sphere --------------------------------
2729

‎distribution/scenes/templates/height_field_and_HF_macros/40_HF_Cylinder_macro.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
// -------------- HF_Cylinder macro
1+
//-----------------------------------------------------
2+
#include "shapes.inc"
3+
// -------------- HF_Cylinder macro -------------------
24
#declare Fn_1 =
35
function(x, y, z)
4-
{1-(-f_snoise3d(x*3,y*3 , z*3)*0.8)}
6+
{1-(-f_snoise3d(x*3,y*3,z*3)*0.8)}
57

68
object{ //---------------------------
79
HF_Cylinder( Fn_1, //Function,
@@ -24,4 +26,4 @@ HF_Cylinder( Fn_1, //Function,
2426
scale<1,1,1>*1
2527
rotate<0,0,0>
2628
translate<0,0.00,0>
27-
} // end of HF_Cylinder --------------
29+
} // end of HF_Cylinder ------------------------------

‎distribution/scenes/templates/height_field_and_HF_macros/50_HF_Torus_macro.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// ----------------- HF_Torus macro
1+
//-----------------------------------------------------
2+
#include "shapes.inc"
3+
// ----------------- HF_Torus macro -------------------
24
#declare Fn_1 =
35
function(x, y, z)
46
{1-(-f_snoise3d(x*3,y*3,z*3)*0.8)}
@@ -24,4 +26,4 @@ HF_Torus( Fn_1, //Function,
2426
scale<1,1,1>*1
2527
rotate<0,0,0>
2628
translate<0,0.00,0>
27-
} // end of HF_Torus -----------------
29+
} // end of HF_Torus ---------------------------------

‎source/base/fileinputoutput.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ OStream::OStream(const UCS2String& name, unsigned int Flags) : IOBase(name), f(N
244244

245245
if (f != NULL)
246246
{
247+
fail = false;
248+
247249
if((Flags & append) != 0)
248250
{
249251
if(!seekg(0, seek_end))

0 commit comments

Comments
 (0)