summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/profcollege/metapost/PfCSolid.mp
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/profcollege/metapost/PfCSolid.mp')
-rw-r--r--macros/latex/contrib/profcollege/metapost/PfCSolid.mp27
1 files changed, 19 insertions, 8 deletions
diff --git a/macros/latex/contrib/profcollege/metapost/PfCSolid.mp b/macros/latex/contrib/profcollege/metapost/PfCSolid.mp
index 342b992167..bc4b9517ee 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCSolid.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCSolid.mp
@@ -54,12 +54,18 @@ vardef Initialisation(expr r,t,p,d)=
Aux6:=Aux1*Aux2;
Aux7:=Aux3*Aux4;
Aux8:=Aux1*Aux4;
+ color Oeil;
+% if typerepre="cabinet":
+% Oeil=(Rho,0,0);
+% else:
+ Oeil=(Aux7,Aux8,Aux2)*Rho;
+% fi;
pointilles:="oui";
Lumiere:=Oeil;
enddef;
-vardef Oeil=(Rho*Aux7,Rho*Aux8,Rho*Aux2)
-enddef;
+%vardef Oeil=(Rho*Aux7,Rho*Aux8,Rho*Aux2)
+%enddef;
vardef sin(expr t) = sind(c*t) enddef;
@@ -104,11 +110,17 @@ enddef;
unit:=1;%pour les mises ŕ l'échelle :) Merci pst-solides3d
vardef Projette(expr M)=
- %if typerepre="proj":
- % unit*(DE*(Xpart(GCoord(M)/Zpart(GCoord(M))),(Ypart(GCoord(M))/Zpart(GCoord(M)))))
- %elseif typerepre="persp":
- unit*(DE*(Xpart(GCoord(M)),Ypart(GCoord(M))))
- %fi
+ if typerepre="proj":
+ ((Xpart(GCoord(M)),Ypart(GCoord(M)))/Zpart(GCoord(M)))*DE*10%
+ elseif typerepre="persp":
+ (Xpart(GCoord(M)),Ypart(GCoord(M)))*unit*DE
+ elseif typerepre="cabinet":
+% (0.5*cosd(30)*Xpart(GCoord(M)),0.75*sind(30)*Ypart(GCoord(M)))*unit*DE
+ (Xpart(GCoord(M))+0.5*cosd(30)*Zpart(GCoord(M)),Ypart(GCoord(M))+0.5*sind(30)*Zpart(GCoord(M)))*20
+% (0.5*cosd(45)*Xpart(GCoord(M)),0.5*sind(45)*Ypart(GCoord(M)))*unit*DE
+% (Xpart(GCoord(M)),Ypart(GCoord(M)))*unit*DE
+ %(Xpart(GCoord(M)),Ypart(GCoord(M)))*10
+ fi
enddef;
vardef TraceAxes=
@@ -181,7 +193,6 @@ vardef Normal(expr vecun,vecde,vectr)=
enddef;
vardef ProduitScalaire(expr wec,mor)=
- %Mexp(Mlog redpart(wec) Mmul Mlog redpart(mor))+Mexp(Mlog greenpart(wec) Mmul Mlog greenpart(mor))+Mexp(Mlog bluepart(wec) Mmul Mlog bluepart(mor))
Xpart(wec)*Xpart(mor)+Ypart(wec)*Ypart(mor)+Zpart(wec)*Zpart(mor)
enddef;
%pour les rotations et translations