Commit: 07e82d95d5f8b367887bbe3dd5e939050c6e17f9 - HotshotIOS (hg)

Commit MetaInfo

• Revision: 07e82d95d5f8b367887bbe3dd5e939050c6e17f9 (tree)
• Time: 2024-12-11 02:20:43
• Author: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

Forgot to initialize SMAA.

Change Summary

• modified: android/src/main/jni/blackholedarksunmain.cpp
• modified: desktop/CMakeLists.txt

Incremental Difference

diff -r 43269a1692b3 -r 07e82d95d5f8 android/src/main/jni/blackholedarksunmain.cpp
--- a/android/src/main/jni/blackholedarksunmain.cpp	Mon Dec 09 21:41:59 2024 +0100
+++ b/android/src/main/jni/blackholedarksunmain.cpp	Tue Dec 10 18:20:43 2024 +0100
@@ -90,6 +90,7 @@
 #include "HotshotSceneCompositor.h"
 #include "OgreHardwarePixelBuffer.h"
 #include "OgreRenderTexture.h"
+#include "Utils/SmaaUtils.h"
 
 #ifdef USE_PCZ
 #include <OgrePCZSceneManager.h>
@@ -4012,6 +4013,11 @@
     Ogre::RenderWindow* renderWindow = (Ogre::RenderWindow*)getLongAsPointer(renderWindowPtr);
     Ogre::Camera* camera = (Ogre::Camera*)getLongAsPointer(cameraPtr);
 
+    // Also enable SMAA since we are connecting to it in the workspace.
+    Demo::SmaaUtils::initialize(root->getRenderSystem(),
+                                Demo::SmaaUtils::SMAA_PRESET_ULTRA,
+                                Demo::SmaaUtils::EdgeDetectionColour);
+
     Ogre::CompositorManager2* compositorManager = root->getCompositorManager2();
 
     //Now setup the regular renderer

diff -r 43269a1692b3 -r 07e82d95d5f8 desktop/CMakeLists.txt
--- a/desktop/CMakeLists.txt	Mon Dec 09 21:41:59 2024 +0100
+++ b/desktop/CMakeLists.txt	Tue Dec 10 18:20:43 2024 +0100
@@ -74,6 +74,7 @@
 ${OGRE_INCLUDE_PATH}/RenderSystems/GLES3/src/EGL/Vao
 ${OGRE_INCLUDE_PATH}/RenderSystems/GLES3/src/EGL/WIN32
 ${OGRE_INCLUDE_PATH}/RenderSystems/NULL/src
+${OGRE_INCLUDE_PATH}/Samples/2.0/Common/include
 
 ${OGREDEPS_BUILD_INCLUDE_PATH}/include/
 C:/Program\ Files/Java/jdk-1.8/include
@@ -210,6 +211,7 @@
                        #${OGRE_LIB_PATH}/libRenderSystem_GLES3Static${DBG_END}.a
                        #${OGRE_LIB_PATH}/libOgreMainStatic${DBG_END}.a
                        #${OGRE_LIB_PATH}/libRenderSystem_GLES3Static${DBG_END}.a
+                       #${OGRE_LIB_PATH}/OgreSamplesCommon${DBG_END}.a
                        #${OGRE_DEPS_LIB_PATH}/libfreetype.a
                        #${OGRE_DEPS_LIB_PATH}/libzziplib.a
                        #${OGRE_DEPS_LIB_PATH}/libFreeImage.a
@@ -230,6 +232,7 @@
 						  #${OGRE_LIB_PATH}/RenderSystem_GL3PlusStatic${DBG_END}.lib
 						  ${OGRE_LIB_PATH}/RenderSystem_Direct3D11Static${DBG_END}.lib
                           #${OGRE_LIB_PATH}/RenderSystem_NULLStatic${DBG_END}.lib
+                          ${OGRE_LIB_PATH}/OgreSamplesCommon${DBG_END}.lib
 						  #c:/glew-2.0.0/lib/Release/Win32/glew32.lib
 						  #c:/glew-2.0.0/lib/Release/Win32/glew32s.lib
 						  glu32.lib