Basic moon added.

Author: Unarelith

source/client/graphics/Sun.cpp renamed to source/client/graphics/CelestialObject.cpp

@@ -24,17 +24,17 @@
  *
  * =====================================================================================
  */
+#include <gk/core/GameClock.hpp>
 #include <gk/gl/GLCheck.hpp>
-#include <gk/graphics/Color.hpp>
 
-#include "Sun.hpp"
+#include "CelestialObject.hpp"
 #include "Vertex.hpp"
 
-Sun::Sun() {
+CelestialObject::CelestialObject() {
 	updateVertexBuffer();
 }
 
-void Sun::updateVertexBuffer() const {
+void CelestialObject::updateVertexBuffer() const {
 	float width = 20.f;
 	float height = 20.f;
 	Vertex vertices[4] = {
@@ -45,21 +45,21 @@ void Sun::updateVertexBuffer() const {
 		{{0, width, height, -1}},
 	};
 
-	gk::Color color = gk::Color::Yellow;
 	for (u8 i = 0 ; i < 4 ; ++i) {
-		vertices[i].color[0] = color.r;
-		vertices[i].color[1] = color.g;
-		vertices[i].color[2] = color.b;
-		vertices[i].color[3] = color.a;
+		vertices[i].color[0] = m_color.r;
+		vertices[i].color[1] = m_color.g;
+		vertices[i].color[2] = m_color.b;
+		vertices[i].color[3] = m_color.a;
 	}
 
 	gk::VertexBuffer::bind(&m_vbo);
 	m_vbo.setData(sizeof(vertices), vertices, GL_STATIC_DRAW);
 	gk::VertexBuffer::bind(nullptr);
 }
 
-void Sun::draw(gk::RenderTarget &target, gk::RenderStates states) const {
-	// states.transform *= getTransform();
+void CelestialObject::draw(gk::RenderTarget &target, gk::RenderStates states) const {
+	states.transform.rotate(fmod(gk::GameClock::getInstance().getTicks(true) / 1000.f, 360), {0, 1, 0});
+	states.transform *= getTransform();
 
 	states.vertexAttributes = VertexAttribute::All;
 

source/client/graphics/Sun.hpp renamed to source/client/graphics/CelestialObject.hpp

@@ -24,23 +24,28 @@
  *
  * =====================================================================================
  */
-#ifndef SUN_HPP_
-#define SUN_HPP_
+#ifndef CELESTIALOBJECT_HPP_
+#define CELESTIALOBJECT_HPP_
 
 #include <gk/gl/Drawable.hpp>
 #include <gk/gl/Transformable.hpp>
 #include <gk/gl/VertexBuffer.hpp>
+#include <gk/graphics/Color.hpp>
 
-class Sun : public gk::Drawable, public gk::Transformable  {
+class CelestialObject : public gk::Drawable, public gk::Transformable  {
 	public:
-		Sun();
+		CelestialObject();
 
-		void updateVertexBuffer() const;
+		void setColor(const gk::Color &color) { m_color = color; updateVertexBuffer(); }
 
 	private:
+		void updateVertexBuffer() const;
+
 		void draw(gk::RenderTarget &target, gk::RenderStates states) const override;
 
 		gk::VertexBuffer m_vbo;
+
+		gk::Color m_color = gk::Color::White;
 };
 
-#endif // SUN_HPP_
+#endif // CELESTIALOBJECT_HPP_

source/client/graphics/Skybox.cpp

@@ -24,24 +24,23 @@
  *
  * =====================================================================================
  */
-#include <gk/gl/GLCheck.hpp>
-#include <gk/graphics/Color.hpp>
-
-#include <gk/core/GameClock.hpp>
-
 #include "Skybox.hpp"
 #include "Vertex.hpp"
 
 Skybox::Skybox(gk::Camera &camera) : m_camera(camera) {
-	setPosition(150, -10, 0);
+	m_sun.setColor(gk::Color::Yellow);
+	m_sun.setPosition(150, -10, 0);
+
+	m_moon.setColor(gk::Color::White);
+	m_moon.setPosition(-150, -10, 0);
 }
 
 void Skybox::draw(gk::RenderTarget &target, gk::RenderStates states) const {
 	// Subtract the camera position - see comment in ClientWorld::draw()
 	gk::Vector3d cameraPosition = m_camera.getDPosition();
-	states.transform.rotate(fmod(gk::GameClock::getInstance().getTicks(true) / 1000.f, 360), {0, 1, 0});
-	states.transform.translate(getPosition().x - cameraPosition.x, getPosition().y - cameraPosition.y, getPosition().z - cameraPosition.z);
+	states.transform.translate(-cameraPosition.x, -cameraPosition.y, -cameraPosition.z);
 
 	target.draw(m_sun, states);
+	target.draw(m_moon, states);
 }
 

source/client/graphics/Skybox.hpp

@@ -29,7 +29,7 @@
 
 #include <gk/gl/Camera.hpp>
 
-#include "Sun.hpp"
+#include "CelestialObject.hpp"
 
 class Skybox : public gk::Drawable, public gk::Transformable {
 	public:
@@ -42,7 +42,8 @@ class Skybox : public gk::Drawable, public gk::Transformable {
 
 		gk::VertexBuffer m_sunVBO;
 
-		Sun m_sun;
+		CelestialObject m_sun;
+		CelestialObject m_moon;
 };
 
 #endif // SKYBOX_HPP_