Add Playstation Vita Support

CMakeLists.txt

@@ -55,21 +55,80 @@ set(SRCS
         Menus/Menu.cpp
         InputState.cpp InputState.h InputEvents/InputEvent.cpp InputEvents/InputEvent.h InputEvents/KeyboardKey.cpp InputEvents/KeyboardKey.h Config/InputConfig.cpp Config/InputConfig.h InputEvents/JoyButton.cpp InputEvents/JoyButton.h InputEvents/JoyHat.cpp InputEvents/JoyHat.h InputEvents/JoyAxisDirection.cpp InputEvents/JoyAxisDirection.h)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/CMake")
-
 add_executable(panel-pop ${SRCS})
 
-find_package(SDL2 REQUIRED)
-find_package(SDL2_image REQUIRED)
-find_package(SDL2_ttf REQUIRED)
-find_package(SDL2_mixer REQUIRED)
+if (VITA)
+	# Project start
+	set(VITA_APPNAME PanelPop)
+	set(VITA_TITLEID "PPOP00001")
+	set(VITA_VERSION "00.03")
+
+	# Find libraries
+	include(FindPkgConfig)
+	pkg_search_module(SDL2 REQUIRED sdl2)
+	pkg_search_module(SDL2_IMAGE REQUIRED SDL2_image)
+	pkg_search_module(SDL2_MIXER REQUIRED SDL2_mixer)
+	pkg_search_module(SDL2_TTF REQUIRED SDL2_ttf)
+	pkg_search_module(JSONCPP REQUIRED jsoncpp)
+
+	target_link_libraries(${PROJECT_NAME} PRIVATE
+		${SDL2_LIBRARIES}
+		${SDL2_IMAGE_LIBRARIES}
+		${SDL2_MIXER_LIBRARIES}
+		${SDL2_TTF_LIBRARIES}
+		${JSONCPP_LIBRARIES}
+	)
+
+	include_directories(
+		${PROJECT_SOURCE_DIR}/include
+		${SDL2_INCLUDE_DIRS}
+		${SDL2_IMAGE_INCLUDE_DIRS}
+		${SDL2_MIXER_INCLUDE_DIRS}
+		${SDL2_TTF_INCLUDE_DIRS}
+		${JSONCPP_INCLUDE_DIRS}
+	)
+
+	include("$ENV{VITASDK}/share/vita.cmake" REQUIRED)
+	vita_create_self(panel-pop.self panel-pop)
+
+	vita_create_vpk(panel-pop.vpk ${VITA_TITLEID} panel-pop.self
+		    VERSION ${VITA_VERSION}
+		    NAME ${VITA_APPNAME}
+		    FILE platform/vita/sce_sys sce_sys
+		    FILE platform/vita/panelpop.json panelpop.json
+		    FILE assets/fonts assets/fonts
+		    FILE assets/music assets/music
+		    FILE assets/sfx assets/sfx
+		    FILE assets/1p.png assets/1p.png
+		    FILE assets/2p.png assets/2p.png
+		    FILE assets/bg1.png assets/bg1.png
+		    FILE assets/sprites.png assets/sprites.png
+		    FILE assets/title.png assets/title.png
+	)
+ELSE()
+	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/CMake")
+
+	find_package(SDL2 REQUIRED)
+	find_package(SDL2_image REQUIRED)
+	find_package(SDL2_ttf REQUIRED)
+	find_package(SDL2_mixer REQUIRED)
+
+	find_package(SDL2 REQUIRED)
+	find_package(SDL2_image REQUIRED)
+	find_package(SDL2_ttf REQUIRED)
+	find_package(SDL2_mixer REQUIRED)
+	find_package(jsoncpp REQUIRED)
+	get_target_property(JSON_INC_PATH jsoncpp_lib INTERFACE_INCLUDE_DIRECTORIES)
 
-include_directories(${SDL2_INCLUDE_DIR}
-        ${SDL2_IMAGE_INCLUDE_DIR}
-        ${SDL2_TTF_INCLUDE_DIR}
-        ${SDL2_MIXER_INCLUDE_DIR})
+	include_directories(${SDL2_INCLUDE_DIR}
+		    ${SDL2_IMAGE_INCLUDE_DIR}
+		    ${SDL2_TTF_INCLUDE_DIR}
+		    ${SDL2_MIXER_INCLUDE_DIR}
+		    ${JSON_INC_PATH})
 
-target_link_libraries(panel-pop ${SDL2_LIBRARY}
-        ${SDL2_IMAGE_LIBRARIES}
-        ${SDL2_TTF_LIBRARIES}
-        ${SDL2_MIXER_LIBRARIES})
+	target_link_libraries(panel-pop ${SDL2_LIBRARY}
+		    ${SDL2_IMAGE_LIBRARIES}
+		    ${SDL2_TTF_LIBRARIES}
+		    ${SDL2_MIXER_LIBRARIES}
+		    jsoncpp)
+ENDIF()

Config/ConfigHandler.cpp

@@ -12,14 +12,14 @@
 #include "../InputEvents/JoyButton.h"
 #include "../InputEvents/JoyAxisDirection.h"
 
-#include <boost/property_tree/detail/ptree_implementation.hpp>
-#include <boost/property_tree/ini_parser.hpp>
 #include <SDL2/SDL_keyboard.h>
 #include <SDL2/SDL_scancode.h>
 #include <SDL2/SDL_mixer.h>
 #include <exception>
 #include <iostream>
 #include <string>
+#include <json/json.h>
+#include <fstream>
 
 ConfigHandler::ConfigHandler() {
 }
@@ -30,25 +30,32 @@ ConfigHandler &ConfigHandler::getInstance() {
 }
 
 bool ConfigHandler::loadConfig() {
-    try {
-        boost::property_tree::read_ini(CONFIG_FILENAME, _settingsTree);
-    } catch (std::exception &e) {
-        std::cerr << "error in reading config file, using defaults..."
-                  << std::endl;
-        std::cerr << e.what();
+    std::ifstream configFile;
+    std::string configPath = CONFIG_DIR + CONFIG_FILENAME;
+    configFile.open(configPath, std::ios::in);
+    Json::CharReaderBuilder builder;
+    JSONCPP_STRING errs;
+    if (!parseFromStream(builder, configFile, &_settingsTree, &errs)) {
+        std::cerr << "error in reading config file, using defaults..." << std::endl;
+        std::cerr << errs;
+        configFile.close();
         return false;
     }
+    configFile.close();
     return true;
 }
 
 bool ConfigHandler::saveConfig() {
-    boost::property_tree::write_ini(CONFIG_FILENAME, _settingsTree);
+    std::string configPath = CONFIG_DIR + CONFIG_FILENAME;
+    std::ofstream configFile(configPath, std::ios::binary);
+    configFile << _settingsTree;
+    configFile.close();
     return true;
 }
 
 InputConfig ConfigHandler::getKeyConfig(int player) {
 
-    auto prefix = "keys.p" + std::to_string(player) + "_";
+    auto prefix = "p" + std::to_string(player) + "_";
     return InputConfig(parseInputEvent(prefix + "up"),
                        parseInputEvent(prefix + "down"),
                        parseInputEvent(prefix + "left"),
@@ -60,7 +67,7 @@ InputConfig ConfigHandler::getKeyConfig(int player) {
 }
 
 InputEvent *ConfigHandler::parseInputEvent(const std::string &configKey) {
-    std::string value = _settingsTree.get<std::string>(configKey);
+    std::string value = _settingsTree["keys"].get(configKey, "").asString();
 
     char type = value[0];
     switch (type) {
@@ -94,52 +101,51 @@ InputEvent *ConfigHandler::parseInputEvent(const std::string &configKey) {
 }
 
 void ConfigHandler::setKeyConfig(InputConfig config, int player) {
-
     StateManager::getInstance().setKeys(config, player);
-    auto prefix = "keys.p" + std::to_string(player) + "_";
-    _settingsTree.put(prefix + "up", config._up->toString());
-    _settingsTree.put(prefix + "down", config._down->toString());
-    _settingsTree.put(prefix + "left", config._left->toString());
-    _settingsTree.put(prefix + "right", config._right->toString());
-    _settingsTree.put(prefix + "swap", config._swap->toString());
-    _settingsTree.put(prefix + "raiseStack", config._raiseStack->toString());
-    _settingsTree.put(prefix + "start", config._start->toString());
+    auto prefix = "p" + std::to_string(player) + "_";
+    _settingsTree["keys"][prefix + "up"] = config._up->toString();
+    _settingsTree["keys"][prefix + "down"] = config._down->toString();
+    _settingsTree["keys"][prefix + "left"] = config._left->toString();
+    _settingsTree["keys"][prefix + "right"] = config._right->toString();
+    _settingsTree["keys"][prefix + "swap"] = config._swap->toString();
+    _settingsTree["keys"][prefix + "raiseStack"] = config._raiseStack->toString();
+    _settingsTree["keys"][prefix + "start"] = config._start->toString();
 
 }
 
 void ConfigHandler::setFullscreen(bool fs) {
-    _settingsTree.put("video.fullscreen", fs);
+    _settingsTree["video"]["fullscreen"] = fs;
     if (fs != SDLContext::getInstance().isFullscreen()) {
         SDLContext::getInstance().toggleFullscreen();
     }
 }
 
 void ConfigHandler::setMusicVolume(int vol) {
-    _settingsTree.put("audio.music_volume", vol);
+    _settingsTree["audio"]["music_volume"] = vol;
     Mix_VolumeMusic(vol);
 }
 
 void ConfigHandler::setSfxVolume(int vol) {
-    _settingsTree.put("audio.sfx_volume", vol);
+    _settingsTree["audio"]["sfx_volume"] = vol;
     Mix_Volume(-1, vol);
 }
 
 bool ConfigHandler::getFullscreen() {
-    return _settingsTree.get("video.fullscreen", false);
+    return _settingsTree["video"].get("fullscreen", false).asBool();
 }
 
 int ConfigHandler::getMusicVolume() {
-    return _settingsTree.get("audio.music_volume", MIX_MAX_VOLUME);
+    return _settingsTree["audio"].get("music_volume", MIX_MAX_VOLUME).asInt();
 }
 
 int ConfigHandler::getSfxVolume() {
-    return _settingsTree.get("audio.sfx_volume", MIX_MAX_VOLUME);
+    return _settingsTree["audio"].get("sfx_volume", MIX_MAX_VOLUME).asInt();
 }
 
 int ConfigHandler::getEndlessHighScore() {
-    return _settingsTree.get("endless.high_score", 0);
+    return _settingsTree["endless"].get("high_score", 0).asInt();
 }
 
 void ConfigHandler::setEndlessHighScore(int score) {
-    _settingsTree.put("endless.high_score", score);
+    _settingsTree["endless"]["high_score"] = score;
 }

Config/ConfigHandler.h

@@ -8,8 +8,9 @@
 #ifndef CONFIG_CONFIGHANDLER_H_
 #define CONFIG_CONFIGHANDLER_H_
 
-#include <boost/property_tree/ptree.hpp>
+#include <json/json.h>
 #include <SDL2/SDL_scancode.h>
+#include <SDL2/SDL.h>
 #include "InputConfig.h"
 #include "../InputEvents/KeyboardKey.h"
 
@@ -18,7 +19,12 @@ class ConfigHandler {
 
   static ConfigHandler &getInstance();
 
-  const char *CONFIG_FILENAME = "panelpop.ini";
+  const std::string CONFIG_FILENAME = "panelpop.json";
+  #ifdef __vita__
+    const std::string CONFIG_DIR = SDL_GetPrefPath(NULL,"panel-pop");;
+  #else
+    const std::string CONFIG_DIR = "./";
+  #endif
   bool loadConfig();
   bool saveConfig();
 
@@ -40,7 +46,8 @@ class ConfigHandler {
   ConfigHandler(ConfigHandler const &) = delete;
   void operator=(ConfigHandler const &) = delete;
 
-  boost::property_tree::ptree _settingsTree;
+  Json::Value _settingsTree;
+
   InputEvent *parseInputEvent(const std::string &configKey);
 };
 

Menus/MainMenu.cpp

@@ -31,11 +31,15 @@ MainMenu::MainMenu() {
                  [&]() {
                    StateManager::getInstance().switchToState(new AIGameState);
                  }));
-    addItem(
-        MenuItem("2P VS",
-                 [&]() {
-                   StateManager::getInstance().switchToState(new VsGameState);
-                 }));
+
+    #ifndef __vita__
+      addItem(
+          MenuItem("2P VS",
+                  [&]() {
+                    StateManager::getInstance().switchToState(new VsGameState);
+                  }));
+    #endif
+
     addItem(
         MenuItem("Options",
                  [&]() {

Menus/OptionsMenu.cpp

@@ -12,6 +12,8 @@
 #include <SDL2/SDL_timer.h>
 #include <string>
 #include <vector>
+#include <sstream>
+
 
 #include "../Config/ConfigHandler.h"
 #include "../SDLContext.h"
@@ -23,22 +25,34 @@ OptionsMenu::OptionsMenu(OptionsMenuState &state) :
 
     ConfigHandler &cf = ConfigHandler::getInstance();
 
-    addItem(
-        MenuItem("Fullscreen", [&]() {}, cf.getFullscreen(), 1,
-                 MenuItem::OptionType::TOGGLE));
+    #ifndef __vita__
+        addItem(
+            MenuItem("Fullscreen", [&]() {}, cf.getFullscreen(), 1,
+                    MenuItem::OptionType::TOGGLE));
+    #endif
+
     addItem(
         MenuItem("Music volume", [&]() {}, cf.getMusicVolume(),
                  MIX_MAX_VOLUME, MenuItem::OptionType::SLIDER));
     addItem(
         MenuItem("SFX volume", [&]() {}, cf.getSfxVolume(), MIX_MAX_VOLUME,
                  MenuItem::OptionType::SLIDER));
-    addItem(MenuItem("Configure controls", [&]() {
-      _state.configurePlayerKeys(_items.at(_selection).getValue() + 1);
-    }, 0, 1, MenuItem::OptionType::PLAYER));
+
+    #ifndef __vita__
+        addItem(MenuItem("Configure controls", [&]() {
+        _state.configurePlayerKeys(_items.at(_selection).getValue() + 1);
+        }, 0, 1, MenuItem::OptionType::PLAYER));
+    #endif
+
     addItem(MenuItem("Apply", [&]() {
-      cf.setFullscreen(_items.at(0).getValue());
-      cf.setMusicVolume(_items.at(1).getValue());
-      cf.setSfxVolume(_items.at(2).getValue());
+      #ifdef __vita__
+        cf.setMusicVolume(_items.at(0).getValue());
+        cf.setSfxVolume(_items.at(1).getValue());
+      #else
+        cf.setFullscreen(_items.at(0).getValue());
+        cf.setMusicVolume(_items.at(1).getValue());
+        cf.setSfxVolume(_items.at(2).getValue());
+      #endif
       cf.saveConfig();
       _state.goBack();
     }));

README.md

@@ -40,7 +40,7 @@ The default keyboard controls will always work in the menus.
 * SDL2_image
 * SDL2_ttf
 * SDL2_mixer
-* boost
+* jsoncpp
 
 #### Linux
 1. `cmake`
@@ -58,3 +58,10 @@ folders into the MinGW installation's respective folders.
 
 1. `cmake -G "MinGW Makefiles" -DCMAKE_SH="CMAKE_SH-NOTFOUND"`
 2. `make`
+
+#### Playstation Vita
+
+Install the [DolceSDK](https://github.com/DolceSDK/doc) and [this SDL2 fork](https://github.com/isage/SDL-mirror). Then Playstation Vita version can be build.
+
+1. ``cmake -DCMAKE_TOOLCHAIN_FILE="${DOLCESDK}/share/dolce.toolchain.cmake" ..``
+2. ``make``