Allowing default versus overriden controller models #1206
Conversation
… AlwaysUseAlternateModel boolean to allow you to specify a default if the models aren't found/loaded or specify a model that should always be used.
Fixing build break for UWP builds.
| @@ -186,6 +186,7 @@ void Update() | |||
| { | |||
| if (Application.isEditor) | |||
| { | |||
| #if UNITY_EDITOR | |||
There was a problem hiding this comment.
Is this needed? The if (Application.isEditor) call above should prevent this from being called outside the Editor.
There was a problem hiding this comment.
No, because we're calling on the UnityEditor namespace on the line below.
| objectReference: {fileID: 0} | ||
| - target: {fileID: 114710303647202208, guid: d29bc40b7f3df26479d6a0aac211c355, | ||
| type: 2} | ||
| propertyPath: AlwaysUseAlternateModel |
There was a problem hiding this comment.
I think there might be some stale references in here, if you could re-save the scene and update it please, that'd be great!
There was a problem hiding this comment.
Hmm, yeah it doesn't look like Unity is removing the old stuff. Cleaning up now.
|
@keveleigh did you get a chance to look over this again? Thoughts? |
|
@StephenHodgson I'll be taking a look today! I definitely think this is a needed change, and I think it works well with the in-editor controller models. |
| #else | ||
| yield break; | ||
| yield break; |
There was a problem hiding this comment.
This should also have LoadAlternateControllerModel(source); right before the yield break;, that way the alternate models will load in the editor if needed. Right now, nothing will load in the editor.
|
Cool! I'm going to approve this as-is, then I'll merge it into master and update it with my new in-editor code. |
Fix for issue #1174 to allow for default models if the OS's models weren't loaded in addition to allowing for overriding the models.