15a861802a
Change the group function to find group by name, and now name group when needed, and change tests to use group name instead of number. Also now the default group is the base group, not a separate group. Bonus: Add a destructor to cleanup memory Added a function to get base group. OBJFile will still behave as a valid shape, but now we can skip it in the generated world by adding the base group instead. Code is now cleaner.
79 lines
1.7 KiB
C++
79 lines
1.7 KiB
C++
/*
|
|
* DoRayMe - a quick and dirty Raytracer
|
|
* OBJ File header
|
|
*
|
|
* Created by Manoël Trapier
|
|
* Copyright (c) 2020 986-Studio.
|
|
*
|
|
*/
|
|
#ifndef DORAYME_OBJFILE_H
|
|
#define DORAYME_OBJFILE_H
|
|
|
|
#include <stdint.h>
|
|
#include <tuple.h>
|
|
#include <shape.h>
|
|
#include <group.h>
|
|
#include <renderstat.h>
|
|
|
|
class OBJFile : public Shape
|
|
{
|
|
private:
|
|
Group *baseGroup;
|
|
|
|
Group *currentGroup;
|
|
|
|
uint32_t allocatedVertexCount;
|
|
Point* *vertexList;
|
|
uint32_t vertexCount;
|
|
|
|
uint32_t allocatedVertexNormalCount;
|
|
Vector* *vertexNormalList;
|
|
uint32_t vertexNormalCount;
|
|
|
|
private:
|
|
Intersect localIntersect(Ray r);
|
|
Tuple localNormalAt(Tuple point, Intersection *hit = nullptr);
|
|
|
|
public:
|
|
/* Some stats */
|
|
uint32_t ignoredLines;
|
|
|
|
protected:
|
|
void addGroup(Group *group);
|
|
void addVertex(Point *vertex);
|
|
void addVertexNormal(Vector *vertexNormal);
|
|
|
|
void parseLine(char *line, uint32_t currentLine);
|
|
int execLine(int argc, char *argv[], uint32_t currentLine);
|
|
BoundingBox bounds;
|
|
|
|
public:
|
|
OBJFile();
|
|
OBJFile(const char *filepath);
|
|
|
|
~OBJFile();
|
|
|
|
int parseOBJFile(const char *content);
|
|
|
|
/* OBJ file expect the first vertice to be 1 and not 0 */
|
|
Point vertices(uint32_t i) { return *this->vertexList[i - 1]; };
|
|
Vector verticesNormal(uint32_t i) { return *this->vertexNormalList[i - 1]; };
|
|
Group *groups(const char *groupName);
|
|
Intersect intersect(Ray r);
|
|
BoundingBox getLocalBounds();
|
|
BoundingBox getBounds();
|
|
|
|
Shape *getBaseGroup() { return this->baseGroup; };
|
|
|
|
bool includes(Shape *b);
|
|
|
|
void updateBoundingBox();
|
|
void updateTransform();
|
|
|
|
void dumpMe(FILE * fp);
|
|
};
|
|
|
|
#define OBJ_DEFAULT_GROUP "_DefaultObjGroup_"
|
|
|
|
#endif /* DORAYME_OBJFILE_H */
|