Skip to content
This repository was archived by the owner on Jun 11, 2025. It is now read-only.
2 changes: 1 addition & 1 deletion include/engine/render/ShadedShaderProgram.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class ShadedShaderProgram : public ShaderProgram {
void setNormalMatrix(const glm::mat4 &normalMatrix) const;
void setCameraPosition(const glm::vec3 &position) const;

void setTexture(const Texture &texture) const;
void setTexture(const Texture &texture, const scene::Material &material) const;
void setMaterial(const scene::Material &material) const;
void setLights(const std::vector<std::unique_ptr<scene::light::Light>> &lights) const;

Expand Down
17 changes: 12 additions & 5 deletions include/generator/SolarSystem.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,26 @@ class SolarSystem {

private:
tinyxml2::XMLElement *createVector(const std::string &name, const glm::vec3 &vec);
tinyxml2::XMLElement *createBody(float radius,
tinyxml2::XMLElement *createColor(const std::string &name, const glm::vec3 &color);

tinyxml2::XMLElement *createBody(const std::string &name,
float radius,
float distance,
float orbitTime,
float rotationTime,
float y = 0.0f,
bool hasOrbiters = false);
tinyxml2::XMLElement *createRings(float radius);
tinyxml2::XMLElement *
createAsteroidBelt(float minDistance, float maxDistance, float orbitTime, int numAsteroids);
tinyxml2::XMLElement *createComet();
tinyxml2::XMLElement *createRings(const std::string &name, float radius);
tinyxml2::XMLElement *createAsteroidBelt(const std::string &name,
float minDistance,
float maxDistance,
float orbitTime,
int numAsteroids);
tinyxml2::XMLElement *createComet(const std::string &name);

void createPreamble(float sunScale, float rockyScale, float gasScale);
void createCamera();
void createLight();
void createObjects(float sunScale, float rockyScale, float gasScale);
};

Expand Down
Binary file added res/scenes/solarSystem/Comet.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/scenes/solarSystem/Earth.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/scenes/solarSystem/Jupiter.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/scenes/solarSystem/Mars.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/scenes/solarSystem/Mercury.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/scenes/solarSystem/Moon.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/scenes/solarSystem/Neptune.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/scenes/solarSystem/Rings.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/scenes/solarSystem/Saturn.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/scenes/solarSystem/Sun.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/scenes/solarSystem/Uranus.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/scenes/solarSystem/Venus.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading