UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/raysan5/raylib

Browse source
This commit is contained in:
Ray 2021-04-19 19:41:41 +02:00
commit 63a1bf373c
2 changed files with 42 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/text/resources/shaders/glsl330/sdf.fs
View file

@ -12,14 +12,14 @@ uniform vec4 colDiffuse;
out vec4 finalColor; out vec4 finalColor;
// NOTE: Add here your custom variables // NOTE: Add here your custom variables
const float smoothing = 1.0/16.0;
void main() void main()
{ {
// Texel color fetching from texture sampler // Texel color fetching from texture sampler
// NOTE: Calculate alpha using signed distance field (SDF) // NOTE: Calculate alpha using signed distance field (SDF)
float distance = texture(texture0, fragTexCoord).a; float distanceFromOutline = texture(texture0, fragTexCoord).a - 0.5;
float alpha = smoothstep(0.5 - smoothing, 0.5 + smoothing, distance); float distanceChangePerFragment = length(vec2(dFdx(distanceFromOutline), dFdy(distanceFromOutline)));
float alpha = smoothstep(-distanceChangePerFragment, distanceChangePerFragment, distanceFromOutline);
// Calculate final fragment color // Calculate final fragment color
finalColor = vec4(fragColor.rgb, fragColor.a*alpha); finalColor = vec4(fragColor.rgb, fragColor.a*alpha);

66
src/models.c
View file

@ -1425,41 +1425,53 @@ void UpdateModelAnimation(Model model, ModelAnimation anim, int frame)
int vCounter = 0; int vCounter = 0;
int boneCounter = 0; int boneCounter = 0;
int boneId = 0; int boneId = 0;
float boneWeight = 0.0;
for (int i = 0; i < model.meshes[m].vertexCount; i++) for (int i = 0; i < model.meshes[m].vertexCount; i++)
{ {
boneId = model.meshes[m].boneIds[boneCounter]; model.meshes[m].animVertices[vCounter] = 0;
inTranslation = model.bindPose[boneId].translation; model.meshes[m].animVertices[vCounter + 1] = 0;
inRotation = model.bindPose[boneId].rotation; model.meshes[m].animVertices[vCounter + 2] = 0;
//inScale = model.bindPose[boneId].scale;
outTranslation = anim.framePoses[frame][boneId].translation;
outRotation = anim.framePoses[frame][boneId].rotation;
outScale = anim.framePoses[frame][boneId].scale;
// Vertices processing model.meshes[m].animNormals[vCounter] = 0;
// NOTE: We use meshes.vertices (default vertex position) to calculate meshes.animVertices (animated vertex position) model.meshes[m].animNormals[vCounter + 1] = 0;
animVertex = (Vector3){ model.meshes[m].vertices[vCounter], model.meshes[m].vertices[vCounter + 1], model.meshes[m].vertices[vCounter + 2] }; model.meshes[m].animNormals[vCounter + 2] = 0;
animVertex = Vector3Multiply(animVertex, outScale);
animVertex = Vector3Subtract(animVertex, inTranslation);
animVertex = Vector3RotateByQuaternion(animVertex, QuaternionMultiply(outRotation, QuaternionInvert(inRotation)));
animVertex = Vector3Add(animVertex, outTranslation);
model.meshes[m].animVertices[vCounter] = animVertex.x;
model.meshes[m].animVertices[vCounter + 1] = animVertex.y;
model.meshes[m].animVertices[vCounter + 2] = animVertex.z;
// Normals processing for (int j = 0; j < 4; j++)
// NOTE: We use meshes.baseNormals (default normal) to calculate meshes.normals (animated normals)
if (model.meshes[m].normals != NULL)
{ {
animNormal = (Vector3){ model.meshes[m].normals[vCounter], model.meshes[m].normals[vCounter + 1], model.meshes[m].normals[vCounter + 2] }; boneId = model.meshes[m].boneIds[boneCounter];
animNormal = Vector3RotateByQuaternion(animNormal, QuaternionMultiply(outRotation, QuaternionInvert(inRotation))); boneWeight = model.meshes[m].boneWeights[boneCounter];
model.meshes[m].animNormals[vCounter] = animNormal.x; inTranslation = model.bindPose[boneId].translation;
model.meshes[m].animNormals[vCounter + 1] = animNormal.y; inRotation = model.bindPose[boneId].rotation;
model.meshes[m].animNormals[vCounter + 2] = animNormal.z; //inScale = model.bindPose[boneId].scale;
} outTranslation = anim.framePoses[frame][boneId].translation;
outRotation = anim.framePoses[frame][boneId].rotation;
outScale = anim.framePoses[frame][boneId].scale;
// Vertices processing
// NOTE: We use meshes.vertices (default vertex position) to calculate meshes.animVertices (animated vertex position)
animVertex = (Vector3){ model.meshes[m].vertices[vCounter], model.meshes[m].vertices[vCounter + 1], model.meshes[m].vertices[vCounter + 2] };
animVertex = Vector3Multiply(animVertex, outScale);
animVertex = Vector3Subtract(animVertex, inTranslation);
animVertex = Vector3RotateByQuaternion(animVertex, QuaternionMultiply(outRotation, QuaternionInvert(inRotation)));
animVertex = Vector3Add(animVertex, outTranslation);
model.meshes[m].animVertices[vCounter] += animVertex.x * boneWeight;
model.meshes[m].animVertices[vCounter + 1] += animVertex.y * boneWeight;
model.meshes[m].animVertices[vCounter + 2] += animVertex.z * boneWeight;
// Normals processing
// NOTE: We use meshes.baseNormals (default normal) to calculate meshes.normals (animated normals)
if (model.meshes[m].normals != NULL)
{
animNormal = (Vector3){ model.meshes[m].normals[vCounter], model.meshes[m].normals[vCounter + 1], model.meshes[m].normals[vCounter + 2] };
animNormal = Vector3RotateByQuaternion(animNormal, QuaternionMultiply(outRotation, QuaternionInvert(inRotation)));
model.meshes[m].animNormals[vCounter] += animNormal.x * boneWeight;
model.meshes[m].animNormals[vCounter + 1] += animNormal.y * boneWeight;
model.meshes[m].animNormals[vCounter + 2] += animNormal.z * boneWeight;
}
boneCounter += 1;
}
vCounter += 3; vCounter += 3;
boneCounter += 4;
} }
// Upload new vertex data to GPU for model drawing // Upload new vertex data to GPU for model drawing