Compare commits
	
		
			No commits in common. "929d59b169c819e6cb35bb9e75a817971c3acd24" and "090981d84ca935b5f25af0cce28af0877404192b" have entirely different histories.
		
	
	
		
			929d59b169
			...
			090981d84c
		
	
		
							
								
								
									
										13
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								Makefile
									
									
									
									
									
								
							@ -5,20 +5,17 @@ POVDEP = contexte.inc elements.inc 		\
 | 
				
			|||||||
		globals.inc datas/hf.png
 | 
							globals.inc datas/hf.png
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
PNG:	essai.png scene.png topview.png passage.png
 | 
					PNG:	essai.png scene.png topview.png
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
topview.png:		topview.pov Makefile $(POVDEP)
 | 
					topview.png:		topview.pov Makefile $(POVDEP)
 | 
				
			||||||
	povray $(POVOPT) -W1280 -H1024 -K359 -i$< -o$@
 | 
						povray $(POVOPT) -K200 -W1280 -H1024 -i$< -o$@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
essai.png:		essai.pov Makefile $(POVDEP)
 | 
					essai.png:		essai.pov Makefile $(POVDEP)
 | 
				
			||||||
	povray $(POVOPT) -W1280 -H1024 -i$< -o$@
 | 
						povray $(POVOPT) -W800 -H600 -i$< -o$@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
passage.png:		passage.pov Makefile $(POVDEP)
 | 
					CK=306
 | 
				
			||||||
	povray $(POVOPT) -W1280 -H1024 -K300 -i$< -o$@
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
CK=175
 | 
					 | 
				
			||||||
scene.png:		scene.pov Makefile $(POVDEP)
 | 
					scene.png:		scene.pov Makefile $(POVDEP)
 | 
				
			||||||
	povray $(POVOPT) -W1280 -H1024 +K${CK} -i$< -o$@
 | 
						povray $(POVOPT) -W3200 -H2400 +K${CK} -i$< -o$@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										11
									
								
								contexte.inc
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								contexte.inc
									
									
									
									
									
								
							@ -52,13 +52,10 @@ height_field {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#declare Repere = object
 | 
					#if (0)
 | 
				
			||||||
{
 | 
					cylinder { 0, <1, 0, 0>, 0.005 pigment { color Red } }
 | 
				
			||||||
union	{
 | 
					cylinder { 0, <0, 0, 1>, 0.005 pigment { color Blue } }
 | 
				
			||||||
	cylinder { 0, <1, 0, 0>, 0.007 pigment { color Red } }
 | 
					#end
 | 
				
			||||||
	cylinder { 0, <0, 0, 1>, 0.007 pigment { color Blue } }
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if (1)
 | 
					#if (1)
 | 
				
			||||||
light_source {
 | 
					light_source {
 | 
				
			||||||
 | 
				
			|||||||
@ -38,7 +38,7 @@ union	{
 | 
				
			|||||||
	#local xR  = (rand(Rng2)-0.5000) * kR;
 | 
						#local xR  = (rand(Rng2)-0.5000) * kR;
 | 
				
			||||||
	#local yR  = (rand(Rng2)-0.5000) * kR;
 | 
						#local yR  = (rand(Rng2)-0.5000) * kR;
 | 
				
			||||||
	#local zR  = (rand(Rng2)-0.5000) * kR;
 | 
						#local zR  = (rand(Rng2)-0.5000) * kR;
 | 
				
			||||||
	#local Red = abs(sin(NormClock * 35.536));
 | 
						#local Red = abs(sin(NormClock * 55.536));
 | 
				
			||||||
	#local Red = Red * rand(Rng2);
 | 
						#local Red = Red * rand(Rng2);
 | 
				
			||||||
	light_source { <xR, yR, xR>, rgb <Red, 0.03, 0.03>
 | 
						light_source { <xR, yR, xR>, rgb <Red, 0.03, 0.03>
 | 
				
			||||||
		fade_distance	0.99
 | 
							fade_distance	0.99
 | 
				
			||||||
@ -198,7 +198,7 @@ texture { T_Brass_1C }
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
union	{
 | 
					union	{
 | 
				
			||||||
	object { Tuyere }
 | 
						object { Tuyere }
 | 
				
			||||||
	object { Le_rotor rotate x*(clock*5.8) translate -0.06*x }
 | 
						object { Le_rotor rotate x*(clock*3.8) translate -0.06*x }
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -225,4 +225,5 @@ union	{
 | 
				
			|||||||
	object { HexaCone_derives translate <0, 0, -0.67>	}
 | 
						object { HexaCone_derives translate <0, 0, -0.67>	}
 | 
				
			||||||
	object { Les_Reacteurs      translate -0.18*y 		}
 | 
						object { Les_Reacteurs      translate -0.18*y 		}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					rotate < 3, 0, -4>
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -14,8 +14,8 @@ ffmpeg  -nostdin                                        	\
 | 
				
			|||||||
        -tune film                                      	\
 | 
					        -tune film                                      	\
 | 
				
			||||||
        $FILMNAME
 | 
					        $FILMNAME
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "$SRCDIR -> $FILMNAME" | tee -a WS/log
 | 
					echo "$SRCDIR encoded to $FILNAME" | tee -a WS/log
 | 
				
			||||||
wc -c $FILMNAME | tee -a WS/log
 | 
					wc -c full.mp4 | tee -a WS/log
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,7 @@ set -ue
 | 
				
			|||||||
TMPFILE="/dev/shm/plot-timing.tmp"
 | 
					TMPFILE="/dev/shm/plot-timing.tmp"
 | 
				
			||||||
IMAGE="timing.png"
 | 
					IMAGE="timing.png"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
tail -3600 WS/mp4.timing | awk '				\
 | 
					tail -1800 WS/mp4.timing | awk '				\
 | 
				
			||||||
BEGIN	{							\
 | 
					BEGIN	{							\
 | 
				
			||||||
	nbrames=360;
 | 
						nbrames=360;
 | 
				
			||||||
	for (foo=0; foo<nbrames; foo++) {			\
 | 
						for (foo=0; foo<nbrames; foo++) {			\
 | 
				
			||||||
 | 
				
			|||||||
@ -15,9 +15,7 @@
 | 
				
			|||||||
#include  "contexte.inc"
 | 
					#include  "contexte.inc"
 | 
				
			||||||
#include  "elements.inc"
 | 
					#include  "elements.inc"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
object { HexaCone
 | 
					object { HexaCone rotate y*17 translate y*1.11 }
 | 
				
			||||||
	rotate < 3, 0, -4>
 | 
					 | 
				
			||||||
	rotate y*17 translate y*1.11 }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#declare CK = 56 + (clock * 1);
 | 
					#declare CK = 56 + (clock * 1);
 | 
				
			||||||
#declare Dcam = 2.04;
 | 
					#declare Dcam = 2.04;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user