Merge pull request #1197 from seanpaultaylor/next

Next

gameplay/android/jni/Android.mk

@@ -87,6 +87,8 @@ LOCAL_SRC_FILES := \
     RenderTarget.cpp \
     Scene.cpp \
     SceneLoader.cpp \
+    SceneRenderer.cpp \
+    SceneRendererForward.cpp \
     ScreenDisplayer.cpp \
     ScriptController.cpp \
     ScriptTarget.cpp \
@@ -112,7 +114,7 @@ LOCAL_SRC_FILES := \
     VertexAttributeBinding.cpp \
     VertexFormat.cpp \
     VerticalLayout.cpp \
-	social/GoogleGamesSocialSession.cpp \
+    VisibleSetDefault.cpp \
     lua/lua_AbsoluteLayout.cpp \
     lua/lua_AIAgent.cpp \
     lua/lua_AIAgentListener.cpp \
@@ -252,6 +254,8 @@ LOCAL_SRC_FILES := \
     lua/lua_RenderTarget.cpp \
     lua/lua_Scene.cpp \
     lua/lua_SceneDebugFlags.cpp \
+    lua/lua_SceneRenderer.cpp \
+    lua/lua_SceneRendererForward.cpp \
     lua/lua_ScreenDisplayer.cpp \
     lua/lua_ScriptController.cpp \
     lua/lua_ScriptTarget.cpp \
@@ -285,7 +289,10 @@ LOCAL_SRC_FILES := \
     lua/lua_VertexFormat.cpp \
     lua/lua_VertexFormatElement.cpp \
     lua/lua_VertexFormatUsage.cpp \
-    lua/lua_VerticalLayout.cpp
+    lua/lua_VerticalLayout.cpp \
+    lua/lua_VisibleSet.cpp \
+    lua/lua_VisibleSetDefault.cpp \
+    social/GooglePlaySocialSession.cpp
 
     
 LOCAL_CFLAGS := -D__ANDROID__ -DGP_USE_SOCIAL -I"../../external-deps/lua/include" -I"../../external-deps/bullet/include" -I"../../external-deps/png/include" -I"../../external-deps/oggvorbis/include" -I"../../external-deps/openal/include"

gameplay/src/SocialController.cpp

@@ -79,7 +79,7 @@ void SocialController::authenticate(SocialSessionListener* listener)
 
     if (strcmp(providerStr, "GooglePlay") == 0)
     {
-        _session = GoogleGamesSocialSession::authenticate(listener, socialProperties);
+        _session = GooglePlaySocialSession::authenticate(listener, socialProperties);
     }
     else
     {

gameplay/src/SocialController.h

@@ -18,7 +18,7 @@ namespace gameplay
   @verbatim
     social
     {
-         provider = Scoreloop
+         provider = Scoreloop | GooglePlay
          id  = d346c484-12aa-49a2-a0a0-de2f87492d72
          secret = aAa+DehBfyGO/CYaE3nWomgu7SIbWFczUih+Qwf3/n7u0y3nyq5Hag==
          version = 1.0