martin
/
protot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Initial work for perspective camera

simple_math_single_header
Martin Felis 2018-02-27 21:32:29 +01:00
parent 39fe10ffc7
commit d5fe4d366f
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/RenderModule.cc
View File

@ -65,11 +65,12 @@ static void module_serialize (
Serializer* serializer) { Serializer* serializer) {
SerializeBool(*serializer, "protot.RenderModule.DrawDepth", sRendererSettings.DrawDepth); SerializeBool(*serializer, "protot.RenderModule.DrawDepth", sRendererSettings.DrawDepth);
SerializeBool(*serializer, "protot.RenderModule.Camera.mIsOrthographic", gRenderer->mCamera.mIsOrthographic); SerializeBool(*serializer, "protot.RenderModule.Camera.mIsOrthographic", gRenderer->mCamera.mIsOrthographic);
SerializeFloat(*serializer, "protot.RenderModule.Camera.mFov", gRenderer->mCamera.mFov);
SerializeVec3(*serializer, "protot.RenderModule.Camera.mEye", gRenderer->mCamera.mEye);
SerializeVec3(*serializer, "protot.RenderModule.Camera.mPoi", gRenderer->mCamera.mPoi);
SerializeVec3(*serializer, "protot.RenderModule.Camera.mUp", gRenderer->mCamera.mUp);
SerializeFloat(*serializer, "protot.RenderModule.Camera.mNear", gRenderer->mCamera.mNear); SerializeFloat(*serializer, "protot.RenderModule.Camera.mNear", gRenderer->mCamera.mNear);
SerializeFloat(*serializer, "protot.RenderModule.Camera.mFar", gRenderer->mCamera.mFar); SerializeFloat(*serializer, "protot.RenderModule.Camera.mFar", gRenderer->mCamera.mFar);
// // get the state from the serializer
// Camera* camera = &gRenderer->cameras[gRenderer->activeCameraIndex];
// assert (camera != nullptr);
// SerializeBool (*serializer, "protot.RenderModule.draw_floor", gRenderer->drawFloor); // SerializeBool (*serializer, "protot.RenderModule.draw_floor", gRenderer->drawFloor);
// SerializeBool (*serializer, "protot.RenderModule.draw_skybox", gRenderer->drawSkybox); // SerializeBool (*serializer, "protot.RenderModule.draw_skybox", gRenderer->drawSkybox);
@ -147,13 +148,21 @@ void Camera::UpdateMatrices() {
if (mIsOrthographic) { if (mIsOrthographic) {
mProjectionMatrix = Ortho(-1.0f, 1.0f, -1.0f, 1.0f, mNear, mFar); mProjectionMatrix = Ortho(-1.0f, 1.0f, -1.0f, 1.0f, mNear, mFar);
} else { } else {
mProjectionMatrix = Perspective(mFov, mWidth / mHeight, mNear, mFar);
} }
} }
void Camera::DrawGui() { void Camera::DrawGui() {
ImGui::SliderFloat3("Eye", mEye.data(), -10.0f, 10.0f);
ImGui::SliderFloat3("Poi", mPoi.data(), -10.0f, 10.0f);
ImGui::SliderFloat3("Up", mUp.data(), -10.0f, 10.0f);
ImGui::Checkbox("Orthographic", &mIsOrthographic); ImGui::Checkbox("Orthographic", &mIsOrthographic);
ImGui::SliderFloat("Fov", &mFov, 5, 160);
ImGui::SliderFloat("Near", &mNear, -10, 10); ImGui::SliderFloat("Near", &mNear, -10, 10);
ImGui::SliderFloat("Far", &mFar, -10, 10); ImGui::SliderFloat("Far", &mFar, -10, 10);
if (ImGui::Button("Reset")) {
*this = Camera();
}
} }
@ -230,10 +239,6 @@ void Renderer::RenderGl() {
if (width != mWidth || height != mHeight) if (width != mWidth || height != mHeight)
Resize(width, height); Resize(width, height);
mCamera.mEye = Vector3f (0.0f, 0.0f, 4.0f);
mCamera.mPoi = Vector3f (0.0f, 0.0f, 0.0f);
mCamera.mUp = Vector3f (0.0f, 1.0f, 0.0f);
mCamera.UpdateMatrices(); mCamera.UpdateMatrices();
Matrix44f model_matrix = TranslateMat44(0.0f, 0.0f, 0.0f); Matrix44f model_matrix = TranslateMat44(0.0f, 0.0f, 0.0f);
@ -326,8 +331,6 @@ void Renderer::RenderGui() {
ImGui::Text("Scene"); ImGui::Text("Scene");
const ImVec2 content_avail = ImGui::GetContentRegionAvail(); const ImVec2 content_avail = ImGui::GetContentRegionAvail();
// mRenderTarget.Resize(content_avail.x, content_avail.y);
ImGui::Image((void*) texture, ImGui::Image((void*) texture,
content_avail, content_avail,
ImVec2(0.0f, 1.0f), ImVec2(0.0f, 1.0f),
@ -337,6 +340,7 @@ void Renderer::RenderGui() {
ImGui::EndDock(); ImGui::EndDock();
if (ImGui::BeginDock("Render Settings")) { if (ImGui::BeginDock("Render Settings")) {
ImGui::Text("Camera");
mCamera.DrawGui(); mCamera.DrawGui();
ImGui::Text("Default Texture"); ImGui::Text("Default Texture");
@ -354,5 +358,7 @@ void Renderer::Resize (int width, int height) {
mWidth = width; mWidth = width;
mHeight = height; mHeight = height;
mRenderTarget.Resize(mWidth, mHeight); mRenderTarget.Resize(mWidth, mHeight);
mCamera.mWidth = mWidth;
mCamera.mHeight = mHeight;
glViewport(0, 0, mWidth, mHeight); glViewport(0, 0, mWidth, mHeight);
} }