Merge branch 'master' into master

This commit is contained in:
Fire_Head 2019-06-12 20:18:24 +03:00 committed by GitHub
commit cb5ec27747
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 245 additions and 3 deletions

View file

@ -53,8 +53,7 @@
#else
#define DEFAULT_ASPECTRATIO (4.0f/3.0f)
#endif
WRAPPER void CameraSize(RwCamera *camera, void *rect, float viewWindow, float aspectRatio) { EAXJMP(0x527170); }
uint8 work_buff[55000];
@ -679,7 +678,9 @@ AppEventHandler(RsEvent event, void *param)
case rsCAMERASIZE:
{
CameraSize(Scene.camera, param, DEFAULT_VIEWWINDOW, DEFAULT_ASPECTRATIO);
CameraSize(Scene.camera, (RwRect *)param,
DEFAULT_VIEWWINDOW, DEFAULT_ASPECTRATIO);
return rsEVENTPROCESSED;
}