Commit dfbd23bc authored by Elias Leinenweber's avatar Elias Leinenweber
Browse files

Style

parent 00251ac5
......@@ -2,7 +2,11 @@
#include "model/Actor.h"
Actor::Actor(const std::string &name, const std::string &surname, const std::string &texturePath) : Texturable(texturePath), name(name), surname(surname)
Actor::Actor(const std::string &name, const std::string &surname,
const std::string &texturePath)
: Texturable(texturePath)
, name(name)
, surname(surname)
{
std::cout << "créé un actor" << std::endl;
}
......@@ -9,7 +9,7 @@ void
Classroom::render() const
{
ImGui::ImageButton(texture, ImVec2(ImGui::GetIO().DisplaySize.x / 2.1,
ImGui::GetIO().DisplaySize.y / 2.2));
ImGui::GetIO().DisplaySize.y / 2.2));
}
Classroom::~Classroom()
......
......@@ -11,7 +11,8 @@
#include "model/Teacher.h"
#include "view/Utils.h"
School::School(const std::string &name) : name(name)
School::School(const std::string &name)
: name(name)
{
std::cout << "en train de créer une school" << std::endl;
Teacher *teacher = new Teacher("H.", "Julien", 70, 40);
......
......@@ -3,9 +3,11 @@
#include "model/Actor.h"
#include "model/Teacher.h"
Teacher::Teacher(const std::string &name, const std::string &surname, double pedagogie,
double meritocratic) : Actor(name, surname, "resources/images/profs/prof1.png"),
pedagogue(pedagogie), meritocratic(meritocratic)
Teacher::Teacher(const std::string &name, const std::string &surname,
double pedagogie, double meritocratic)
: Actor(name, surname, "resources/images/profs/prof1.png")
, pedagogue(pedagogie)
, meritocratic(meritocratic)
{
std::cout << "créé un teacher" << std::endl;
}
......@@ -11,7 +11,8 @@
#include "view/MainView.h"
#include "view/Utils.h"
MainView::MainView() : school(new School("L'école infernale"))
MainView::MainView()
: school(new School("L'école infernale"))
{
std::cout << "créé la mainview" << std::endl;
}
......
......@@ -7,7 +7,9 @@
#include "view/Texturable.h"
Texturable::Texturable(const std::string &filename) : texturePath(filename), texture(sf::Texture())
Texturable::Texturable(const std::string &filename)
: texturePath(filename)
, texture(sf::Texture())
{
std::cout << "About to load texture..." << std::endl;
std::cout << "texturePath = \"" << texturePath << "\"" << std::endl;
......
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