AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 01:55:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

add a firstPersonArm flag for each CustomModelPart, remove hideFirstPersonArm (#681)

Browse Source
This commit is contained in:
SpiralP 2020-06-18 20:50:26 -07:00 committed by GitHub
parent e0fe8f702b
commit e95f7767d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Model.c
View File

@ -642,14 +642,13 @@ static void CustomModel_GetPickingBounds(struct Entity* e) {
static void CustomModel_DrawArm(struct Entity* e) { static void CustomModel_DrawArm(struct Entity* e) {
int i; int i;
struct CustomModel* cm = (struct CustomModel*)Models.Active; struct CustomModel* cm = (struct CustomModel*)Models.Active;
if (cm->hideFirstPersonArm) return;
Models.uScale = 1.0f / cm->uScale; Models.uScale = 1.0f / cm->uScale;
Models.vScale = 1.0f / cm->vScale; Models.vScale = 1.0f / cm->vScale;
for (i = 0; i < cm->numParts; i++) { for (i = 0; i < cm->numParts; i++) {
struct CustomModelPart* part = &cm->parts[i]; struct CustomModelPart* part = &cm->parts[i];
if (part->anim == CustomModelAnim_RightArm) { if (part->firstPersonArm) {
Model_DrawArmPart(&part->modelPart); Model_DrawArmPart(&part->modelPart);
} }
} }

2
src/Model.h
View File

@ -249,6 +249,7 @@ struct CustomModelPart {
cc_uint8 anim; cc_uint8 anim;
cc_bool fullbright; cc_bool fullbright;
cc_bool firstPersonArm;
}; };
struct CustomModel { struct CustomModel {
@ -256,7 +257,6 @@ struct CustomModel {
struct ModelVertex* vertices; struct ModelVertex* vertices;
char name[STRING_SIZE + 1]; char name[STRING_SIZE + 1];
cc_bool hideFirstPersonArm;
float nameY; float nameY;
float eyeY; float eyeY;

2
src/Protocol.c
View File

@ -1425,7 +1425,6 @@ static void CPE_DefineModel(cc_uint8* data) {
customModel->model.pushes = (flags >> 1) & 1; customModel->model.pushes = (flags >> 1) & 1;
customModel->model.usesHumanSkin = (flags >> 2) & 1; customModel->model.usesHumanSkin = (flags >> 2) & 1;
customModel->model.calcHumanAnims = (flags >> 3) & 1; customModel->model.calcHumanAnims = (flags >> 3) & 1;
customModel->hideFirstPersonArm = (flags >> 4) & 1;
/* read nameY, eyeY */ /* read nameY, eyeY */
customModel->nameY = ReadFloat(data); customModel->nameY = ReadFloat(data);
@ -1561,6 +1560,7 @@ static void CPE_DefineModelPart(cc_uint8* data) {
/* read bool flags */ /* read bool flags */
flags = *data++; flags = *data++;
part->fullbright = (flags >> 0) & 1; part->fullbright = (flags >> 0) & 1;
part->firstPersonArm = (flags >> 1) & 1;
if (customModel->curPartIndex == customModel->numParts) { if (customModel->curPartIndex == customModel->numParts) {
/* we're the last part, so register our model */ /* we're the last part, so register our model */