OpenSiv3D 0.3.1に対応

.gitignore

@@ -615,7 +615,9 @@ tags
 
 ### Electric Revolution
 *_log.html
+*.exe
 /Electric-Revolution/Intermediate/Release-x86
 /Electric-Revolution/Release-x86
 /Electric-Revolution/Intermediate/Release-x64
 /Electric-Revolution/Release-x64
+/Intermediate

Electric-Revolution/App/AS_DEBUG/stats.txt

@@ -0,0 +1,207 @@
+
+Total count
+
+Never executed
+PopPtr    
+PshGPtr   
+PshC4     
+PshV4     
+PSF       
+SwapPtr   
+NOT       
+PshG4     
+LdGRdR4   
+CALL      
+RET       
+JMP       
+JZ        
+JNZ       
+JS        
+JNS       
+JP        
+JNP       
+TZ        
+TNZ       
+TS        
+TNS       
+TP        
+TNP       
+NEGi      
+NEGf      
+NEGd      
+INCi16    
+INCi8     
+DECi16    
+DECi8     
+INCi      
+DECi      
+INCf      
+DECf      
+INCd      
+DECd      
+IncVi     
+DecVi     
+BNOT      
+BAND      
+BOR       
+BXOR      
+BSLL      
+BSRL      
+BSRA      
+COPY      
+PshC8     
+PshVPtr   
+RDSPtr    
+CMPd      
+CMPu      
+CMPf      
+CMPi      
+CMPIi     
+CMPIf     
+CMPIu     
+JMPP      
+PopRPtr   
+PshRPtr   
+STR       
+CALLSYS   
+CALLBND   
+SUSPEND   
+ALLOC     
+FREE      
+LOADOBJ   
+STOREOBJ  
+GETOBJ    
+REFCPY    
+CHKREF    
+GETOBJREF 
+GETREF    
+PshNull   
+ClrVPtr   
+OBJTYPE   
+TYPEID    
+SetV4     
+SetV8     
+ADDSi     
+CpyVtoV4  
+CpyVtoV8  
+CpyVtoR4  
+CpyVtoR8  
+CpyVtoG4  
+CpyRtoV4  
+CpyRtoV8  
+CpyGtoV4  
+WRTV1     
+WRTV2     
+WRTV4     
+WRTV8     
+RDR1      
+RDR2      
+RDR4      
+RDR8      
+LDG       
+LDV       
+PGA       
+CmpPtr    
+VAR       
+iTOf      
+fTOi      
+uTOf      
+fTOu      
+sbTOi     
+swTOi     
+ubTOi     
+uwTOi     
+dTOi      
+dTOu      
+dTOf      
+iTOd      
+uTOd      
+fTOd      
+ADDi      
+SUBi      
+MULi      
+DIVi      
+MODi      
+ADDf      
+SUBf      
+MULf      
+DIVf      
+MODf      
+ADDd      
+SUBd      
+MULd      
+DIVd      
+MODd      
+ADDIi     
+SUBIi     
+MULIi     
+ADDIf     
+SUBIf     
+MULIf     
+SetG4     
+ChkRefS   
+ChkNullV  
+CALLINTF  
+iTOb      
+iTOw      
+SetV1     
+SetV2     
+Cast      
+i64TOi    
+uTOi64    
+iTOi64    
+fTOi64    
+dTOi64    
+fTOu64    
+dTOu64    
+i64TOf    
+u64TOf    
+i64TOd    
+u64TOd    
+NEGi64    
+INCi64    
+DECi64    
+BNOT64    
+ADDi64    
+SUBi64    
+MULi64    
+DIVi64    
+MODi64    
+BAND64    
+BOR64     
+BXOR64    
+BSLL64    
+BSRL64    
+BSRA64    
+CMPi64    
+CMPu64    
+ChkNullS  
+ClrHi     
+JitEntry  
+CallPtr   
+FuncPtr   
+LoadThisR 
+PshV8     
+DIVu      
+MODu      
+DIVu64    
+MODu64    
+LoadRObjR 
+LoadVObjR 
+RefCpyV   
+JLowZ     
+JLowNZ    
+AllocMem  
+SetListSiz
+PshListElm
+SetListTyp
+POWi      
+POWu      
+POWf      
+POWd      
+POWdi     
+POWi64    
+POWu64    
+Thiscall1 
+
+Sequences

Electric-Revolution/Resource.rc → Electric-Revolution/App/Resource.rc

@@ -1,11 +1,12 @@
 //////////////////////////////////////////////////////
-//
-// Siv3D Engine Resources
-//
-//////////////////////////////////////////////////////
 # define DefineResource(identifier,type,path) identifier type #path
 # define Resource(path) DefineResource(path, FILE, path)
 
+//////////////////////////////////////////////////////
+//
+// Siv3D Engine Resources (DO NOT REMOVE)
+//
+//////////////////////////////////////////////////////
 DefineResource(100, ICON, icon.ico)
 Resource(engine/shader/sprite.vs)
 Resource(engine/shader/shape.ps)
@@ -23,10 +24,9 @@ Resource(engine/texture/box-shadow/8.png)
 
 //////////////////////////////////////////////////////
 //
-// Siv3D Engine Optional Resources
+// Siv3D Engine Optional Resources (Can be removed if not required)
 //
 //////////////////////////////////////////////////////
-
 Resource(engine/font/mplus/mplus-1p-thin.ttf.zst)
 Resource(engine/font/mplus/mplus-1p-light.ttf.zst)
 Resource(engine/font/mplus/mplus-1p-medium.ttf.zst)
@@ -35,26 +35,36 @@ Resource(engine/font/mplus/mplus-1p-heavy.ttf.zst)
 Resource(engine/font/mplus/mplus-1p-black.ttf.zst)
 Resource(engine/font/noto/NotoColorEmoji.ttf.zst)
 Resource(engine/font/noto/NotoEmoji-Regular.ttf.zst)
-Resource(engine/font/fontawesome/FontAwesome.otf.zst)
+Resource(engine/font/fontawesome/brands.otf.zst)
+Resource(engine/font/fontawesome/solid.otf.zst)
+Resource(engine/objdetect/haarcascade/eye.xml.zst)
+Resource(engine/objdetect/haarcascade/eye_eyeglasses.xml.zst)
+Resource(engine/objdetect/haarcascade/face_anime.xml.zst)
+Resource(engine/objdetect/haarcascade/frontal_catface.xml.zst)
+Resource(engine/objdetect/haarcascade/frontal_face_alt2.xml.zst)
+Resource(engine/soundfont/GMGSx.sf2.zst)
 
 //////////////////////////////////////////////////////
 //
-// Siv3D App Resources
+// Siv3D App Resources (Your application resources here)
 //
 //////////////////////////////////////////////////////
 
+
+
 /* 
-// Pass your resource path to Resource() macro.
-// No double quotation marks and white spaces may appear.
-Resource(example/siv3d-kun.png)		// ok
-Resource(example/windmill.png)		// ok
-Resource(assets/a b c.txt)			// error: contains white spaces
-Resource("example/windmill.png")	// error: contains double quotation marks
+	//
+	// Define your resource path inside `Resource()` macro.
+	// No double quotation marks and white spaces may appear.
+	//
+	Resource(example/siv3d-kun.png)		// ok
+	Resource(example/windmill.png)		// ok
+	Resource(assets/a b c.txt)			// error: contains white spaces
+	Resource("example/windmill.png")	// error: contains double quotation marks
 
-// If your file contains a white space, define an alternative 
-// identifier without using Resource() macro.
-MYIDENTIFIER_1 FILE "assets/a b c.txt"
-MYIDENTIFIER_2 FILE "level 1/map.dat"
+	//
+	// If your file contains a white space, define the identifier without using Resource() macro.
+	//
+	MYIDENTIFIER_1 FILE "assets/a b c.txt"
+	MYIDENTIFIER_2 FILE "level 1/map.dat"
 */
-
-Resource(engine/engine.txt)

Electric-Revolution/App/engine/font/fontawesome/LICENSE.txt

@@ -0,0 +1,34 @@
+Font Awesome Free License
+-------------------------
+
+Font Awesome Free is free, open source, and GPL friendly. You can use it for
+commercial projects, open source projects, or really almost whatever you want.
+Full Font Awesome Free license: https://fontawesome.com/license.
+
+# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
+In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
+packaged as SVG and JS file types.
+
+# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)
+In the Font Awesome Free download, the SIL OLF license applies to all icons
+packaged as web and desktop font files.
+
+# Code: MIT License (https://opensource.org/licenses/MIT)
+In the Font Awesome Free download, the MIT license applies to all non-font and
+non-icon files.
+
+# Attribution
+Attribution is required by MIT, SIL OLF, and CC BY licenses. Downloaded Font
+Awesome Free files already contain embedded comments with sufficient
+attribution, so you shouldn't need to do anything additional when using these
+files normally.
+
+We've kept attribution comments terse, so we ask that you do not actively work
+to remove them from files, especially code. They're a great way for folks to 
+learn about Font Awesome.
+
+# Brand Icons
+All brand icons are trademarks of their respective owners. The use of these
+trademarks does not indicate endorsement of the trademark holder by Font
+Awesome, nor vice versa. **Please do not use brand logos for any purpose except
+to represent the company, product, or service to which they refer.**

Electric-Revolution/engine/font/mplus/LICENSE_E → Electric-Revolution/App/engine/font/mplus/LICENSE_E

@@ -1,4 +1,4 @@
-M+ FONTS                                Copyright (C) 2002-2016 M+ FONTS PROJECT
+M+ FONTS                                Copyright (C) 2002-2017 M+ FONTS PROJECT
 
 -
 
@@ -13,4 +13,4 @@ or without modification, either commercially or noncommercially.
 THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
 
 
-http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/
+http://mplus-fonts.osdn.jp