Commit 3a1bcae4 authored by Francois Foltete's avatar Francois Foltete
Browse files

mergeconflict power (ajout texture)

parent df865711
......@@ -36,9 +36,10 @@ class Student : public Actor {
* @param mood Humeur de l'élève
* @param motivation Motivation de l'élève
* @param skill Qualité de l'élève
* @param texturePath le chemin du fichier de texture
*/
Student(const std::string &firstname, const std::string &surname,
double mood, double motivation, double skill);
double mood, double motivation, double skill, const std::string &texturePath);
~Student();
/**
......
0,Knutur,Arthur,5,6,7
1,Dodeman,Amorgen,3,8,3
2,Gounouf,Cathal,2,2,2
3,Juleson,Cesar,4,4,6
4,Helgi,Felix,7,3,7
5,Hjalmarsson,Kane,9,7,7
6,Bjarnason,Lucan,10,3,9
7,Arnason,Agate,7,5,5
8,Kristoffersen,Aveleen,4,7,4
9,Helguson,Cordelia,3,5,2
10,Osmond,Cleena,6,6,6
11,Hansen,Cleophee,4,2,9
12,Toeframathurinn,Merlin,8,4,5
13,Bryndisarson,Sachka,7,3,7
14,Turrou,Audric,3,8,2
15,Renouf,Arwen,5,5,5
16,Alfur,Gauvain,4,8,6
17,Asgrimsson,Arya,1,1,1
18,Inguier,Cirdan,2,3,2
19,Eriksson,Valar,6,5,4
20,Yngouf,Matan,7,6,7
21,Varangot,Olaf,2,6,2
22,Aze,Leif,5,4,9
23,Ernouf,Bjarne,2,4,5
24,Kirkegaard,Gandalf,10,6,4
25,Persson,Markus,4,5,6
26,Foutete,Franco,3,5,10
27,Ovenn,Piro,6,4,7
28,Leinfebr,Lias,5,4,7
29,Miglagla,Yonn,4,3,5
30,Voyaar,Mateu,3,7,5
31,Gulbrandsen,Egill,4,3,5
32,Jespersen,Marcus,10,9,10
33,Jakobsen,Frederik,4,6,5
34,Mortensen,Alexander,6,5,8
35,Norgaard,Rasmus,4,5,6
36,Gregersen,Nicolai,8,5,6
37,Andersen,Alberte,4,6,8
38,Johansen,Oskar,6,5,3
39,Kristensen,Mark,7,5,5
40,Jespersen,Rosa,8,5,6
0,Arthur,Knutur,5,6,7,resources/images/eleves/eleve_garcon1.png
1,Amorgen,Dodeman,3,8,3,resources/images/eleves/eleve_garcon2.png
2,Cathal,Gounouf,2,2,2,resources/images/eleves/eleve_fille1.png
3,Cesar,Juleson,4,4,6,resources/images/eleves/eleve_garcon3.png
4,Felix,Helgi,7,3,7,resources/images/eleves/eleve_fille1.png
5,Kane,Hjalmarsson,9,7,7,resources/images/eleves/eleve_fille2.png
6,Lucan,Bjarnason,10,3,9,resources/images/eleves/eleve_garcon4.png
7,Agate,Arnason,7,5,5,resources/images/eleves/eleve_fille_versionNoel.png
8,Aveleen,Kristoffersen,4,7,4,resources/images/eleves/eleve_fille1.png
9,Cordelia,Helguson,3,5,2,resources/images/eleves/eleve_fille2.png
10,Cleena,Osmond,6,6,6,resources/images/eleves/eleve_fille_versionNoel.png
11,Cleophee,Hansen,4,2,9,resources/images/eleves/eleve_fille1.png
12,Merlin,Toeframathurinn,8,4,5,resources/images/eleves/eleve_garcon_versionAdibou.png
13,Sachka,Bryndisarson,7,3,7,resources/images/eleves/eleve_fille2.png
14,Audric,Turrou,3,8,2,resources/images/eleves/eleve_garcon_versionNoel.png
15,Arwen,Renouf,5,5,5,resources/images/eleves/eleve_garcon1.png
16,Gauvain,Alfur,4,8,6,resources/images/eleves/eleve_garcon2.png
17,Arya,Asgrimsson,1,1,1,resources/images/eleves/eleve_fille_versionNoel.png
18,Cirdan,Inguier,2,3,2,resources/images/eleves/eleve_fille1.png
19,Valar,Eriksson,6,5,4,resources/images/eleves/eleve_garcon3.png
20,Matan,Yngouf,7,6,7,resources/images/eleves/eleve_garcon4.png
21,Olaf,Varangot,2,6,2,resources/images/eleves/eleve_garcon_versionAdibou.png
22,Leif,Aze,5,4,9,resources/images/eleves/eleve_fille2.png
23,Bjarne,Ernouf,2,4,5,resources/images/eleves/eleve_garcon1.png
24,Gandalf,Kirkegaard,10,6,4,resources/images/eleves/eleve_garcon_versionNoel.png
25,Markus,Persson,4,5,6,resources/images/eleves/eleve_garcon2.png
26,Franco,Foutete,3,5,10,resources/images/eleves/eleve_garcon3.png
27,Piro,Ovenn,6,4,7,resources/images/eleves/eleve_garcon4.png
28,Lias,Leinfebr,5,4,7,resources/images/eleves/eleve_garcon_versionAdibou.png
29,Yonn,Miglagla,4,3,5,resources/images/eleves/eleve_garcon_versionNoel.png
30,Mateu,Voyaar,3,7,5,resources/images/eleves/eleve_garcon1.png
31,Egill,Gulbrandsen,4,3,5,resources/images/eleves/eleve_fille_versionNoel.png
32,Marcus,Jespersen,10,9,10,resources/images/eleves/eleve_garcon2.png
33,Frederik,Jakobsen,4,6,5,resources/images/eleves/eleve_fille2.png
34,Alexander,Mortensen,6,5,8,resources/images/eleves/eleve_garcon3.png
35,Rasmus,Norgaard,4,5,6,resources/images/eleves/eleve_fille_versionNoel.png
36,Nicolai,Gregersen,8,5,6,resources/images/eleves/eleve_garcon4.png
37,Alberte,Andersen,4,6,8,resources/images/eleves/eleve_garcon_versionAdibou.png
38,Oskar,Johansen,6,5,3,resources/images/eleves/eleve_garcon_versionNoel.png
39,Mark,Kristensen,7,5,5,resources/images/eleves/eleve_garcon1.png
40,Rosa,Jespersen,8,5,6,resources/images/eleves/eleve_fille1.png
......@@ -42,14 +42,15 @@ StudentFactory::loadStudentFactory()
std::vector<std::string> studentline;
while (ifs.good()) {
studentline = getNextLineAndSplitIntoTokens(ifs);
if (studentline.size() == 6)
if (studentline.size() == 7)
studentFactory.push_back(new Student(
studentline[1], studentline[2], atof(studentline[3].c_str()),
atof(studentline[4].c_str()), atof(studentline[5].c_str())));
atof(studentline[4].c_str()), atof(studentline[5].c_str()), studentline[6].c_str()));
}
ifs.close();
auto rng = std::default_random_engine{};
auto rd = std::random_device{ };
auto rng = std::default_random_engine{ rd() };
std::shuffle(std::begin(studentFactory), std::end(studentFactory), rng);
}
......
......@@ -5,8 +5,8 @@
#include "model/Student.h"
Student::Student(const std::string &firstname, const std::string &surname,
double mood, double motivation, double skill)
: Actor(firstname, surname, "resources/images/eleves/eleve_garcon1.png")
double mood, double motivation, double skill, const std::string &texturePath)
: Actor(firstname, surname, texturePath)
, mood(mood)
, motivation(motivation)
, skill(skill)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment