Increase FOV limit to 179

This commit is contained in:
UnknownShadow200 2018-12-16 15:49:48 +11:00
parent ddca15d007
commit af01956c31
6 changed files with 19 additions and 6 deletions

View File

@ -19,7 +19,7 @@ namespace ClassicalSharp.Gui.Screens {
defaultValues[1] = "10"; defaultValues[1] = "10";
validators[3] = new RealValidator(0.1f, 2048f); validators[3] = new RealValidator(0.1f, 2048f);
defaultValues[3] = (1.233f).ToString(); defaultValues[3] = (1.233f).ToString();
validators[9] = new IntegerValidator(1, 150); validators[9] = new IntegerValidator(1, 179);
defaultValues[9] = "70"; defaultValues[9] = "70";
MakeDescriptions(); MakeDescriptions();

View File

@ -186,7 +186,7 @@ namespace ClassicalSharp {
UserViewDistance = ViewDistance; UserViewDistance = ViewDistance;
SmoothLighting = Options.GetBool(OptionsKey.SmoothLighting, false); SmoothLighting = Options.GetBool(OptionsKey.SmoothLighting, false);
DefaultFov = Options.GetInt(OptionsKey.FieldOfView, 1, 150, 70); DefaultFov = Options.GetInt(OptionsKey.FieldOfView, 1, 179, 70);
Fov = DefaultFov; Fov = DefaultFov;
ZoomFov = DefaultFov; ZoomFov = DefaultFov;
BreakableLiquids = !ClassicMode && Options.GetBool(OptionsKey.ModifiableLiquids, false); BreakableLiquids = !ClassicMode && Options.GetBool(OptionsKey.ModifiableLiquids, false);

View File

@ -113,7 +113,7 @@ namespace ClassicalSharp {
} }
public void UpdateProjection() { public void UpdateProjection() {
DefaultFov = Options.GetInt(OptionsKey.FieldOfView, 1, 150, 70); DefaultFov = Options.GetInt(OptionsKey.FieldOfView, 1, 179, 70);
Camera.GetProjection(out Graphics.Projection); Camera.GetProjection(out Graphics.Projection);
Graphics.SetMatrixMode(MatrixType.Projection); Graphics.SetMatrixMode(MatrixType.Projection);

View File

@ -168,7 +168,7 @@ void Game_UserSetViewDistance(int distance) {
} }
void Game_UpdateProjection(void) { void Game_UpdateProjection(void) {
Game_DefaultFov = Options_GetInt(OPT_FIELD_OF_VIEW, 1, 150, 70); Game_DefaultFov = Options_GetInt(OPT_FIELD_OF_VIEW, 1, 179, 70);
Camera_Active->GetProjection(&Gfx_Projection); Camera_Active->GetProjection(&Gfx_Projection);
Gfx_LoadMatrix(MATRIX_PROJECTION, &Gfx_Projection); Gfx_LoadMatrix(MATRIX_PROJECTION, &Gfx_Projection);
@ -355,7 +355,7 @@ static void Game_LoadOptions(void) {
Game_ViewDistance = Options_GetInt(OPT_VIEW_DISTANCE, 16, 4096, 512); Game_ViewDistance = Options_GetInt(OPT_VIEW_DISTANCE, 16, 4096, 512);
Game_UserViewDistance = Game_ViewDistance; Game_UserViewDistance = Game_ViewDistance;
Game_DefaultFov = Options_GetInt(OPT_FIELD_OF_VIEW, 1, 150, 70); Game_DefaultFov = Options_GetInt(OPT_FIELD_OF_VIEW, 1, 179, 70);
Game_Fov = Game_DefaultFov; Game_Fov = Game_DefaultFov;
Game_ZoomFov = Game_DefaultFov; Game_ZoomFov = Game_DefaultFov;
Game_BreakableLiquids = !Game_ClassicMode && Options_GetBool(OPT_MODIFIABLE_LIQUIDS, false); Game_BreakableLiquids = !Game_ClassicMode && Options_GetBool(OPT_MODIFIABLE_LIQUIDS, false);

View File

@ -2721,7 +2721,7 @@ struct Screen* HacksSettingsScreen_MakeInstance(void) {
validators[3] = MenuInputValidator_Float(0.10f, 2048.00f); validators[3] = MenuInputValidator_Float(0.10f, 2048.00f);
/* TODO: User may not always use . for decimal point, need to account for that */ /* TODO: User may not always use . for decimal point, need to account for that */
defaultValues[3] = "1.233"; defaultValues[3] = "1.233";
validators[9] = MenuInputValidator_Int(1, 150); validators[9] = MenuInputValidator_Int(1, 179);
defaultValues[9] = "70"; defaultValues[9] = "70";
struct Screen* s = MenuOptionsScreen_MakeInstance(widgets, Array_Elems(widgets), buttons, struct Screen* s = MenuOptionsScreen_MakeInstance(widgets, Array_Elems(widgets), buttons,

View File

@ -186,6 +186,19 @@ struct ResourceMusic Resources_Music[7] = {
*-----------------------------------------------------------Fetcher-------------------------------------------------------* *-----------------------------------------------------------Fetcher-------------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
struct FetchResourcesData FetchResourcesTask; struct FetchResourcesData FetchResourcesTask;
static void Fetcher_DownloadAll(void) {
String id; char idBuffer[STRING_SIZE];
String url; char urlBuffer[STRING_SIZE];
int i;
String_InitArray(id, idBuffer);
String_InitArray(url, urlBuffer);
}
static void Fetcher_Next(void) {
}
/* TODO: Implement this.. */ /* TODO: Implement this.. */
void FetchResourcesTask_Run(FetchResourcesStatus setStatus) { void FetchResourcesTask_Run(FetchResourcesStatus setStatus) {
} }