Skip to content

Allow model rendering code to use polymodel_instance. #486

Merged
The-E merged 2 commits into
scp-fs2open:masterfrom
SamuelCho:model_instance_rendering
Dec 3, 2015
Merged

Allow model rendering code to use polymodel_instance. #486
The-E merged 2 commits into
scp-fs2open:masterfrom
SamuelCho:model_instance_rendering

Conversation

@SamuelCho

Copy link
Copy Markdown
Contributor

Removes the reliance on ship_model_start/stop for rendering models. Also fix a bunch of oversights involving blown off models in the polymodel_instance code.

…iance on ship_model_start/stop for rendering models. Also fix a bunch of oversights involving blown off models in the polymodel_instance code.
Comment thread code/model/modelread.cpp Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this line supposed to be removed?

@SamuelCho

Copy link
Copy Markdown
Contributor Author

Yes, that line was intentionally replaced. Blown_off needs to match the bsp_info's damage state.

@The-E

The-E commented Dec 2, 2015

Copy link
Copy Markdown
Member

Yeah, okay, but why set that variable twice, once to what I assume is a correct value and then to false immediately after that?

@The-E

The-E commented Dec 2, 2015

Copy link
Copy Markdown
Member

Point is, either line 4556 or line 4558 should be removed.

@MageKing17

Copy link
Copy Markdown
Member

I was inquiring whether or not you intended to remove the line, not asking why you did, because... you didn't.

@SamuelCho

Copy link
Copy Markdown
Contributor Author

The line below is supposed to be removed. I thought I saw - marks on that line because I'm dyslexic and shouldn't be a programmer.

@SamuelCho

Copy link
Copy Markdown
Contributor Author

It's fixed.

The-E added a commit that referenced this pull request Dec 3, 2015
Allow model rendering code to use polymodel_instance.
@The-E The-E merged commit aaa80df into scp-fs2open:master Dec 3, 2015
@Goober5000 Goober5000 mentioned this pull request Dec 13, 2015
@Goober5000 Goober5000 added this to the Release 3.7.4 milestone Feb 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants