From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 21 May 2004 00:40:53 +0000 (+0000)
Subject: Tomaz implemented r_skyscroll1/2 cvars to control sky scrolling speeds
X-Git-Tag: xonotic-v0.1.0preview~5841
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=5d003446b8d912368c986a57efc9535673978493

Tomaz implemented r_skyscroll1/2 cvars to control sky scrolling speeds


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4211 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/r_sky.c b/r_sky.c
index 505db1a5..c8fde676 100644
--- a/r_sky.c
+++ b/r_sky.c
@@ -4,6 +4,8 @@
 
 // FIXME: fix skybox after vid_restart
 cvar_t r_sky = {CVAR_SAVE, "r_sky", "1"};
+cvar_t r_skyscroll1 = {CVAR_SAVE, "r_skyscroll1", "1"};
+cvar_t r_skyscroll2 = {CVAR_SAVE, "r_skyscroll2", "2"};
 qboolean skyavailable_quake;
 qboolean skyavailable_box;
 int skyrendernow;
@@ -378,8 +380,8 @@ static void R_SkySphere(void)
 	speedscale -= (int)speedscale;
 
 	// scroll the lower cloud layer twice as fast (just like quake did)
-	Matrix4x4_CreateTranslate(&scroll1matrix, speedscale, speedscale, 0);
-	Matrix4x4_CreateTranslate(&scroll2matrix, speedscale * 2, speedscale * 2, 0);
+	Matrix4x4_CreateTranslate(&scroll1matrix, speedscale * r_skyscroll1.value, speedscale * r_skyscroll1.value, 0);
+	Matrix4x4_CreateTranslate(&scroll2matrix, speedscale * r_skyscroll2.value, speedscale * r_skyscroll2.value, 0);
 
 	GL_Color(1, 1, 1, 1);
 	GL_BlendFunc(GL_ONE, GL_ZERO);
@@ -558,6 +560,8 @@ void R_Sky_Init(void)
 {
 	Cmd_AddCommand ("loadsky", &LoadSky_f);
 	Cvar_RegisterVariable (&r_sky);
+	Cvar_RegisterVariable (&r_skyscroll1);
+	Cvar_RegisterVariable (&r_skyscroll2);
 	R_ResetSkyBox();
 	R_ResetQuakeSky();
 	R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
diff --git a/render.h b/render.h
index 88299139..d1194f35 100644
--- a/render.h
+++ b/render.h
@@ -37,6 +37,8 @@ extern float fog_density, fog_red, fog_green, fog_blue;
 
 // sky stuff
 extern cvar_t r_sky;
+extern cvar_t r_skyscroll1;
+extern cvar_t r_skyscroll2;
 extern int skyrendernow, skyrendermasked;
 extern int R_SetSkyBox(const char *sky);
 extern void R_SkyStartFrame(void);