trimming stuff down.

desktop/gametodos.txt

@@ -14,23 +14,18 @@ IOS
 + update-override slow on IOS
 
 AUDIO
-  + blink
   + scratch
   + magic hands
   + gandarf explosion
   + crying
   + cat
-  + pick up
   + strength potion
-  + metal clanking
-  + ladder break
-  + eavesdrop
+  + cafe sound
   + milking
   + antique sigh
   + bloodclot grunt
   + bloodclot explode
   + crowbar
-  + ambient forest
   + get sick
   + sigh
   + jump

desktop/src-common/advent/screens/rooms/outside_house.clj

@@ -579,7 +579,7 @@
         lamb-walk-sheet (texture! (utils/get-texture "outsidehouse/lamb-walk.png") :split 27 28)
         sheep-stand (animation 0.15 (for [i (flatten [(repeat 10 0) 1 2 3 4 5 6 7 4 5 6 7 8 9 10 (repeat 25 11) (repeat 15 12)])]
                                     (aget sheep-stand-sheet 0 i)))
-        door (utils/make-anim "outsidehouse/door.png" [22 58] 0.15 (flatten [(range 4) 3 3 3 3 3 3 3]))
+        door (utils/make-anim "outsidehouse/door.png" [24 58] 0.15 (flatten [(range 4) 3 3 3 3 3 3 3]))
         sheep-walk (animation 0.05 (for [i (range 6)]
                                      (aget sheep-walk-sheet 0 i)))
         butterfly-stand (utils/make-anim "butterfly.png" [7 7] 0.1 [0 1])
@@ -729,7 +729,7 @@
                                          :y 105
                                          :baseline 238)
                            :door (assoc (animation->texture screen door) 
-                                   :x 253 :y 88 :baseline 122
+                                   :x 252 :y 88 :baseline 122
                                    :open door
                                    :door-sound (utils/load-sound "door.ogg")
                                    :anim-sound-frames {door {1 [:door-sound 0.1]}}

desktop/src-common/advent/screens/scene.clj

@@ -134,15 +134,36 @@ vec3 BlendHue(vec3 base, vec3 blend)
 
 #define BlendOpacity(base, blend, F, O) (F(base, blend) * O + blend * (1.0 - O))
 
-void main()
+
+
+void main ()
 {
 
+    vec2 sz = vec2 (1024.0, 1024.0);
+    vec3 step = vec3 (1.0 / 4.0, 1.0 / 4.0, 0.0);
+    vec2 tex_pixel = sz * v_texCoords - step.xy / 2.0;
 
-    vec3 multiplied = mix(texture2D(u_texture, v_texCoords).rgb, v_color.rgb * texture2D(u_texture, v_texCoords).rgb, multiply_amount * 0.67 );
+    vec2 corner = floor (tex_pixel) + 1.0;
+    vec2 frac = min ((corner - tex_pixel) * vec2 (4.0, 4.0), vec2 (1.0, 1.0));
+
+    vec4 c1 = texture2D (u_texture, (floor (tex_pixel + step.zz) + 0.5) / sz);
+    vec4 c2 = texture2D (u_texture, (floor (tex_pixel + step.xz) + 0.5) / sz);
+    vec4 c3 = texture2D (u_texture, (floor (tex_pixel + step.zy) + 0.5) / sz);
+    vec4 c4 = texture2D (u_texture, (floor (tex_pixel + step.xy) + 0.5) / sz);
+
+    c1 *=        frac.x  *        frac.y;
+    c2 *= (1.0 - frac.x) *        frac.y;
+    c3 *=        frac.x  * (1.0 - frac.y);
+    c4 *= (1.0 - frac.x) * (1.0 - frac.y);
+
+    vec4 scaledColor = (c1 + c2 + c3 + c4);
+
+    vec3 multiplied = mix(scaledColor.rgb, v_color.rgb * scaledColor.rgb, multiply_amount * 0.67 );
     vec3 hued =  mix(multiplied,  BlendHue(multiplied.rgb, v_color.rgb), hue_amount * 0.67);
     vec3 final = hued;
-  
-    gl_FragColor = vec4(final[0], final[1], final[2], texture2D(u_texture, v_texCoords).a * v_color.a);
+
+    gl_FragColor = vec4(final[0], final[1], final[2], scaledColor.a * v_color.a);
+
 }
 ")
 ;
@@ -968,6 +989,7 @@ void main()
       (let [[^OrthographicCamera cam] (utils/setup-viewport screen 320 240)]
         (set! (. cam zoom) 0.95)
         (let [shader (ShaderProgram. ^String v-shader ^String pix-shader)
+              _ (println (.getLog shader))
               
 
               _ (update! screen :shader shader)