test

git-svn-id: http://svn.net-core.org/repos/t-engine4@4010 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Game.lua

@@ -951,19 +951,18 @@ function _M:display(nb_keyframes)
 		map:displayEmotes(nb_keyframe or 1)
 
 		-- Minimap display
-		if self.mm_fbo then
-			self.mm_fbo:use(true)
-			self.minimap_scroll_x, self.minimap_scroll_y = util.bound(self.player.x - 25, 0, map.w - 50), util.bound(self.player.y - 25, 0, map.h - 50)
-			map:minimapDisplay(0, 0, self.minimap_scroll_x, self.minimap_scroll_y, 50, 50, 1)
-			self.mm_fbo:use(false, self.full_fbo)
-
-			self.minimap_bg:toScreen(0, 0, 200, 200)
-			self.mm_fbo:toScreen(0, 0, 200, 200, self.mm_fbo_shader.shad)
-		else
+--		if self.mm_fbo then
+--			self.mm_fbo:use(true)
+--			self.minimap_scroll_x, self.minimap_scroll_y = util.bound(self.player.x - 25, 0, map.w - 50), util.bound(self.player.y - 25, 0, map.h - 50)
+--			map:minimapDisplay(0, 0, self.minimap_scroll_x, self.minimap_scroll_y, 50, 50, 1)
+--			self.mm_fbo:use(false, self.full_fbo)
+--			self.minimap_bg:toScreen(0, 0, 200, 200)
+--			self.mm_fbo:toScreen(0, 0, 200, 200, self.mm_fbo_shader.shad)
+--		else
 			self.minimap_bg:toScreen(0, 0, 200, 200)
 			self.minimap_scroll_x, self.minimap_scroll_y = util.bound(self.player.x - 25, 0, map.w - 50), util.bound(self.player.y - 25, 0, map.h - 50)
 			map:minimapDisplay(0, 0, self.minimap_scroll_x, self.minimap_scroll_y, 50, 50, 1)
-		end
+--		end
 
 		-- Mouse gestures
 		self.gestures:update()
@@ -1013,7 +1012,10 @@ function _M:display(nb_keyframes)
 		self:targetDisplayTooltip(self.w, self.h)
 	end
 
-	if self.full_fbo then self.full_fbo:use(false) self.full_fbo:toScreen(0, 0, self.w, self.h, self.full_fbo_shader.shad) end
+	if self.full_fbo then
+		self.full_fbo:use(false)
+		self.full_fbo:toScreen(0, 0, self.w, self.h, self.full_fbo_shader.shad)
+	end
 end
 
 --- Called when a dialog is registered to appear on screen

game/modules/tome/data/gfx/shaders/full_fbo.lua

@@ -21,6 +21,8 @@ return {
 	frag = "full_fbo",
 	vert = nil,
 	args = {
+		tex = { texture = 0 },
+		noisevol = { texture = 1 },
 	},
 	clone = false,
 }

game/modules/tome/data/gfx/shaders/mm_fbo.frag

+//#version 150
+uniform sampler2D Texture0;
+//varying vec2 texCoord;
+
+#define HueLevCount 6
+#define SatLevCount 7
+#define ValLevCount 4
+float[HueLevCount] HueLevels = float[] (0.0,80.0,160.0,240.0,320.0,360.0);
+float[SatLevCount] SatLevels = float[] (0.0,0.15,0.3,0.45,0.6,0.8,1.0);
+float[ValLevCount] ValLevels = float[] (0.0,0.3,0.6,1.0);
+
+vec3 RGBtoHSV( float r, float g, float b) {
+	float minv, maxv, delta;
+	vec3 res;
+
+	minv = min(min(r, g), b);
+	maxv = max(max(r, g), b);
+	res.z = maxv;            // v
+
+	delta = maxv - minv;
+
+	if( maxv != 0.0 )
+		res.y = delta / maxv;      // s
+	else {
+		// r = g = b = 0      // s = 0, v is undefined
+		res.y = 0.0;
+		res.x = -1.0;
+		return res;
+	}
+
+	if( r == maxv )
+		res.x = ( g - b ) / delta;      // between yellow & magenta
+	else if( g == maxv )
+		res.x = 2.0 + ( b - r ) / delta;   // between cyan & yellow
+	else
+		res.x = 4.0 + ( r - g ) / delta;   // between magenta & cyan
+
+	res.x = res.x * 60.0;            // degrees
+	if( res.x < 0.0 )
+		res.x = res.x + 360.0;
+
+	return res;
+}
+
+vec3 HSVtoRGB(float h, float s, float v ) {
+	int i;
+	float f, p, q, t;
+	vec3 res;
+
+	if( s == 0.0 ) {
+		// achromatic (grey)
+		res.x = v;
+		res.y = v;
+		res.z = v;
+		return res;
+	}
+
+	h /= 60.0;         // sector 0 to 5
+	i = int(floor( h ));
+	f = h - float(i);         // factorial part of h
+	p = v * ( 1.0 - s );
+	q = v * ( 1.0 - s * f );
+	t = v * ( 1.0 - s * ( 1.0 - f ) );
+
+	switch( i ) {
+	case 0:
+		res.x = v;
+		res.y = t;
+		res.z = p;
+		break;
+	case 1:
+		res.x = q;
+		res.y = v;
+		res.z = p;
+		break;
+	case 2:
+		res.x = p;
+		res.y = v;
+		res.z = t;
+		break;
+	case 3:
+		res.x = p;
+		res.y = q;
+		res.z = v;
+		break;
+	case 4:
+		res.x = t;
+		res.y = p;
+		res.z = v;
+		break;
+	default:      // case 5:
+		res.x = v;
+		res.y = p;
+		res.z = q;
+		break;
+	}
+
+	return res;
+}
+
+float nearestLevel(float col, int mode) {
+	int levCount;
+	if (mode==0) levCount = HueLevCount;
+	if (mode==1) levCount = SatLevCount;
+	if (mode==2) levCount = ValLevCount;
+
+	for (int i =0; i<levCount-1; i++ ) {
+		if (mode==0) {
+			if (col >= HueLevels[i] && col <= HueLevels[i+1]) {
+				return HueLevels[i+1];
+			}
+		}
+		if (mode==1) {
+			if (col >= SatLevels[i] && col <= SatLevels[i+1]) {
+				return SatLevels[i+1];
+			}
+		}
+		if (mode==2) {
+			if (col >= ValLevels[i] && col <= ValLevels[i+1]) {
+				return ValLevels[i+1];
+			}
+		}
+	}
+}
+
+// averaged pixel intensity from 3 color channels
+float avg_intensity(vec4 pix) {
+	return (pix.r + pix.g + pix.b)/3.;
+}
+
+vec4 get_pixel(vec2 coords, float dx, float dy) {
+	return texture2D(Texture0,coords + vec2(dx, dy));
+}
+
+// returns pixel color
+float IsEdge(in vec2 coords){
+	float dxtex = 1.0 /float(textureSize(Texture0,0)) ;
+	float dytex = 1.0 /float(textureSize(Texture0,0));
+	float pix[9];
+	int k = -1;
+	float delta;
+
+	// read neighboring pixel intensities
+	for (int i=-1; i<2; i++) {
+		for(int j=-1; j<2; j++) {
+			k++;
+			pix[k] = avg_intensity(get_pixel(coords,float(i)*dxtex,
+				float(j)*dytex));
+		}
+	}
+
+	// average color differences around neighboring pixels
+	delta = (abs(pix[1]-pix[7])+
+		abs(pix[5]-pix[3]) +
+		abs(pix[0]-pix[8])+
+		abs(pix[2]-pix[6])
+		)/4.;
+
+	return clamp(5.5*delta,0.0,1.0);
+}
+
+void main(void)
+{
+	vec4 colorOrg = texture2D( Texture0, gl_TexCoord[0].st );
+	vec3 vHSV =  RGBtoHSV(colorOrg.r,colorOrg.g,colorOrg.b);
+	vHSV.x = nearestLevel(vHSV.x, 0);
+	vHSV.y = nearestLevel(vHSV.y, 1);
+	vHSV.z = nearestLevel(vHSV.z, 2);
+	float edg = IsEdge(gl_TexCoord[0].st);
+	vec3 vRGB = (edg >= 0.3)? vec3(0.0,0.0,0.0):HSVtoRGB(vHSV.x,vHSV.y,vHSV.z);
+	gl_FragColor = vec4(vRGB.x,vRGB.y,vRGB.z,1.0);
+}

game/modules/tome/data/gfx/shaders/mm_fbo.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+return {
+	frag = "mm_fbo",
+	vert = nil,
+	args = {
+	},
+	clone = false,
+}