Merge branch 'release/2.3.0'

steptosky · Oct 5, 2017 · 92c6644 · 92c6644
2 parents 6df1dbe + 80dd9c5
commit 92c6644
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 23 deletions.
diff --git a/cmake/StsProjectDesc.cmake b/cmake/StsProjectDesc.cmake
@@ -83,8 +83,8 @@ set(ProjectSourcesWebLink "https://github.com/steptosky/3DsMax-XplnObj")
 # Version / Dependency's system
 
 set(ProjectVersionMajor 2)
-set(ProjectVersionMinor 2)
-set(ProjectVersionPatch 1)
+set(ProjectVersionMinor 3)
+set(ProjectVersionPatch 0)
 set(ProjectVersion "${ProjectVersionMajor}.${ProjectVersionMinor}.${ProjectVersionPatch}")
 set(ProjectReleaseType "") # You can use any string you wish
 

diff --git a/conanfile.txt b/conanfile.txt
@@ -1,5 +1,5 @@
 [requires]
-XplnObj/0.4.1@steptosky/stable
+XplnObj/0.5.0@steptosky/stable
 3DsMaxSdk9/last@steptosky/stable
 3DsMaxSdk2008/last@steptosky/stable
 3DsMaxSdk2009/last@steptosky/stable

diff --git a/doc/changelog.txt b/doc/changelog.txt
@@ -1,5 +1,14 @@
 
 The 3DsMax X-Plane Obj Exporter/Importer change-log.
+===============================================================================
+2.3.0 (05.10.2017)
+
+- Added: Error if any LOD except the first one contains hard polygons.
+- Added: Auto-flip normals for objects with mirrored transformation.
+- Fixed: GUI for the light param.
+- Fixed: Creating two sided mesh.
+- Fixed: Printing custom name of the LIGHT_PARAM.
+
 ===============================================================================
 2.2.1 (26.08.2017)
 

diff --git a/doc/release-checklist.md b/doc/release-checklist.md
@@ -1,7 +1,7 @@
 ## Documentation
 - Check whether this release-checklist is correct.
 - Check whether the [install.txt](install.txt) is correct.
-- Check whether the [changelog.txt](changelog.txt) is correct.
+- Check whether the [changelog.txt](changelog.txt) is correct, copy necessary information from the XplnObj library.
 - Check whether the variables of the build system (CMake) are described correctly if they were changed, deleted, added.
 - Check whether the dependencies and their version are described correctly in the [readme.md](../readme.md) file. 
 

diff --git a/readme.md b/readme.md
@@ -12,7 +12,7 @@ The importing is still under developing and does not work correctly!
 
 ## Dependencies
 - [CMake 3.7.0+](https://cmake.org/)
-- [Conan 0.25+](https://www.conan.io) - dependency tool
+- [Conan 0.27+](https://www.conan.io) - dependency tool
 - [StepToSky X-Plane obj library](https://github.com/steptosky/XplnObj) - used through the conan
 - 3Ds Max SDK - Usually you can find it on 3Ds Max installation cd or image
 

diff --git a/src/common/Logger.cpp b/src/common/Logger.cpp
@@ -188,7 +188,7 @@ void Logger::createVersionStrings() {
 	mVersionShortString = strstream.str();
 
 	strstream << "+" << XIO_VCS_REVISION << " (" << XIO_VCS_BRANCH << ") " << XIO_COMPILE_DATE;
-#ifndef NDEBAG
+#ifndef NDEBUG
 	strstream << " (" << XIO_COMPILE_TIME << ") " << "DEBUG";
 #endif
 

diff --git a/src/ui/light/LightParam.cpp b/src/ui/light/LightParam.cpp
@@ -71,7 +71,7 @@ namespace ui {
 						if (HIWORD(wParam) == CBN_SELCHANGE) {
 							if (theDlg->isUiCustom()) {
 								theDlg->setCustFieldEnable(true);
-								theDlg->mData->setLightId(xobj::ELightParams::fromUiString(sts::toMbString(UiUtilities::getText(theDlg->cEdtCustomName)).c_str()));
+								theDlg->mData->setLightId(xobj::ELightParams(xobj::ELightParams::light_params_custom));
 								theDlg->eventParamChanged(true);
 							}
 							else {
@@ -194,18 +194,6 @@ namespace ui {
 		}
 	}
 
-	void LightParam::toData() {
-		if (isUiCustom()) {
-			mData->setLightId(xobj::ELightParams(xobj::ELightParams::light_params_custom));
-			mData->setLightName(sts::toMbString(UiUtilities::getText(cEdtCustomName)));
-		}
-		else {
-			mData->setLightId(xobj::ELightParams(xobj::ELightParams::none));
-			mData->setLightName(sts::toMbString(cCmbName.currSelectedText()).c_str());
-		}
-		mData->setAdditionalParams(sts::toMbString(UiUtilities::getText(cEdtAdditional)));
-	}
-
 	/**************************************************************************************************/
 	///////////////////////////////////////////* Functions *////////////////////////////////////////////
 	/**************************************************************************************************/
@@ -231,8 +219,8 @@ namespace ui {
 		cStcCust.enable(status);
 	}
 
-	bool LightParam::isUiCustom() {
-		return cCmbName.currSelectedText() == sts::toString(xobj::ELightParams(xobj::ELightParams::light_params_custom).toString());
+	bool LightParam::isUiCustom() const {
+		return cCmbName.currSelectedText() == sts::toString(xobj::ELightParams(xobj::ELightParams::light_params_custom).toUiString());
 	}
 
 	/**************************************************************************************************/

diff --git a/src/ui/light/LightParam.h b/src/ui/light/LightParam.h
@@ -64,13 +64,12 @@ namespace ui {
 		void destroyWindow(HWND hWnd);
 
 		void toWindow();
-		void toData();
 
 		void enableControls();
 		void disableControls();
 
 		void setCustFieldEnable(bool status);
-		bool isUiCustom();
+		bool isUiCustom() const;
 
 		xobj::ObjLightParam * mData = nullptr;
 		win::Base mHwnd;