Merge branch 'floordemo'

* Don't force WASM -- use it only if your EmSDK defaults to it
* Force-enable C++17 on Emscripten (it supports it)

Author: InBetweenNames

CMakeLists.txt

@@ -38,13 +38,41 @@ target_compile_options(main
   $<$<CXX_COMPILER_ID:MSVC>:/W4>
 )
 
-#Default to C++14 -- no effect on C code (emscripten is limited to C++14 for now)
-target_compile_features(main PUBLIC cxx_std_14)
+#Default to C++17 -- no effect on C code
+target_compile_features(main PUBLIC cxx_std_17)
 
 #Special: handle emscripten for running in web browser
 if ("${CMAKE_SYSTEM_NAME}" MATCHES "Emscripten")
+
+  #Ensure Release builds have full optimization enabled
+  string(REPLACE "O2" "O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+  string(REPLACE "O2" "O3" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+
+  string(REPLACE "O2" "O3" CMAKE_C_FLAGS_RELWITHDEBINFO
+    "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+  string(REPLACE "O2" "O3" CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+
+  string(REPLACE "O2" "O3" CMAKE_EXE_LINKER_FLAGS_RELEASE
+    "${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
+  string(REPLACE "O2" "O3" CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}")
+
+  string(REPLACE "O2" "O3" CMAKE_SHARED_LINKER_FLAGS_RELEASE
+    "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
+  string(REPLACE "O2" "O3" CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
+    "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO}")
+
+  string(REPLACE "O2" "O3" CMAKE_MODULE_LINKER_FLAGS_RELEASE
+    "${CMAKE_MODULE_LINKER_FLAGS_RELEASE}")
+  string(REPLACE "O2" "O3" CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
+    "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO}")
+
+  #Emscripten supports C++17, but upstream doesn't have the configuration added
+  #TODO: make pull request upstream to Emscripten.cmake to add this
+  set(CMAKE_CXX17_COMPILE_FEATURES "cxx_std_17")
+  
   set(CMAKE_EXECUTABLE_SUFFIX ".html") 
-  set(ECXXFLAGS "-s USE_SDL=2 -s USE_SDL_TTF=2 -s WASM=1 -s EXIT_RUNTIME=1 --preload-file iosevka-regular.ttf")
+  set(ECXXFLAGS "-s USE_SDL=2 -s USE_SDL_TTF=2 -s EXIT_RUNTIME=1 --preload-file iosevka-regular.ttf --preload-file sky.bmp --preload-file floor.bmp")
   set_target_properties(main PROPERTIES LINK_FLAGS "${ECXXFLAGS} --emrun")
   set_target_properties(main PROPERTIES COMPILE_FLAGS "${ECXXFLAGS}")
 else ()

README.md

@@ -1,7 +1,7 @@
 UWindsor COMP-3520 SDL2 Project Template (CMake version)
 ===
 
-*** NEW: For a live demo of the floordemo branch, [click here](https://inbetweennames.github.io/SDL2TemplateCMake/) *** 
+** For a live demo of this code, [click here](https://inbetweennames.github.io/SDL2TemplateCMake/) **
 
 This template is intended for students in the COMP-3520 Introduction to Computer Graphics course
 at the University of Windsor, however it should serve as a useful template for anyone interested in
@@ -23,6 +23,30 @@ On Arch Linux, look for the packages `sdl2` and `sdl2_ttf`.
 Mac users should be able to use Homebrew or a similar package manager to install the needed dependencies.
 If you need help, just send me an email.
 
+Demo
+---
+
+This repository contains source code for some 2.5D rendering functions written
+for software rendering.  The code needs a bit of cleaning up, but otherwise
+should work fine.  Pull requests are welcome to improve the code.
+
+The code is written in mostly C such that students without a C++ background
+can more easily understand it.  More C++ parts may be added over time.
+There are some parts that need to be overhauled,
+like the conversion from floating point coordinates to integer coordinates.
+However, the basic ideas should be evident.  In class, we'll discuss how
+this would have been implemented using fixed-point arithmetic.
+
+A live demo compiled using Emscripten and WebAssembly is available [here](https://inbetweennames.github.io/SDL2TemplateCMake/)
+
+Controls:
+---
+
+Mouse - look left/right
+W, A, S, D - move forwards, backwards, upwards, downwards
+T, G -- raise and lower height
+Y, H -- adjust focal distance (distance to screen plane)
+
 Setup
 ---
 

build-wasm/build-with-emscripten.sh

@@ -7,6 +7,4 @@ if [[ -z $(which emcmake) ]]; then
   exit 1
 fi
 
-emcmake cmake ..
-cmake --build .
-emrun main.html
+emcmake cmake .. && cmake --build . && emrun main.html