ApfelTeeSaft/vb01
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/vb01.git synced 2026-08-26 19:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

first morph animation attempt

Browse Source
This commit is contained in:
devZoGok
2021-10-19 19:06:41 +03:00
parent c931e5a6d6
commit e2e7297045
5 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mesh.cpp
+17
View File
@@ -26,6 +26,9 @@ namespace vb01{
this->numShapeKeys = numShapeKeys;
this->name = name;
shapeKeyFactors = new float[numShapeKeys];
for(int i = 0; i < numShapeKeys; i++)
shapeKeyFactors[i] = 1;
}
Mesh::~Mesh(){
@@ -98,6 +101,10 @@ namespace vb01{
glEnableVertexAttribArray(5);
glVertexAttribPointer(6, 4, GL_FLOAT, GL_FALSE, size, (void*)(offsetof(Vertex, boneIndices)));
glEnableVertexAttribArray(6);
for(int i = 0; i < numShapeKeys; i++){
}
glVertexAttribPointer(7, 3, GL_FLOAT, GL_FALSE, size, (void*)(offsetof(Vertex, shapeKeyOffsets)));
glEnableVertexAttribArray(7);
}
void Mesh::update(){
@@ -134,6 +141,9 @@ namespace vb01{
if(skeleton)
updateSkeleton(shader);
if(numShapeKeys > 0)
updateShapeKeys(shader);
shader->setBool(castShadow, "castShadow");
shader->setBool(skeleton, "animated");
shader->setBool(false, "environment");
@@ -151,6 +161,13 @@ namespace vb01{
render();
}
void Mesh::updateShapeKeys(Shader *shader){
shader->editShader(Shader::VERTEX_SHADER, 5, "const int numShapeKeys=" + to_string(numShapeKeys) + ";");
for(int i = 0; i < numShapeKeys; i++){
shader->setFloat(shapeKeyFactors[i], "shapeKeyFactors[" + to_string(i) + "]");
}
}
void Mesh::updateSkeleton(Shader *shader){
skeleton->update();
mesh.h
+4 -2
View File
@@ -23,7 +23,7 @@ namespace vb01{
//float *weights=nullptr;
float weights[4]{0, 0, 0, 0};
int boneIndices[4]{-1, -1, -1, -1};
Vector3 *shapeKeyOffsets = nullptr;
Vector3 shapeKeyOffsets[100];
};
Mesh(Vertex*, unsigned int*, int, std::string *vg = nullptr, int = 0, std::string *sk = nullptr, int = 0, std::string = "");
@@ -53,6 +53,7 @@ namespace vb01{
void initFramebuffer();
void updateSkeleton(Shader*);
void updateReflection(Shader*, Vector3, int, int);
void updateShapeKeys(Shader*);
Shader *environmentShader = nullptr;
u32 environmentBuffer;
@@ -68,7 +69,8 @@ namespace vb01{
bool staticVerts = true, castShadow = false, reflect = false, wireframe = false;
Vertex *vertices;
std::string *vertexGroups = nullptr, *shapeKeys = nullptr;
unsigned int *indices, VAO, VBO, EBO;
u32 *indices, VAO, VBO, EBO;
float *shapeKeyFactors = nullptr;
int numTris, numVertexGroups = 0, numShapeKeys = 0;
};
}
texture.vert
+12 -5
View File
@@ -1,8 +1,9 @@
#version 330 core
const int numBones=1;
const int numVertGroups=1;
const int numBones = 1;
const int numVertGroups = 1;
const int numMaxInfluences = 4;
const int numShapeKeys = 1;
mat4 transform[numBones];
mat4 poseTransform[numBones];
@@ -14,6 +15,7 @@ layout (location=3) in vec3 aTan;
layout (location=4) in vec3 aBiTan;
layout (location=5) in vec4 aWeight;
layout (location=6) in ivec4 aBoneIndices;
layout (location=7) in vec3[numShapeKeys] aShapeKeyOffsets;
out vec3 fragPos;
out vec3 norm;
@@ -32,6 +34,7 @@ uniform Bone bones[numBones];
uniform mat4 model;
uniform mat4 view;
uniform mat4 proj;
uniform float[numShapeKeys] shapeKeyFactors;
mat4 createTranslationMatrix(vec3 trans){
mat4 transMat;
@@ -98,14 +101,18 @@ void main(){
poseTransform[i] = poseTransform[bones[i].parent] * localTransform;
}
vec3 v = vec3(0);
vec3 v0 = vec3(0);
for(int i = 0; i < numBones; i++){
float weight = getWeight(bones[i]);
vec4 boneLocalVert = inverse(transform[i]) * vertPos;
v += (weight * poseTransform[i] * boneLocalVert).xyz;
v0 += (weight * poseTransform[i] * boneLocalVert).xyz;
}
vertPos.xyz = v;
vertPos.xyz = v0;
}
for(int i = 0; i < numShapeKeys; i++){
vertPos.xyz += aShapeKeyOffsets[i] * shapeKeyFactors[i];
}
gl_Position = proj * view * model * vertPos;
vbModelReader.cpp
+36 -7
View File
@@ -306,6 +306,7 @@ namespace vb01{
void VbModelReader::readFaces(
vector<Vector3> &vertPos,
vector<Vector3> &vertNorm,
vector<u32> &vertIds,
vector<float> &vertWeights,
vector<string> &meshData,
int numBones,
@@ -337,6 +338,7 @@ namespace vb01{
}
}
vertIds.push_back(index);
vertices[i] = vert;
indices[i] = i;
}
@@ -348,8 +350,30 @@ namespace vb01{
}
}
void VbModelReader::readShapeKeys(int shapeKeyStartLine, int numShapes){
void VbModelReader::readShapeKeys(Mesh::Vertex *vertices, vector<u32> &vertIds, vector<string> &meshData, string *shapeKeys, int numShapes, int numVertPos){
/*
for(int i = 0; i < vertIds.size(); i++)
vertices[i].shapeKeyOffsets = new Vector3[numShapes];
*/
int shapeKeyStartLine = 0;
for(int i = 0; i < numShapes; i++){
shapeKeys[i] = meshData[shapeKeyStartLine];
Vector3 *shapeKeyVertPos = new Vector3[numVertPos];
for(int j = 0; j < numVertPos; j++){
string line = meshData[shapeKeyStartLine + 1 + j];
string dataLine[3];
getLineData(line, dataLine, 3);
shapeKeyVertPos[j] = Vector3(atof(dataLine[0].c_str()), atof(dataLine[2].c_str()), -atof(dataLine[1].c_str()));
}
for(int j = 0; j < vertIds.size(); j++){
Vector3 offset = shapeKeyVertPos[vertIds[j]] - vertices[j].pos;
vertices[j].shapeKeyOffsets[i] = (offset);
}
delete[] shapeKeyVertPos;
shapeKeyStartLine += numVertPos + 1;
}
}
@@ -381,35 +405,40 @@ namespace vb01{
int vertexGroupStartLine = 8;
int vertexStartLine = vertexGroupStartLine + numBones + 1;
int faceStartLine = vertexStartLine + numVertices + 1;
int shapeKeyStartLine = faceStartLine + numFaces + 1;
int shapeKeyStartLine = faceStartLine + numFaces * numVertsPerFace + 1;
vector<Vector3> vertPos, vertNorm;
vector<float> vertWeights;
vector<u32> vertIds;
Mesh::Vertex *vertices = new Mesh::Vertex[numFaces * numVertsPerFace];
u32 *indices = new u32[numFaces * numVertsPerFace];
string *groups = new string[numBones];
string *shapeKeys = new string[numShapes];
vector<string> meshSubData = vector<string>(meshData.begin() + vertexStartLine, meshData.begin() + vertexStartLine + numVertices);
readVertices(vertPos, vertNorm, vertWeights, meshSubData, numBones);
meshSubData.clear();
meshSubData = vector<string>(meshData.begin() + faceStartLine, meshData.begin() + faceStartLine + numFaces * numVertsPerFace);
readFaces(vertPos, vertNorm, vertWeights, meshSubData, numBones, vertices, indices);
readFaces(vertPos, vertNorm, vertIds, vertWeights, meshSubData, numBones, vertices, indices);
meshSubData.clear();
vertPos.clear();
vertNorm.clear();
vertWeights.clear();
meshSubData = vector<string>(meshData.begin() + vertexGroupStartLine, meshData.begin() + vertexGroupStartLine + numBones);
readVertexGroups(groups, meshSubData, numBones);
meshSubData.clear();
meshSubData = vector<string>(meshData.begin() + shapeKeyStartLine, meshData.begin() + shapeKeyStartLine + numShapes);
readShapeKeys(shapeKeyStartLine, numShapes);
meshSubData = vector<string>(meshData.begin() + shapeKeyStartLine, meshData.begin() + (shapeKeyStartLine + numShapes * (1 + numVertices)));
readShapeKeys(vertices, vertIds, meshSubData, shapeKeys, numShapes, numVertices);
meshSubData.clear();
AnimationController *controller = new AnimationController();
Node *node = new Node(Vector3::VEC_ZERO, Quaternion::QUAT_W, Vector3::VEC_IJK, name, controller);
nodes.push_back(node);
int numAnimLineId = vertexStartLine + numVertices + numFaces * numVertsPerFace + numShapes + 1;
int numAnimLineId = shapeKeyStartLine + numShapes * (1 + numVertices);
int numAnimations = atoi(meshData[numAnimLineId].substr(meshData[numAnimLineId].find_first_of(':') + 1).c_str());
meshSubData = vector<string>(meshData.begin() + (numAnimLineId + 1), meshData.end());
readAnimations(controller, meshSubData, numAnimations);
@@ -424,7 +453,7 @@ namespace vb01{
if(sk->getName() == skeletonName)
skeleton = sk;
Mesh *mesh = new Mesh(vertices, indices, numFaces, groups, numBones, nullptr, numShapes, name);
Mesh *mesh = new Mesh(vertices, indices, numFaces, groups, numBones, shapeKeys, numShapes, name);
mesh->setSkeleton(skeleton);
node->attachMesh(mesh);
vbModelReader.h
+2 -2
View File
@@ -28,9 +28,9 @@ namespace vb01{
void readAnimations(AnimationController*, std::vector<std::string>&, int);
Skeleton* readSkeleton(std::vector<std::string>&);
void readVertices(std::vector<Vector3>&, std::vector<Vector3>&, std::vector<float>&, std::vector<std::string>&, int);
void readFaces(std::vector<Vector3>&, std::vector<Vector3>&, std::vector<float>&, std::vector<std::string>&, int, Mesh::Vertex*, u32*);
void readFaces(std::vector<Vector3>&, std::vector<Vector3>&, std::vector<u32>&, std::vector<float>&, std::vector<std::string>&, int, Mesh::Vertex*, u32*);
void readVertexGroups(std::string*, std::vector<std::string>&, int);
void readShapeKeys(int, int);
void readShapeKeys(Mesh::Vertex*, std::vector<u32>&, std::vector<std::string>&, std::string*, int, int);
void buildMesh(std::vector<std::string>&);
Mesh* readMeshes(std::vector<std::string>&);
void readLights(std::vector<std::string>&);