Bläddra i källkod

Some more windows fixes and a debug assertion in PolyUITextInput.cpp (only multiline text inputs)

lunatix 12 år sedan
förälder
incheckning
b1f307b00c

+ 1 - 1
IDE/Contents/Source/PolycodeToolLauncher.cpp

@@ -157,7 +157,7 @@ String PolycodeToolLauncher::importAssets(String sourceFile, String inFolder, bo
 
 	
 #ifdef _WINDOWS
-	String targetFolder = projectBasePath;
+	String targetFolder = polycodeBasePath;
 	String command = "\""+polycodeBasePath+"/Standalone/Bin/polyimport.exe\"";
 	ret = CoreServices::getInstance()->getCore()->executeExternalCommand(command, args, targetFolder);
 #else

+ 19 - 0
IDE/Contents/Source/TrackballCamera.cpp

@@ -200,6 +200,8 @@ void TrackballCamera::updateCamera() {
 
 bool TrackballCamera::disableRotation(bool val) {
     rotationDisabled = val;
+
+	return true;
 }
 
 Vector3 TrackballCamera::getMouseProjectionOnBall(const Vector2 &mousePosition) {
@@ -227,3 +229,20 @@ Vector3 TrackballCamera::getMouseProjectionOnBall(const Vector2 &mousePosition)
 	
 	return projection;	
 }
+/*
+void TrackballCamera::setCameraPosition(Vector3 cameraPosition) {
+
+}
+    
+bool TrackballCamera::disableRotation(bool val) {
+	return false;
+}
+
+    
+Number TrackballCamera::getCameraDistance() {
+	return 0.0;
+}
+
+Vector3 TrackballCamera::getOribitingCenter() {
+	return Vector3();
+}*/

+ 2 - 2
Modules/Contents/UI/Source/PolyUITextInput.cpp

@@ -2338,8 +2338,8 @@ void UITextInput::updateWordWrap(int lineStart, int lineEnd) {
 		do {
 			wordWrapRangeEnd++;
 		}
-		
-		while(wordWrapLines[wordWrapRangeEnd].isWordWrap && wordWrapRangeEnd < wordWrapLines.size());
+		// put wordWrapLines[wordWrapRangeEnd] at the end, as wordWrapRangeEnd is "1" and throws an assertation in debug|win32|vc2012 if wordWrapLines.size() is "1"
+		while(wordWrapRangeEnd < wordWrapLines.size() && wordWrapLines[wordWrapRangeEnd].isWordWrap);
 		
 		wordWrapLines.erase(wordWrapLines.begin()+wordWrapRangeBegin, wordWrapLines.begin()+wordWrapRangeEnd);
 	}