Finished rendering code
This commit is contained in:
parent
363779f809
commit
131b7cac5e
3 changed files with 27 additions and 6 deletions
5
obj.cpp
5
obj.cpp
|
@ -4,6 +4,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <regex>
|
#include <regex>
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
void ObjectLoader::load_mtl(string filename) {
|
void ObjectLoader::load_mtl(string filename) {
|
||||||
string tmp;
|
string tmp;
|
||||||
|
@ -76,9 +77,9 @@ void ObjectLoader::load_obj(string filename) {
|
||||||
regex_search(tmp, match, re);
|
regex_search(tmp, match, re);
|
||||||
for (int i = 1; i < 7; i++) {
|
for (int i = 1; i < 7; i++) {
|
||||||
if (i % 2 == 0) {
|
if (i % 2 == 0) {
|
||||||
faces.back().normals.push_back(&(normals[stoi(match.str(i))]));
|
faces.back().normals.push_back(&(normals[stoi(match.str(i)) - 1]));
|
||||||
} else {
|
} else {
|
||||||
faces.back().vertices.push_back(&(vertices[stoi(match.str(i))]));
|
faces.back().vertices.push_back(&(vertices[stoi(match.str(i)) - 1]));
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#include <GL/glu.h>
|
#include <GL/glu.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "obj.h"
|
#include <iostream>
|
||||||
|
|
||||||
void OPGLWidget::initializeGL() {
|
void OPGLWidget::initializeGL() {
|
||||||
glClearDepth(1.0f);
|
glClearDepth(1.0f);
|
||||||
|
@ -22,7 +22,6 @@ void OPGLWidget::initializeGL() {
|
||||||
glLightfv(GL_LIGHT0, GL_POSITION, light_position);
|
glLightfv(GL_LIGHT0, GL_POSITION, light_position);
|
||||||
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
|
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
|
||||||
|
|
||||||
ObjectLoader obj;
|
|
||||||
obj.load_mtl("untitled.mtl");
|
obj.load_mtl("untitled.mtl");
|
||||||
obj.load_obj("untitled.obj");
|
obj.load_obj("untitled.obj");
|
||||||
}
|
}
|
||||||
|
@ -30,7 +29,26 @@ void OPGLWidget::initializeGL() {
|
||||||
void OPGLWidget::paintGL() {
|
void OPGLWidget::paintGL() {
|
||||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||||
glLoadIdentity();
|
glLoadIdentity();
|
||||||
reorient();
|
//reorient();
|
||||||
|
glTranslatef(0.0f, 0.0f, -10.0f);
|
||||||
|
glPolygonMode(GL_FRONT, GL_FILL);
|
||||||
|
glBegin(GL_TRIANGLES);
|
||||||
|
for (int i = 0; i < obj.faces.size(); i++) {
|
||||||
|
Material* mtl_ptr = obj.faces[i].mtl;
|
||||||
|
if (mtl_idx != mtl_ptr->idx) {
|
||||||
|
glMaterialfv(GL_FRONT, GL_AMBIENT, mtl_ptr -> ambient);
|
||||||
|
glMaterialfv(GL_FRONT, GL_DIFFUSE, mtl_ptr -> diffuse);
|
||||||
|
glMaterialfv(GL_FRONT, GL_SPECULAR, mtl_ptr -> specular);
|
||||||
|
glMaterialf(GL_FRONT, GL_SHININESS, {128.0f});
|
||||||
|
mtl_idx =mtl_ptr->idx;
|
||||||
|
};
|
||||||
|
for (int j = 0; j < 3; j++) {
|
||||||
|
glVertex3fv(obj.faces[i].vertices[j] -> pos);
|
||||||
|
glNormal3fv(obj.faces[i].normals[j] -> dir);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
glEnd();
|
||||||
|
glFlush();
|
||||||
}
|
}
|
||||||
|
|
||||||
void OPGLWidget::reorient() {
|
void OPGLWidget::reorient() {
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
#include <QtWidgets/QOpenGLWidget>
|
#include <QtWidgets/QOpenGLWidget>
|
||||||
|
#include "obj.h"
|
||||||
|
|
||||||
class OPGLWidget : public QOpenGLWidget
|
class OPGLWidget : public QOpenGLWidget
|
||||||
{
|
{
|
||||||
|
@ -12,4 +13,5 @@ protected:
|
||||||
|
|
||||||
int mtl_idx = -1;
|
int mtl_idx = -1;
|
||||||
float loc[3] = {-10, 0, -10};
|
float loc[3] = {-10, 0, -10};
|
||||||
|
ObjectLoader obj;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue