Merge remote-tracking branch 'upstream/master'

CI/before_script.msvc.sh

@@ -613,8 +613,7 @@ fi
 			SUFFIX=""
 		fi
 
-		add_runtime_dlls "$(pwd)/bin/lib"{EGL,GLESv2}${SUFFIX}.dll \
-			"$(pwd)/bin/Qt5"{Core,Gui,Network,OpenGL,Widgets}${SUFFIX}.dll
+		add_runtime_dlls "$(pwd)/bin/Qt5"{Core,Gui,Network,OpenGL,Widgets}${SUFFIX}.dll
 		add_qt_platform_dlls "$(pwd)/plugins/platforms/qwindows${SUFFIX}.dll"
 
 		echo Done.

CMakeLists.txt

@@ -135,6 +135,8 @@ if (WIN32)
 endif()
 
 # Dependencies
+find_package(OpenGL REQUIRED)
+
 if (USE_QT)
     message(STATUS "Using Qt${DESIRED_QT_VERSION}")
 
@@ -182,12 +184,6 @@ if (NOT WIN32 AND BUILD_WIZARD) # windows users can just run the morrowind insta
     set(OPENMW_USE_UNSHIELD TRUE)
 endif()
 
-option(OPENGL_ES "enable opengl es support" FALSE )
-
-if (OPENGL_ES)
-    add_definitions(-DOPENGL_ES)
-endif(OPENGL_ES)
-
 # Fix for not visible pthreads functions for linker with glibc 2.15
 if (UNIX AND NOT APPLE)
     find_package (Threads)

apps/openmw/android_main.c

@@ -35,28 +35,11 @@ int Java_org_libsdl_app_SDLActivity_isMouseShown(JNIEnv *env, jclass cls, jobjec
     return SDL_ShowCursor(SDL_QUERY);
 }
 
-
-int Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls,
-        jobject obj) {
-
+int Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject obj) {
     setenv("OPENMW_DECOMPRESS_TEXTURES", "1", 1);
 
-    SDL_Android_Init(env, cls);
-
-    SDL_SetMainReady();
-
     // On Android, we use a virtual controller with guid="Virtual"
     SDL_GameControllerAddMapping("5669727475616c000000000000000000,Virtual,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4");
 
-    /* Run the application code! */
-
-    int status;
-
-    status = main(argcData+1, argvData);
-    releaseArgv();
-    /* Do not issue an exit or the whole application will terminate instead of just the SDL thread */
-    /* exit(status); */
-
-    return status;
+    return 0;
 }
-

apps/openmw/mwmechanics/actors.cpp

@@ -992,7 +992,7 @@ namespace MWMechanics
         }
     }
 
-    void Actors::updateCrimePersuit(const MWWorld::Ptr& ptr, float duration)
+    void Actors::updateCrimePursuit(const MWWorld::Ptr& ptr, float duration)
     {
         MWWorld::Ptr player = getPlayer();
         if (ptr != player && ptr.getClass().isNpc())
@@ -1285,7 +1285,7 @@ namespace MWMechanics
                         }
 
                         if (iter->first.getClass().isNpc() && iter->first != player)
-                            updateCrimePersuit(iter->first, duration);
+                            updateCrimePursuit(iter->first, duration);
 
                         if (iter->first != player)
                         {

apps/openmw/mwmechanics/actors.hpp

@@ -41,7 +41,7 @@ namespace MWMechanics
 
             void updateEquippedLight (const MWWorld::Ptr& ptr, float duration, bool mayEquip);
 
-            void updateCrimePersuit (const MWWorld::Ptr& ptr, float duration);
+            void updateCrimePursuit (const MWWorld::Ptr& ptr, float duration);
 
             void killDeadActors ();
 

apps/openmw/mwrender/water.cpp

@@ -503,13 +503,11 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
 
     // use a shader to render the simple water, ensuring that fog is applied per pixel as required.
     // this could be removed if a more detailed water mesh, using some sort of paging solution, is implemented.
-#if !defined(OPENGL_ES) && !defined(ANDROID)
     Resource::SceneManager* sceneManager = mResourceSystem->getSceneManager();
     bool oldValue = sceneManager->getForceShaders();
     sceneManager->setForceShaders(true);
     sceneManager->recreateShaders(node);
     sceneManager->setForceShaders(oldValue);
-#endif
 }
 
 void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, Refraction* refraction)

components/CMakeLists.txt

@@ -26,12 +26,6 @@ else (GIT_CHECKOUT)
     configure_resource_file(${VERSION_IN_FILE} ${VERSION_FILE_PATH_BASE} ${VERSION_FILE_PATH_RELATIVE})
 endif (GIT_CHECKOUT)
 
-if (OPENGL_ES)
-    find_package(OpenGLES REQUIRED)
-else()
-    find_package(OpenGL REQUIRED)
-endif()
-
 # source files
 
 add_component_dir (settings
@@ -191,12 +185,6 @@ include_directories(${Bullet_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(components STATIC ${COMPONENT_FILES} ${MOC_SRCS} ${ESM_UI_HDR})
 
-if (OPENGL_ES)
-    set(GL_LIB ${OPENGLES_gl_LIBRARY})
-else()
-    set(GL_LIB ${OPENGL_gl_LIBRARY})
-endif()
-
 target_link_libraries(components
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
@@ -213,8 +201,7 @@ target_link_libraries(components
     ${OSGANIMATION_LIBRARIES}
     ${Bullet_LIBRARIES}
     ${SDL2_LIBRARIES}
-    # For MyGUI platform
-    ${GL_LIB}
+    ${OPENGL_gl_LIBRARY}
     ${MyGUI_LIBRARIES}
     )
 

components/sdlutil/sdlgraphicswindow.cpp

@@ -91,7 +91,7 @@ void GraphicsWindowSDL2::init()
     SDL_Window *oldWin = SDL_GL_GetCurrentWindow();
     SDL_GLContext oldCtx = SDL_GL_GetCurrentContext();
 
-#if defined(OPENGL_ES) || defined(ANDROID)
+#if defined(ANDROID)
     int major = 1;
     int minor = 1;
     char *ver = getenv("OPENMW_GLES_VERSION");

files/shaders/lighting.glsl

@@ -47,8 +47,8 @@ vec3 getSpecular(vec3 viewNormal, vec3 viewDirection, float shininess, vec3 matS
 {
     vec3 lightDir = normalize(gl_LightSource[0].position.xyz);
     float NdotL = max(dot(viewNormal, lightDir), 0.0);
-    if (NdotL < 0)
-        return vec3(0,0,0);
+    if (NdotL < 0.0)
+        return vec3(0.,0.,0.);
     vec3 halfVec = normalize(lightDir - viewDirection);
-    return pow(max(dot(viewNormal, halfVec), 0.0), 128) * gl_LightSource[0].specular.xyz * matSpec;
+    return pow(max(dot(viewNormal, halfVec), 0.0), 128.) * gl_LightSource[0].specular.xyz * matSpec;
 }