Просмотр исходного кода

Fixed bindings issue with UI module, fixed player crashing on quit on Mac, fixed colors in IDE console

Ivan Safrin 12 лет назад
Родитель
Сommit
42108bb57b

+ 1 - 1
Bindings/Scripts/create_lua_library/create_lua_library.py

@@ -148,7 +148,7 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 	# Iterate, process each input file
 	# Iterate, process each input file
 	for fileName in filteredFiles:
 	for fileName in filteredFiles:
 		# "Package owned" classes that ship with Polycode
 		# "Package owned" classes that ship with Polycode
-		inheritInModule = ["PhysicsEntity", "CollisionScene", "CollisionEntity", "UIElement", "UIWindow", "UIMenuItem"]
+		inheritInModule = ["PhysicsEntity", "CollisionScene", "CollisionEntity", "UIElement", "UIWindow", "UIMenuItem", "UIImage", "UIRect"]
 		
 		
 		# A file or comma-separated list of files can be given to specify classes which are "package owned"
 		# A file or comma-separated list of files can be given to specify classes which are "package owned"
 		# and should not be inherited out of Polycode/. The files should contain one class name per line,
 		# and should not be inherited out of Polycode/. The files should contain one class name per line,

+ 4 - 3
IDE/Contents/Source/PolycodeConsole.cpp

@@ -42,7 +42,7 @@ BackTraceEntry::BackTraceEntry(String fileName, int lineNumber, PolycodeProject
 
 
 	labelBg = new UIRect(20,20);
 	labelBg = new UIRect(20,20);
 	labelBg->setAnchorPoint(-1.0, -1.0, 0.0);
 	labelBg->setAnchorPoint(-1.0, -1.0, 0.0);
-	labelBg->setColor(0.0, 0.0, 0.0, 0.15);
+	labelBg->setColor(0.3, 0.3, 0.3, 1.0);
 	labelBg->processInputEvents = true;
 	labelBg->processInputEvents = true;
 	addChild(labelBg);	
 	addChild(labelBg);	
 	
 	
@@ -70,11 +70,12 @@ void BackTraceEntry::Select() {
 	
 	
 	dispatchEvent(event, BackTraceEvent::EVENT_BACKTRACE_SELECTED);
 	dispatchEvent(event, BackTraceEvent::EVENT_BACKTRACE_SELECTED);
 		
 		
-	labelBg->setColor(0.0, 0.0, 1.0, 0.35);
+	labelBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiAccentColor"));
+    
 }
 }
 
 
 void BackTraceEntry::Deselect() {
 void BackTraceEntry::Deselect() {
-	labelBg->setColor(0.0, 0.0, 0.0, 0.15);
+	labelBg->setColor(0.3, 0.3, 0.3, 1.0);
 }
 }
 
 
 
 

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

@@ -2677,7 +2677,7 @@ void MaterialPropSheet::setSceneMesh(SceneMesh *sceneMesh) {
     
     
     if(sceneMesh) {
     if(sceneMesh) {
         enabled = true;
         enabled = true;
-        reloadMaterials();
+        reloadMaterials();        
     } else {
     } else {
         enabled = false;
         enabled = false;
     }
     }

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

@@ -61,7 +61,7 @@ void PolycodeRemoteDebugger::handleEvent(Event *event) {
 		ServerEvent *serverEvent = (ServerEvent*) event;	
 		ServerEvent *serverEvent = (ServerEvent*) event;	
 		switch(event->getEventCode()) {
 		switch(event->getEventCode()) {
 			case ServerEvent::EVENT_CLIENT_DATA:		
 			case ServerEvent::EVENT_CLIENT_DATA:		
-			{	
+			{
 				switch(serverEvent->dataType) {			
 				switch(serverEvent->dataType) {			
 					case EVENT_DEBUG_PRINT:
 					case EVENT_DEBUG_PRINT:
 					{
 					{

+ 0 - 1
Player/Contents/Platform/Darwin/MyDocument.mm

@@ -70,7 +70,6 @@ THE SOFTWARE.
 		printf("DESTROYING PLAYER");
 		printf("DESTROYING PLAYER");
 		playerRunning = false;
 		playerRunning = false;
 		[timer invalidate];
 		[timer invalidate];
-		[timer release];	
 		delete player;
 		delete player;
 		delete playerProxy;	
 		delete playerProxy;	
 		player = NULL;
 		player = NULL;