Merge pull request #36 from Deamon87/development

- First version of projective texturing
- Manual fog
- Fixes for code responsible for getting light parameters from db2

Author: Deamon87

CMakeLists.txt

@@ -239,6 +239,10 @@ set(SOURCE_FILES
 		src/ui/childWindow/m2Window/M2Window.h
 		src/ui/imguiLib/hasFocus/imguiHasFocus.cpp
 		src/ui/imguiLib/hasFocus/imguiHasFocus.h
+		src/ui/imguiLib/floatCenterSlider/floatCenterSlider.h
+		src/ui/imguiLib/floatCenterSlider/floatCenterSlider.cpp
+		src/ui/imguiLib/compactFloatEditor/compactFloatEditor.cpp
+		src/ui/imguiLib/compactFloatEditor/compactFloatEditor.h
 )
 
 set(PROTOBUF_FILES_ "")

src/database/CSqliteDB.cpp

@@ -502,7 +502,7 @@ void CSqliteDB::getTimedLightParamData(int lightParamId, int time, LightParamDat
             timeIndex++;
         }
 
-        if (timeIndex > 1) return;
+        if (timeIndex > 1) break;
 
         auto &currLdRes = lightParamData.lightTimedData[timeIndex];
         currLdRes.time = thisTime;

src/exporters/dataExporter/DataExporterClass.h

@@ -124,7 +124,7 @@ namespace DataExporter {
                    make_column("texture_weights_count", &DBM2::texture_weights_count),
                    make_column("texture_transforms_count", &DBM2::texture_transforms_count),
                    make_column("replacable_texture_lookup_count", &DBM2::replacable_texture_lookup_count),
-#ifdef _MSC_VER
+#if 1
                    make_column("materials_count", &DBM2::materials_count),
                    make_column("bone_lookup_table_count", &DBM2::bone_lookup_table_count),
                    make_column("texture_lookup_table_count", &DBM2::texture_lookup_table_count),
@@ -167,7 +167,7 @@ namespace DataExporter {
                 make_table("M2SkinSection",
                    make_column("m2Id", &DBSkinSection::m2Id),
                    make_column("skinSectionIndex", &DBSkinSection::skinSectionIndex),
-#ifdef _MSC_VER
+#if 1
                    make_column("skinSectionId", &DBSkinSection::skinSectionId),
                    make_column("Level", &DBSkinSection::Level),
                    make_column("vertexStart", &DBSkinSection::vertexStart),

src/minimapGenerator/minimapGenerator.cpp

@@ -36,10 +36,10 @@ MinimapGenerator::MinimapGenerator(HWoWFilesCacheStorage cacheStorage, const HGD
 //    config->adtTTLWithoutUpdate = 500; //0.5 sec
     config->adtFreeStrategy = EFreeStrategy::eFrameBase; //
 
-    config->exteriorColors.exteriorAmbientColor =  mathfu::vec4(0.5f,0.5f,0.5f,1.0);;
-    config->exteriorColors.exteriorHorizontAmbientColor = mathfu::vec4(0.5f,0.5f,0.5f,1.0);
-    config->exteriorColors.exteriorGroundAmbientColor = mathfu::vec4(0.5f,0.5f,0.5f,1.0);
-    config->exteriorColors.exteriorDirectColor = mathfu::vec4(0.5f,0.5f,0.5f,1.0);
+    config->exteriorColors.exteriorAmbientColor =         mathfu::vec3(0.5f,0.5f,0.5f);
+    config->exteriorColors.exteriorHorizontAmbientColor = mathfu::vec3(0.5f,0.5f,0.5f);
+    config->exteriorColors.exteriorGroundAmbientColor =   mathfu::vec3(0.5f,0.5f,0.5f);
+    config->exteriorColors.exteriorDirectColor =          mathfu::vec3(0.5f,0.5f,0.5f);
 
     config->adtSpecMult = 0.0;
 
@@ -249,8 +249,7 @@ void MinimapGenerator::setupScenarioData() {
 
 
     auto config = m_apiContainer->getConfig();
-    config->closeOceanColor = currentScenario.closeOceanColor;//{0.0671968088, 0.294095874, 0.348881632, 0};
-    config->closeRiverColor = {0.345206976, 0.329288304, 0.270450264, 0};
+
     config->currentTime = currentScenario.time;
 
     m_width = currentScenario.imageWidth;

src/ui/FrontendUI.cpp

@@ -31,6 +31,7 @@
 #include "childWindow/fileListWindow/FileListWindow.h"
 #include "childWindow/sceneWindow/SceneWindow.h"
 #include "childWindow/m2Window/M2Window.h"
+#include "childWindow/mapSelectionWindow/MapSelectDialog.h"
 
 
 class FrontendUI : public IScene, public std::enable_shared_from_this<FrontendUI> {
@@ -85,39 +86,12 @@ class FrontendUI : public IScene, public std::enable_shared_from_this<FrontendUI
     void getDebugCameraPos(float &cameraX,float &cameraY,float &cameraZ);
     void makeScreenshotCallback(std::string fileName, int width, int height);
 
-    void getAdtSelectionMinimap(int wdtFileDataId);
-    void getAdtSelectionMinimap(std::string wdtFilePath);
-    void getMapList(std::vector<MapRecord> &mapList);
-
-    bool fillAdtSelectionminimap(bool &isWMOMap, bool &wdtFileExists);
-
     std::shared_ptr<SceneWindow> getOrCreateWindow();
     void unloadScene();
     void resetAnimationCallback();
 
-    std::array<std::array<HGSamplableTexture, 64>, 64> adtSelectionMinimapTextures;
-    std::array<std::array<std::shared_ptr<IUIMaterial>, 64>, 64> adtSelectionMinimapMaterials;
-    std::vector<mapInnerZoneLightRecord> m_zoneLights = {};
-    std::vector<LightResult> m_mapLights = {};
-    int limitZoneLight = -1;
-
-    void emptyMinimap() {
-        for (int i = 0; i < 64; i++) {
-            for (int j = 0; j < 64; j++) {
-                adtSelectionMinimapTextures[i][j] = nullptr;
-                adtSelectionMinimapMaterials[i][j] = nullptr;
-            }
-        }
-    }
-
     auto createMinimapGenerator();
 
-    std::array<char, 128> filterText = {0};
-    bool refilterIsNeeded = false;
-    bool resortIsNeeded = false;
-    void filterMapList(const std::string &text);
-    void fillMapListStrings();
-
     ImGui::FileBrowser fileDialog = ImGui::FileBrowser(ImGuiFileBrowserFlags_SelectDirectory, true);
     ImGui::FileBrowser createFileDialog = ImGui::FileBrowser(ImGuiFileBrowserFlags_EnterNewFilename);
 
@@ -133,25 +107,14 @@ class FrontendUI : public IScene, public std::enable_shared_from_this<FrontendUI
     bool showMapConstruction = false;
 
     bool cascOpened = false;
-    bool mapCanBeOpened = true;
-    bool adtMinimapFilled = false;
 
     int windowWidth = 640;
     int windowHeight = 480;
 
-
-    float minimapZoom = 1;
-    bool drawZoneLights = false;
-    bool drawAreaLights = false;
-
     int currentTime = 0;
 
     int  threadCount = 4;
     int  quickSortCutoff = 100;
-    float prevMinimapZoom = 1;
-    float prevZoomedSize = 0;
-    int prevMapId = -1;
-    bool isWmoMap = false;
 
     bool pauseAnimation = true;
 
@@ -161,22 +124,8 @@ class FrontendUI : public IScene, public std::enable_shared_from_this<FrontendUI
     int glowSource = 0;
     float customGlow = 0.0;
 
-
-
-    MapRecord prevMapRec;
-
-    float worldPosX = 0;
-    float worldPosY = 0;
-    float worldPosZ = 0;
-
     HApiContainer m_api;
 
-    HWdtFile m_wdtFile = nullptr;
-
-    std::vector<MapRecord> mapList = {};
-    std::vector<MapRecord> filteredMapList = {};
-    std::vector<std::vector<std::string>> mapListStringMap = {};
-
     int lastWidth = 100;
     int lastHeight = 100;
 
@@ -194,6 +143,7 @@ class FrontendUI : public IScene, public std::enable_shared_from_this<FrontendUI
     std::shared_ptr<IExporter> exporter;
     int exporterFramesReady = 0;
 
+    std::shared_ptr<MapSelectDialog> m_mapSelectDialog = nullptr;
     std::shared_ptr<MinimapGenerationWindow> m_minimapGenerationWindow = nullptr;
     std::shared_ptr<BLPViewer> m_blpViewerWindow = nullptr;
     std::shared_ptr<BLPViewer> m_blpFileViewerWindow = nullptr;
@@ -240,10 +190,10 @@ class FrontendUI : public IScene, public std::enable_shared_from_this<FrontendUI
     void showMapConstructionDialog();
     void showMakeScreenshotDialog();
 
-    void showAdtSelectionMinimap();
     void showSettingsDialog();
     void showQuickLinksDialog();
 
+    void showModeControls(const std::string &groupName, EParameterSource &source, bool allowM2AsSource = false);
     void showCurrentStatsDialog();
     void showBlpViewer();
     void showM2Viewer();