niksamer les liens

Parties/biblio.bib

@@ -1 +0,0 @@
-http://www.cochoy.fr/pdfs/perlin-noise/perlin_noise.pdf

Parties/biblio.tex

@@ -0,0 +1,11 @@
+Thibault Tricard, Semyon Efremov, Cédric Zanni, Fabrice Neyret, Jonàs Martínez,
+et al.. Procedural Phasor Noise. ACM Transactions on Graphics, Association for
+Computing Machinery, In press, pp.1- 13. 10.1145\/3306346.3322990. hal-02118508
+
+
+Jérémy Cochoy, Introduction au bruit de Perlin, 10 février 2011,
+\url{http://www.cochoy.fr/pdfs/perlin-noise/perlin_noise.pdf}
+
+\url{https://en.wikipedia.org/wiki/Perlin_noise}
+
+\url{https://fr.wikipedia.org/wiki/Bruit_de_Perlin}

rapport.tex

@@ -10,47 +10,12 @@
 \usepackage{xltxtra}
 %% \usepackage{fontspec}
 \usepackage[french]{babel}
-\usepackage{listings}
 \usepackage{minted}
+\usepackage{hyperref}
 
-<<<<<<< HEAD
-=======
-% \usepackage{mathspec}
-% \setmainfont{Inria Sans}[Scale=MatchLowercase]
-% \setsansfont{Inria Sans}[Scale=MatchLowercase]
-% \setmathfont(Digits,Latin,Greek,Symbols)[Scale=MatchLowercase]{Inria Serif}
-% \setmathrm[Scale=MatchLowercase]{Inria Sans}
-% \usepackage{mathastext}
-
-%\setromanfont[Mapping=tex-text]{Linux Libertine O}
-% \setmainfont[Mapping=tex-text]{Cantarell}
-
-% \setmonofont[Mapping=tex-text]{DejaVu Sans Mono}
->>>>>>> avancement
 \newenvironment{citationFR}{\begin{quotation}\og}{\fg\end{quotation}}
     \newcommand{\guillemets}[1]{\og #1\fg{}} % [1]: nbr arg
 
-\lstset{
-    language=C++,                             % Code langugage
-    basicstyle=\ttfamily,                   % Code font, Examples: \footnotesize, \ttfamily
-    % keywordstyle=\color{OliveGreen},        % Keywords font ('*' = uppercase)
-    % commentstyle=\color{gray},              % Comments font
-%     numbers=left,                           % Line nums position
-%     numberstyle=\tiny,                      % Line-numbers fonts
-%     stepnumber=1,                           % Step between two line-numbers
-%     numbersep=5pt,                          % How far are line-numbers from code
-%     backgroundcolor=\color{lightlightgray}, % Choose background color
-%     frame=none,                             % A frame around the code
-%     tabsize=2,                              % Default tab size
-    captionpos=b,                           % Caption-position = bottom
-%     breaklines=true,                        % Automatic line breaking?
-%     breakatwhitespace=false,                % Automatic breaks only at whitespace?
-%     showspaces=false,                       % Dont make spaces visible
-%     showtabs=false,                         % Dont make tabls visible
-%     columns=flexible,                       % Column format
-%     morekeywords={__global__, __device__},  % CUDA specific keywords
-}
-
 \title{Rapport ERDI}
 \author{Cyril Colin \\ Voisin Dylan \\ \\ 
 Master 1 Informatique\\
@@ -100,4 +65,5 @@ Université d'Aix-Marseille}
 % \input{Parties/résumé.tex}
 
 \section{Bibliographie}
+\input{Parties/biblio.tex}
 \end{document}