Skip to content

YSCE Day/Night cycle #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Skipper-is wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

YSCE Day/Night cycle #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84c9fe3
Working prototype of day/night cycle.
Skipper-is Sep 2, 2023
1b3c8c9
Fixed lightvec type
Skipper-is Sep 3, 2023
fe44da9
Additional functionality:
Skipper-is Sep 3, 2023
ad74903
* Network functionality working
Skipper-is Sep 5, 2023
a252327
* Remade cloud movements
Skipper-is Sep 8, 2023
0b58b60
Fixing some linux bugs
Skipper-is Sep 8, 2023
cee3097
Including algorithm for perlin
Skipper-is Sep 9, 2023
42ca154
progress on moon etc, currently not functioning!
Skipper-is Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/action.yml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions runtime/language/en.uitxt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ $BGCOL 0
+configdlg/opengl #OpenGL
+common/setdefault #Set Default
+configdlg/environment #Environment
+configdlg/daylength #Day length (mins)
+configdlg/light #Light Direction
+configdlg/aircraft #Aircraft
+configdlg/blackout #Black Out
Expand Down
1 change: 1 addition & 0 deletions runtime/language/ja.uitxt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ $BGCOL 0
+configdlg/opengl #OpenGL
+common/setdefault #デフォルトに戻す
+configdlg/environment #環境
+configdlg/daylength #日の長さ（分）
+configdlg/light #光源方向
+configdlg/aircraft #航空機
+configdlg/blackout #ブラックアウト
Expand Down
132 changes: 132 additions & 0 deletions runtime/misc/moon.srf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
Surf
VER 4.700 10.000 -0.100 R
VER 3.700 9.800 -0.100 R
VER 2.800 9.800 -0.100 R
VER 2.900 9.200 -0.100 R
VER 1.000 9.200 -0.100 R
VER 2.100 8.300 -0.100 R
VER -0.600 8.300 -0.100 R
VER 1.300 7.100 -0.100 R
VER -2.100 7.100 -0.100 R
VER 0.800 5.600 -0.100 R
VER -3.300 5.600 -0.100 R
VER 0.300 3.800 -0.100 R
VER -4.200 3.800 -0.100 R
VER 0.100 2.000 -0.100 R
VER -4.700 2.000 -0.100 R
VER -0.000 0.000 -0.100 R
VER -4.900 0.000 -0.100 R
VER 0.100 -2.000 -0.100 R
VER -4.700 -2.000 -0.100 R
VER 0.300 -3.800 -0.100 R
VER -4.200 -3.800 -0.100 R
VER 0.800 -5.600 -0.100 R
VER -3.300 -5.600 -0.100 R
VER 1.300 -7.100 -0.100 R
VER -2.100 -7.100 -0.100 R
VER 2.100 -8.300 -0.100 R
VER -0.600 -8.300 -0.100 R
VER 2.900 -9.200 -0.100 R
VER 1.000 -9.200 -0.100 R
VER 3.700 -9.800 -0.100 R
VER 2.800 -9.800 -0.100 R
VER 4.700 -10.000 -0.100 R
FAC
BRI
COL 255 255 255
NOR 3.733 9.867 -0.100 -0.000 0.000 1.000
VER 0 2 1
END
FAC
BRI
COL 255 255 255
NOR 2.600 9.500 -0.100 -0.000 0.000 1.000
VER 1 2 4 3
END
FAC
BRI
COL 255 255 255
NOR 1.350 8.750 -0.100 -0.000 0.000 1.000
VER 3 4 6 5
END
FAC
BRI
COL 255 255 255
NOR 0.175 7.700 -0.100 -0.000 0.000 1.000
VER 5 6 8 7
END
FAC
BRI
COL 255 255 255
NOR -0.825 6.350 -0.100 -0.000 0.000 1.000
VER 7 8 10 9
END
FAC
BRI
COL 255 255 255
NOR -1.600 4.700 -0.100 -0.000 0.000 1.000
VER 9 10 12 11
END
FAC
BRI
COL 255 255 255
NOR -2.125 2.900 -0.100 -0.000 0.000 1.000
VER 11 12 14 13
END
FAC
BRI
COL 255 255 255
NOR -2.375 1.000 -0.100 -0.000 0.000 1.000
VER 13 14 16 15
END
FAC
BRI
COL 255 255 255
NOR -2.375 -1.000 -0.100 -0.000 0.000 1.000
VER 15 16 18 17
END
FAC
BRI
COL 255 255 255
NOR -2.125 -2.900 -0.100 -0.000 0.000 1.000
VER 17 18 20 19
END
FAC
BRI
COL 255 255 255
NOR -1.600 -4.700 -0.100 -0.000 0.000 1.000
VER 19 20 22 21
END
FAC
BRI
COL 255 255 255
NOR -0.825 -6.350 -0.100 -0.000 0.000 1.000
VER 21 22 24 23
END
FAC
BRI
COL 255 255 255
NOR 0.175 -7.700 -0.100 -0.000 0.000 1.000
VER 23 24 26 25
END
FAC
BRI
COL 255 255 255
NOR 1.350 -8.750 -0.100 -0.000 0.000 1.000
VER 25 26 28 27
END
FAC
BRI
COL 255 255 255
NOR 2.600 -9.500 -0.100 -0.000 0.000 1.000
VER 27 28 30 29
END
FAC
BRI
COL 255 255 255
NOR 3.733 -9.867 -0.100 -0.000 0.000 1.000
VER 29 30 31
END
END


117 changes: 117 additions & 0 deletions runtime/misc/sun.srf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
Surf
VER 0.000 0.000 0.000 R
VER 10.000 0.000 0.000 R
VER 9.200 -3.800 0.000 R
VER 7.100 -7.100 0.000 R
VER 3.800 -9.200 0.000 R
VER 0.000 -10.000 0.000 R
VER -3.800 -9.200 -0.000 R
VER -7.100 -7.100 -0.000 R
VER -9.200 -3.800 -0.000 R
VER -10.000 0.000 -0.000 R
VER -9.200 3.800 -0.000 R
VER -7.100 7.100 -0.000 R
VER -3.800 9.200 -0.000 R
VER 0.000 10.000 0.000 R
VER 3.800 9.200 0.000 R
VER 7.100 7.100 0.000 R
VER 9.200 3.800 0.000 R
FAC
BRI
COL 255 255 255
NOR 6.400 -1.267 0.000 -0.000 0.000 1.000
VER 0 2 1
END
FAC
BRI
COL 255 255 255
NOR 5.433 -3.633 0.000 -0.000 0.000 1.000
VER 0 3 2
END
FAC
BRI
COL 255 255 255
NOR 3.633 -5.433 0.000 -0.000 0.000 1.000
VER 0 4 3
END
FAC
BRI
COL 255 255 255
NOR 1.267 -6.400 0.000 -0.000 0.000 1.000
VER 0 5 4
END
FAC
BRI
COL 255 255 255
NOR -1.267 -6.400 -0.000 -0.000 0.000 1.000
VER 0 6 5
END
FAC
BRI
COL 255 255 255
NOR -3.633 -5.433 -0.000 -0.000 0.000 1.000
VER 0 7 6
END
FAC
BRI
COL 255 255 255
NOR -5.433 -3.633 -0.000 -0.000 0.000 1.000
VER 0 8 7
END
FAC
BRI
COL 255 255 255
NOR -6.400 -1.267 -0.000 -0.000 0.000 1.000
VER 0 9 8
END
FAC
BRI
COL 255 255 255
NOR -6.400 1.267 -0.000 -0.000 0.000 1.000
VER 0 10 9
END
FAC
BRI
COL 255 255 255
NOR -5.433 3.633 -0.000 -0.000 0.000 1.000
VER 0 11 10
END
FAC
BRI
COL 255 255 255
NOR -3.633 5.433 -0.000 -0.000 0.000 1.000
VER 0 12 11
END
FAC
BRI
COL 255 255 255
NOR -1.267 6.400 -0.000 -0.000 0.000 1.000
VER 0 13 12
END
FAC
BRI
COL 255 255 255
NOR 1.267 6.400 0.000 -0.000 0.000 1.000
VER 0 14 13
END
FAC
BRI
COL 255 255 255
NOR 3.633 5.433 0.000 -0.000 0.000 1.000
VER 0 15 14
END
FAC
BRI
COL 255 255 255
NOR 5.433 3.633 0.000 -0.000 0.000 1.000
VER 0 16 15
END
FAC
BRI
COL 255 255 255
NOR 6.400 1.267 0.000 -0.000 0.000 1.000
VER 0 1 16
END
END


1 change: 1 addition & 0 deletions src/common/fstextresource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ inline const wchar_t *FsGetTextResource(const char *key,const wchar_t *alternati
#define FSGUI_CFGDLG_SETDEFAULT FsGetTextResource("common/setdefault",L"Set Default")
#define FSGUI_CFGDLG_ENVIRONMENT FsGetTextResource("configdlg/environment",L"Environment")
#define FSGUI_CFGDLG_LIGHT FsGetTextResource("configdlg/light",L"Light Direction")
#define FSGUI_CFGDLG_DAYLENGTH FsGetTextResource("configdlg/daylength",L"Day Length (min)")
#define FSGUI_CFGDLG_AIRCRAFT FsGetTextResource("configdlg/aircraft",L"Aircraft")
#define FSGUI_CFGDLG_FIELD FsGetTextResource("common/field",L"Field")
#define FSGUI_CFGDLG_STP FsGetTextResource("common/startpos",L"Start Position")
Expand Down
26 changes: 23 additions & 3 deletions src/config/fsconfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ void FsFlightConfig::SetDefault(void)

aircraftReliability=95;
aircraftTroubleFrequency=0.1;

dayLength=120;
dayTime=0.0;
}

void FsFlightConfig::SetDetailedMode(void)
Expand Down Expand Up @@ -230,8 +233,13 @@ const char *const FsFlightConfig::keyWordSource[]=
"CONSTWIND", // 2023/07/29

"CLOUDLAYER", // 2023/07/29

"CENTERCAM", // 2023/08/15

"DAYLENG", // 2023/09/03

"DAYTIME", // 2023/09/03

NULL
};
YsKeyWordList FsFlightConfig::keyWordList;
Expand Down Expand Up @@ -553,8 +561,15 @@ YSRESULT FsFlightConfig::SendCommand(const char cmd[])
}
case 64: // CENTERCAM
return FsGetBool(centerCameraPerspective, av[1]);

}

case 65: // "DAYLENG", // 2023/09/03
dayLength=atoi(av[1]);
return YSOK;

case 66: // "DAYTIME", // 2023/09/03
dayTime = atof(av[1]);
return YSOK;
}
}
else
{
Expand All @@ -577,7 +592,7 @@ YSRESULT FsFlightConfig::Load(const wchar_t fn[])
{
if(SendCommand(buf)!=YSOK)
{
// fsStderr.Printf("Unrecognizable Line : %s\n",buf);
//printf("Unrecognizable Line : %s\n",buf);
res=YSERR;
}
}
Expand Down Expand Up @@ -733,6 +748,11 @@ YSRESULT FsFlightConfig::Save(const wchar_t fn[])
cloudLayer[i].y0,
cloudLayer[i].y1);
}

fprintf(fp,"DAYLENG %d\n",dayLength);

fprintf(fp,"DAYTIME %lf\n",dayTime);

fclose(fp);
return YSOK;
}
Expand Down
3 changes: 3 additions & 0 deletions src/config/fsconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,11 @@ class FsFlightConfig
double radarAltitudeLimit;
YSBOOL noExtAirView;

int dayLength;
double dayTime;
YsVec3 lightSourceDirection;


YSBOOL accurateTime;

void SetDefault(void);
Expand Down
Loading