From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 12 Sep 2008 07:24:19 +0000 (+0000)
Subject: new tcmod: "tcmod page <width> <height> <time>", as poor man's animmap alternative... 
X-Git-Tag: xonotic-v0.1.0preview~2083
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d485fbbf724b1f440101dafe4deb9edd6b534f48;p=xonotic%2Fdarkplaces.git

new tcmod: "tcmod page <width> <height> <time>", as poor man's animmap alternative (stores all frames in ONE image in a <width>x<height> grid, and switches to the next frame every <time> seconds)


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

diff --git a/darkplaces.txt b/darkplaces.txt
index c20f3b28..91c3d626 100644
--- a/darkplaces.txt
+++ b/darkplaces.txt
@@ -1340,3 +1340,13 @@ Shader parameters for DP's own features:
   - set this to a small value like 0.1 to emphasize the reflection and make
   the water transparent; but if r_water is 0, alpha isn't used, so the water can
   be very visible then too.
+- tcmod page <width> <height> <delay>
+  The texture is shifted by 1/<width> every <delay> seconds, and by 1/<height>
+  every <delay>*<width> seconds. It is some sort of animmap replacement that keeps
+  all animation frames in a single texture.
+  To use it, make a texture with the frames aligned in a grid like this:
+    1   2   3   4
+    5   6   7   8
+  then align it in Radiant so only one of the animation frames can be seen on
+  the surface, and specify "tcmod page 4 2 0.1". DP will then display the frames
+  in order and the cycle will repeat every 0.8 seconds.
diff --git a/gl_rmain.c b/gl_rmain.c
index b7f72257..912b1f28 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -4480,6 +4480,7 @@ static float R_EvaluateQ3WaveFunc(q3wavefunc_t func, const float *parms)
 
 void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t)
 {
+	int w, h, idx;
 	int i;
 	dp_model_t *model = ent->model;
 	float f;
@@ -4608,6 +4609,14 @@ void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t)
 		case Q3TCMOD_SCROLL:
 			Matrix4x4_CreateTranslate(&matrix, tcmod->parms[0] * r_refdef.scene.time, tcmod->parms[1] * r_refdef.scene.time, 0);
 			break;
+		case Q3TCMOD_PAGE: // poor man's animmap (to store animations into a single file, useful for HTTP downloaded textures)
+			w = tcmod->parms[0];
+			h = tcmod->parms[1];
+			f = r_refdef.scene.time / (tcmod->parms[2] * w * h);
+			f = f - floor(f);
+			idx = floor(f * w * h);
+			Matrix4x4_CreateTranslate(&matrix, (idx % w) / tcmod->parms[0], (idx / w) / tcmod->parms[1], 0);
+			break;
 		case Q3TCMOD_STRETCH:
 			f = 1.0f / R_EvaluateQ3WaveFunc(tcmod->wavefunc, tcmod->waveparms);
 			Matrix4x4_CreateFromQuakeEntity(&matrix, 0.5f * (1 - f), 0.5 * (1 - f), 0, 0, 0, 0, f);
diff --git a/model_shared.c b/model_shared.c
index 7de60096..ce2abdb8 100644
--- a/model_shared.c
+++ b/model_shared.c
@@ -1447,6 +1447,7 @@ void Mod_LoadQ3Shaders(void)
 								else if (!strcasecmp(parameter[1], "rotate"))          layer->tcmods[tcmodindex].tcmod = Q3TCMOD_ROTATE;
 								else if (!strcasecmp(parameter[1], "scale"))           layer->tcmods[tcmodindex].tcmod = Q3TCMOD_SCALE;
 								else if (!strcasecmp(parameter[1], "scroll"))          layer->tcmods[tcmodindex].tcmod = Q3TCMOD_SCROLL;
+								else if (!strcasecmp(parameter[1], "page"))            layer->tcmods[tcmodindex].tcmod = Q3TCMOD_PAGE;
 								else if (!strcasecmp(parameter[1], "stretch"))
 								{
 									layer->tcmods[tcmodindex].tcmod = Q3TCMOD_STRETCH;
diff --git a/model_shared.h b/model_shared.h
index 9fcfff25..c417733b 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -287,6 +287,7 @@ typedef enum q3tcmod_e
 	Q3TCMOD_STRETCH,
 	Q3TCMOD_TRANSFORM,
 	Q3TCMOD_TURBULENT,
+	Q3TCMOD_PAGE,
 	Q3TCMOD_COUNT
 }
 q3tcmod_t;