iOS8対応

Bushin.xcodeproj/project.pbxproj

@@ -787,6 +787,7 @@
 					"$(SRCROOT)/../OgreSDK/include/OGRE/Paging",
 				);
 				INFOPLIST_FILE = "Bushin/Bushin-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(SRCROOT)/../OgreSDk/lib",
 					"$(SRCROOT)/../OgreSDk/lib/Release",
@@ -858,6 +859,7 @@
 					"$(SRCROOT)/../OgreSDK/include/OGRE/Paging",
 				);
 				INFOPLIST_FILE = "Bushin/Bushin-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(SRCROOT)/../OgreSDk/lib",
 					"$(SRCROOT)/../OgreSDk/lib/Release",

Bushin.xcodeproj/xcuserdata/miyazakisatoshi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -19,5 +19,31 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Bushin/src/engine/GameState.mm"
+            timestampString = "426862645.239406"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "71"
+            endingLineNumber = "71"
+            landmarkName = "InitialState::entry(GameBase* entity)"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            scope = "0"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

Bushin/src/AppDelegate.mm

@@ -104,7 +104,7 @@
 
 - (void)applicationWillResignActive:(UIApplication *)application
 {
-    Ogre::Root::getSingleton().saveConfig();
+    //Ogre::Root::getSingleton().saveConfig();
     [mDate release];
     mDate=nil;
     

Bushin/src/engine/FacilityBuildView.m

@@ -175,6 +175,7 @@
     UIAlertView* alertView=[[UIAlertView alloc] initWithTitle:@"建設メニュ" message:@"建設します。よろしいですか？" delegate:self cancelButtonTitle:@"いいえ" otherButtonTitles:@"はい", nil];
     [alertView autorelease];
     [alertView show];
+    //[alertView release];
 }
 
 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex

Bushin/src/engine/GameBase.mm

@@ -97,17 +97,17 @@ namespace vsLib { namespace gameBase {
         // Show the configuration dialog and initialise the system
         // You can skip this and use root.restoreConfig() to load configuration
         // settings if you were sure there are valid ones saved in ogre.cfg
-        if(mRoot->showConfigDialog())
+        //if(mRoot->showConfigDialog())
         {
             // If returned true, user clicked OK so initialise
             // Here we choose to let the system create a default rendering window by passing 'true'
             mWindow = mRoot->initialise(true);
             return true;
         }
-        else
-        {
-            return false;
-        }
+        //else
+        //{
+        //    return false;
+        //}
     }
 
     void GameBase::chooseSceneManager(void)

Bushin/src/engine/GameState.mm

@@ -67,8 +67,9 @@ namespace vsLib { namespace gameBase {
 #endif
 #endif
 		
-        entity->mRoot = OGRE_NEW Root(pluginsPath,
-                              entity->mConfigPath + "ogre.cfg", entity->mResourcePath + "Ogre.log");
+        //entity->mRoot = OGRE_NEW Root(pluginsPath,entity->mConfigPath + "ogre.cfg", entity->mResourcePath + "Ogre.log");
+        entity->mRoot = OGRE_NEW Root(pluginsPath,entity->mConfigPath + "ogre.cfg", entity->mResourcePath + "Ogre.log");
+        
 		entity->mOverlaySystem = OGRE_NEW OverlaySystem();
 #ifdef OGRE_STATIC_LIB
 		entity->mStaticPluginLoader.load();

Bushin/src/engine/MainViewController.mm

@@ -49,10 +49,11 @@
     self.view.transform=view.transform;
     self.view.frame=view.frame;
     //self.view.frame=CGRectMake(0, 0, 500, 500);
-    //self.view.backgroundColor=[UIColor colorWithRed:0.3f green:0.3f blue:0.3f alpha:0.2f];
+    //self.view.backgroundColor=[UIColor blueColor];
 
 
-    UIView* tapView=[[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.height, self.view.frame.size.width-menuHeight)];
+    //UIView* tapView=[[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.height, self.view.frame.size.width-menuHeight)];
+    UIView* tapView=[[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height-menuHeight)];
     [self.view addSubview: tapView];
     [tapView release];
     UITapGestureRecognizer *recognizer = [[[UITapGestureRecognizer alloc] initWithTarget:self
@@ -86,11 +87,13 @@
     titleLabel.textColor=[UIColor whiteColor];
     titleLabel.font=[UIFont boldSystemFontOfSize:30];
     
-    m_menuView=[[MenuView alloc] initWithFrame:CGRectMake(0, self.view.frame.size.width-menuHeight, self.view.frame.size.height, menuHeight)];
+    //m_menuView=[[MenuView alloc] initWithFrame:CGRectMake(0, self.view.frame.size.width-menuHeight, self.view.frame.size.height, menuHeight)];
+    m_menuView=[[MenuView alloc] initWithFrame:CGRectMake(0, self.view.frame.size.height-menuHeight, self.view.frame.size.width, menuHeight)];
     m_menuView->delegate=self;
     [self.view addSubview:m_menuView];
-    
-    FacilitySelectMenuView* facilitySelectMenuView=[[FacilitySelectMenuView alloc] initWithFrame:CGRectMake(0, self.view.frame.size.width-menuHeight, self.view.frame.size.height, menuHeight)];
+
+    //FacilitySelectMenuView* facilitySelectMenuView=[[FacilitySelectMenuView alloc] initWithFrame:CGRectMake(0, self.view.frame.size.width-menuHeight, self.view.frame.size.height, menuHeight)];
+    FacilitySelectMenuView* facilitySelectMenuView=[[FacilitySelectMenuView alloc] initWithFrame:CGRectMake(0, self.view.frame.size.height-menuHeight, self.view.frame.size.width, menuHeight)];
     facilitySelectMenuView->delegate=self;
     [self.view addSubview:facilitySelectMenuView];
     facilitySelectMenuView.hidden=YES;
@@ -207,7 +210,8 @@
     backButton.hidden=YES;
     m_menuView.hidden=YES;
     
-    m_deckView=[[DeckView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.height,self.view.frame.size.width)];
+    //m_deckView=[[DeckView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.height,self.view.frame.size.width)];
+    m_deckView=[[DeckView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height)];
     [self.view addSubview:m_deckView];
     m_deckView.delegate=self;
     titleLabel.text=@"";
@@ -381,7 +385,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupDousensho];
 }
 
@@ -404,7 +410,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupSouko];
 }
 
@@ -427,7 +435,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupHatake];
 }
 
@@ -450,7 +460,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupMinka];
 }
 
@@ -473,7 +485,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupMine];
 
 }
@@ -497,7 +511,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupBookShop];
     
 }
@@ -521,7 +537,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupWeaponShop];
 }
 
@@ -544,7 +562,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupProtectorShop];
 }
 
@@ -561,7 +581,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupHotel];
 }
 
@@ -584,7 +606,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupAlter];
 }
 
@@ -607,7 +631,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupGreatBuddha];
 }
 
@@ -630,7 +656,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupBar];
 }
 
@@ -653,7 +681,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupMilitalyLabo];
     
 }
@@ -677,7 +707,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupAntiquMarket];
     
 }
@@ -701,7 +733,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupMahjong];
  
 }
@@ -725,7 +759,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupWholeSaler];
    
 }
@@ -749,7 +785,9 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    //aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupDaihanten];
     
 }
@@ -773,7 +811,8 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupKabukiza];
    
 }
@@ -797,7 +836,8 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupExpeditionTradeSchool];
     
 }
@@ -821,7 +861,8 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupFireAlter];
    
 }
@@ -845,7 +886,8 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupWaterAlter];
    
 }
@@ -869,7 +911,8 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupWindAlter];
     
 }
@@ -893,7 +936,8 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupEarthAlter];
     
 }
@@ -917,7 +961,8 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupLightAlter];
     
 }
@@ -941,7 +986,8 @@
         aView.tag=FICILITYBUILDVIEW;
         aView->delegate=self;
     }
-    aView.center=CGPointMake(self.view.frame.size.height/2,self.view.frame.size.width/2);
+    aView.hidden=NO;
+    aView.center=CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2);
     [aView setupDarkAlter];
     
 }
@@ -954,7 +1000,10 @@
     }
     FacilityBuildView* aView=(FacilityBuildView*)[self.view viewWithTag:FICILITYBUILDVIEW];
     if(aView){
-        [aView removeFromSuperview];
+        //[aView removeFromSuperview];
+        //[aView performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:0.1f];
+        //aView=nil;
+        aView.hidden=YES;
     }
     if(selectedFacility!=NULL){
         if(buildType==1){