nakidai
/
vectozavr-shooter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add transform(const Matrix4x4& t) 

add transformRelativePoint(const Vec3D &point, const Matrix4x4& transform)
implement every transform method using transform() & transformRelativePoint()
master
Vectozavr 2021-10-30 21:17:49 +07:00
parent 1e6539e8e0
commit 65fb1ce45d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source.cpp
View File

@ -13,7 +13,7 @@ int main() {
//game.create(1280, 720, ShooterConsts::PROJECT_NAME); //game.create(1280, 720, ShooterConsts::PROJECT_NAME);
//game.create(1920, 1080, ShooterConsts::PROJECT_NAME, true, Consts::BACKGROUND_COLOR, sf::Style::Fullscreen); //game.create(1920, 1080, ShooterConsts::PROJECT_NAME, true, Consts::BACKGROUND_COLOR, sf::Style::Fullscreen);
game.create(2048, 1152, ShooterConsts::PROJECT_NAME); game.create(2048, 1152, ShooterConsts::PROJECT_NAME, false);
//game.create(3072, 1920, ShooterConsts::PROJECT_NAME, true, Consts::BACKGROUND_COLOR, sf::Style::Fullscreen); //game.create(3072, 1920, ShooterConsts::PROJECT_NAME, true, Consts::BACKGROUND_COLOR, sf::Style::Fullscreen);
return 0; return 0;

14
engine/Screen.cpp
View File

@ -165,7 +165,7 @@ void Screen::glDrawMesh(GLfloat* geometry, GLfloat* view, GLfloat* model, size_t
glLoadIdentity(); glLoadIdentity();
glLoadMatrixf(view); glLoadMatrixf(view);
glMultMatrixf(model); //glMultMatrixf(model);
// Draw the mesh // Draw the mesh
glDrawArrays(GL_TRIANGLES, 0, count); glDrawArrays(GL_TRIANGLES, 0, count);
@ -178,7 +178,6 @@ GLfloat* Screen::glMeshToGLfloatArray(std::shared_ptr<Mesh> mesh, const Vec3D& c
std::vector<Triangle>& triangles = mesh->triangles(); std::vector<Triangle>& triangles = mesh->triangles();
auto* geometry = (GLfloat*)malloc(7*3*triangles.size()*sizeof(GLfloat)); auto* geometry = (GLfloat*)malloc(7*3*triangles.size()*sizeof(GLfloat));
Matrix4x4 model = mesh->model();
for(int i = 0; i < triangles.size(); i++) { for(int i = 0; i < triangles.size(); i++) {
@ -187,8 +186,11 @@ GLfloat* Screen::glMeshToGLfloatArray(std::shared_ptr<Mesh> mesh, const Vec3D& c
double dot[3]; double dot[3];
sf::Color ambientColor[3]; sf::Color ambientColor[3];
Triangle MTriangle = triangles[i]*mesh->model();
for(int k = 0; k < 3; k++) { for(int k = 0; k < 3; k++) {
dot[k] = triangles[i].norm().dot((model*Vec3D(triangles[i][k]) - cameraPosition).normalized());
dot[k] = MTriangle.norm().dot((Vec3D(MTriangle[k]) - cameraPosition).normalized());
sf::Color color = triangles[i].color(); sf::Color color = triangles[i].color();
ambientColor[k] = sf::Color((sf::Uint8)(color.r * (0.3 * std::abs(dot[k]) + 0.7)), ambientColor[k] = sf::Color((sf::Uint8)(color.r * (0.3 * std::abs(dot[k]) + 0.7)),
@ -196,9 +198,9 @@ GLfloat* Screen::glMeshToGLfloatArray(std::shared_ptr<Mesh> mesh, const Vec3D& c
(sf::Uint8)(color.b * (0.3 * std::abs(dot[k]) + 0.7)), (sf::Uint8)(color.b * (0.3 * std::abs(dot[k]) + 0.7)),
(sf::Uint8)color.a); (sf::Uint8)color.a);
geometry[stride + 7*k + 0] = (GLfloat)triangles[i][k].x(); geometry[stride + 7*k + 0] = (GLfloat)MTriangle[k].x();
geometry[stride + 7*k + 1] = (GLfloat)triangles[i][k].y(); geometry[stride + 7*k + 1] = (GLfloat)MTriangle[k].y();
geometry[stride + 7*k + 2] = (GLfloat)triangles[i][k].z(); geometry[stride + 7*k + 2] = (GLfloat)MTriangle[k].z();
geometry[stride + 7*k + 3] = (GLfloat)ambientColor[k].r/255.0f; geometry[stride + 7*k + 3] = (GLfloat)ambientColor[k].r/255.0f;
geometry[stride + 7*k + 4] = (GLfloat)ambientColor[k].g/255.0f; geometry[stride + 7*k + 4] = (GLfloat)ambientColor[k].g/255.0f;