Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: DROID_PERSON model display size #3519

Merged
merged 1 commit into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/component.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ static bool displayCompObj(DROID *psDroid, bool bButton, const glm::mat4& modelM
iIMDShape *strImd = psShapeBody;
if (psDroid->droidType == DROID_PERSON)
{
modifiedModelMatrix *= glm::scale(glm::vec3(.75f)); // FIXME - hideous....!!!!
// previously, used to scale the model by 0.75 - no longer needed with the fixed models though...
}
if (strImd->objanimpie[psDroid->animationEvent])
{
Expand Down
2 changes: 1 addition & 1 deletion src/effects.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ static void renderDroidDeathAnimationEffect(const EFFECT *psEffect, const glm::m
// If original (psDroid->droidType == DROID_PERSON)
if (psEffect->type == DROID_ANIMEVENT_DYING_NORMAL_ST)
{
modelMatrix *= glm::scale(glm::vec3(.75f)); // FIXME - hideous....!!!!
// previously, used to scale the model by 0.75 - no longer needed with the fixed models though...
}

PIELIGHT brightness = pal_SetBrightness(255); // NOTE: brightness is not preserved from the original droid that died - FIXME: ?
Expand Down
Loading