test_shader_1 « shaders « client - minetest.git - modified minetest for gpcfs purposes

Mode	Name	Size
-rw-r--r--	base.txt	18	log plain
-rw-r--r--	opengl_fragment.glsl	693	log plain
-rw-r--r--	opengl_vertex.glsl	1377	log plain

ht/Android/CIrrDeviceAndroid.cpp 2014-06-03 19:45:37.265709359 +0200 @@ -315,6 +315,7 @@ event.TouchInput.ID = AMotionEvent_getPointerId(androidEvent, i); event.TouchInput.X = AMotionEvent_getX(androidEvent, i); event.TouchInput.Y = AMotionEvent_getY(androidEvent, i); + event.TouchInput.touchedCount = AMotionEvent_getPointerCount(androidEvent); device->postEventFromUser(event); } @@ -326,6 +327,7 @@ event.TouchInput.ID = AMotionEvent_getPointerId(androidEvent, pointerIndex); event.TouchInput.X = AMotionEvent_getX(androidEvent, pointerIndex); event.TouchInput.Y = AMotionEvent_getY(androidEvent, pointerIndex); + event.TouchInput.touchedCount = AMotionEvent_getPointerCount(androidEvent); device->postEventFromUser(event); }