Commit: 4f1dcc84b9671f7e906260907aa954d914972add - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Revision: 4f1dcc84b9671f7e906260907aa954d914972add (tree)
• Zeit: 2019-07-19 18:29:52
• Autor: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

Windblade氏の更新に対応

Ändern Zusammenfassung

• modified: src/main.go
• modified: src/render.go
• modified: src/system.go

Diff

--- a/src/main.go
+++ b/src/main.go
@@ -90,19 +90,19 @@ func main() {
   "LifebarFontScale":1,
   "System":"script/main.lua",
   "KeyConfig":[{
-      "Joystick":-1,
-      "Buttons":["UP","DOWN","LEFT","RIGHT","z","x","c","a","s","d","RETURN","q","w"]
-    },{
-      "Joystick":-1,
-      "Buttons":["t","g","f","h","j","k","l","u","i","o","RSHIFT","LEFTBRACKET","RIGHTBRACKET"]
-    }],
+	  "Joystick":-1,
+	  "Buttons":["UP","DOWN","LEFT","RIGHT","z","x","c","a","s","d","RETURN","q","w"]
+	},{
+	  "Joystick":-1,
+	  "Buttons":["t","g","f","h","j","k","l","u","i","o","RSHIFT","LEFTBRACKET","RIGHTBRACKET"]
+	}],
   "JoystickConfig":[{
-      "Joystick":0,
-      "Buttons":["-7","-8","-5","-6","0","1","4","2","3","5","7","6","8"]
-    },{
-      "Joystick":1,
-      "Buttons":["-7","-8","-5","-6","0","1","4","2","3","5","7","6","8"]
-    }],
+	  "Joystick":0,
+	  "Buttons":["-7","-8","-5","-6","0","1","4","2","3","5","7","6","8"]
+	},{
+	  "Joystick":1,
+	  "Buttons":["-7","-8","-5","-6","0","1","4","2","3","5","7","6","8"]
+	}],
   "Motif":"data/system.def",
   "CommonAir":"data/common.air",
   "CommonCmd":"data/common.cmd",
@@ -133,26 +133,27 @@ func main() {
   "AllowDebugKeys":true,
   "PostProcessingShader": 0,
   "LocalcoordScalingType": 1,
+  "MSAA": false,
   "IP":{
   }
 }
 `, "\n"), "\r\n"))
 	tmp := struct {
-		HelperMax              int32
-		PlayerProjectileMax    int
-		ExplodMax              int
-		AfterImageMax          int32
-		MasterVolume           int
-		WavVolume              int
-		BgmVolume              int
-		Attack_LifeToPowerMul  float32 `json:"Attack.LifeToPowerMul"`
-		GetHit_LifeToPowerMul  float32 `json:"GetHit.LifeToPowerMul"`
-		Width                  int32
-		Height                 int32
-		Super_TargetDefenceMul float32 `json:"Super.TargetDefenceMul"`
-		LifebarFontScale       float32
-		System                 string
-		KeyConfig              []struct {
+		HelperMax				int32
+		PlayerProjectileMax		int
+		ExplodMax				int
+		AfterImageMax			int32
+		MasterVolume			int
+		WavVolume				int
+		BgmVolume               int
+		Attack_LifeToPowerMul	float32 `json:"Attack.LifeToPowerMul"`
+		GetHit_LifeToPowerMul	float32 `json:"GetHit.LifeToPowerMul"`
+		Width					int32
+		Height					int32
+		Super_TargetDefenceMul	float32 `json:"Super.TargetDefenceMul"`
+		LifebarFontScale		float32
+		System					string
+		KeyConfig				[]struct {
 			Joystick int
 			Buttons  []interface{}
 		}
@@ -160,17 +161,18 @@ func main() {
 			Joystick int
 			Buttons  []interface{}
 		}
-		NumTag                int
-		TeamLifeShare         bool
-		AIRandomColor         bool
-		Fullscreen            bool
-		AudioDucking          bool
-		AllowDebugKeys        bool
-		PostProcessingShader  int32
-		LocalcoordScalingType int32
-		CommonAir             string
-		CommonCmd             string
-		QuickLaunch           int
+		NumTag					int
+		TeamLifeShare			bool
+		AIRandomColor			bool
+		Fullscreen				bool
+		AudioDucking			bool
+		AllowDebugKeys			bool
+		MSAA					bool
+		PostProcessingShader	int32
+		LocalcoordScalingType	int32
+		CommonAir				string
+		CommonCmd				string
+		QuickLaunch				int
 	}{}
 	chk(json.Unmarshal(defcfg, &tmp))
 	const configFile = "data/config.json"
@@ -234,6 +236,7 @@ func main() {
 	sys.teamLifeShare = tmp.TeamLifeShare
 	sys.fullscreen = tmp.Fullscreen
 	sys.PostProcessingShader = tmp.PostProcessingShader
+	sys.MultisampleAntialiasing = tmp.MSAA
 	sys.LocalcoordScalingType = tmp.LocalcoordScalingType
 	sys.aiRandomColor = tmp.AIRandomColor
 	sys.allowDebugKeys = tmp.AllowDebugKeys

--- a/src/render.go
+++ b/src/render.go
@@ -21,7 +21,12 @@ var indices = [4]int32{1, 2, 0, 3}
 
 // Post-processing
 var fbo, fbo_texture uint32
+
+// Clasic AA
+var rbo_depth uint32
+// MSAA
 var fbo_f, fbo_f_texture uint32
+
 var postShader uintptr
 var postVertAttrib int32
 var postTexUniform int32
@@ -199,33 +204,60 @@ func RenderInit() {
 	gl.DeleteObjectARB(vertObj)
 	gl.DeleteObjectARB(fragObj)
 
-	gl.Enable(gl.MULTISAMPLE)
+	if sys.MultisampleAntialiasing {
+		gl.Enable(gl.MULTISAMPLE)
+	}
 
 	gl.ActiveTexture(gl.TEXTURE0)
 	gl.GenTextures(1, &fbo_texture)
-	gl.BindTexture(gl.TEXTURE_2D_MULTISAMPLE, fbo_texture)
+
+	if sys.MultisampleAntialiasing {
+		gl.BindTexture(gl.TEXTURE_2D_MULTISAMPLE, fbo_texture)
+	} else {
+		gl.BindTexture(gl.TEXTURE_2D, fbo_texture)
+	}
+
 	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST)
 	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST)
 	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE)
 	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE)
-	gl.TexImage2DMultisample(gl.TEXTURE_2D_MULTISAMPLE, 16, gl.RGBA, sys.scrrect[2], sys.scrrect[3], false)
+	
+	if sys.MultisampleAntialiasing {
+		gl.TexImage2DMultisample(gl.TEXTURE_2D_MULTISAMPLE, 16, gl.RGBA, sys.scrrect[2], sys.scrrect[3], false)
+	} else {
+		gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RGBA, sys.scrrect[2], sys.scrrect[3], 0, gl.RGBA, gl.UNSIGNED_BYTE, nil)
+	}
+
 	gl.BindTexture(gl.TEXTURE_2D, 0)
 
-	gl.GenTextures(1, &fbo_f_texture)
-	gl.BindTexture(gl.TEXTURE_2D, fbo_f_texture)
-	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST)
-	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST)
-	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE)
-	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE)
-	gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RGBA, sys.scrrect[2], sys.scrrect[3], 0, gl.RGBA, gl.UNSIGNED_BYTE, nil)
+	if sys.MultisampleAntialiasing {
+		gl.GenTextures(1, &fbo_f_texture)
+		gl.BindTexture(gl.TEXTURE_2D, fbo_f_texture)
+		gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST)
+		gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST)
+		gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE)
+		gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE)
+		gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RGBA, sys.scrrect[2], sys.scrrect[3], 0, gl.RGBA, gl.UNSIGNED_BYTE, nil)
+	} else {
+		gl.GenRenderbuffers(1, &rbo_depth)
+		gl.BindRenderbuffer(gl.RENDERBUFFER, rbo_depth)
+		gl.RenderbufferStorage(gl.RENDERBUFFER, gl.DEPTH_COMPONENT16, sys.scrrect[2], sys.scrrect[3])
+		gl.BindRenderbuffer(gl.RENDERBUFFER, 0)
+	}
 
 	gl.GenFramebuffers(1, &fbo)
 	gl.BindFramebuffer(gl.FRAMEBUFFER, fbo)
-	gl.FramebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D_MULTISAMPLE, fbo_texture, 0)
 
-	gl.GenFramebuffers(1, &fbo_f)
-	gl.BindFramebuffer(gl.FRAMEBUFFER, fbo_f)
-	gl.FramebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, fbo_f_texture, 0)
+	if sys.MultisampleAntialiasing {
+		gl.FramebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D_MULTISAMPLE, fbo_texture, 0)
+
+		gl.GenFramebuffers(1, &fbo_f)
+		gl.BindFramebuffer(gl.FRAMEBUFFER, fbo_f)
+		gl.FramebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, fbo_f_texture, 0)
+	} else {
+		gl.FramebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, fbo_texture, 0)
+		gl.FramebufferRenderbuffer(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.RENDERBUFFER, rbo_depth)
+	}
 
 	gl.BindFramebuffer(gl.FRAMEBUFFER, 0)
 }
@@ -235,11 +267,14 @@ func bindFB() {
 }
 
 func unbindFB() {
-	gl.BindFramebuffer(gl.DRAW_FRAMEBUFFER, fbo_f)
-	gl.BindFramebuffer(gl.READ_FRAMEBUFFER, fbo)
-	gl.BlitFramebuffer(0, 0, sys.scrrect[2], sys.scrrect[3], 0, 0, sys.scrrect[2], sys.scrrect[3], gl.COLOR_BUFFER_BIT, gl.LINEAR)
+	if sys.MultisampleAntialiasing {
+		gl.BindFramebuffer(gl.DRAW_FRAMEBUFFER, fbo_f)
+		gl.BindFramebuffer(gl.READ_FRAMEBUFFER, fbo)
+		gl.BlitFramebuffer(0, 0, sys.scrrect[2], sys.scrrect[3], 0, 0, sys.scrrect[2], sys.scrrect[3], gl.COLOR_BUFFER_BIT, gl.LINEAR)
+	}
 
 	gl.BindFramebuffer(gl.FRAMEBUFFER, 0)
+	
 	postShader = postShaderSelect[sys.PostProcessingShader]
 
 	postVertAttrib = gl.GetAttribLocationARB(postShader, gl.Str("VertCoord\x00"))
@@ -248,7 +283,13 @@ func unbindFB() {
 
 	gl.Clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT)
 	gl.UseProgramObjectARB(postShader)
-	gl.BindTexture(gl.TEXTURE_2D, fbo_f_texture)
+	
+	if sys.MultisampleAntialiasing {
+		gl.BindTexture(gl.TEXTURE_2D, fbo_f_texture)
+	} else {
+		gl.BindTexture(gl.TEXTURE_2D, fbo_texture)
+	}
+
 	gl.Uniform1iARB(postTexUniform, 0)
 	gl.Uniform2fARB(postTexSizeUniform, float32(sys.scrrect[2]), float32(sys.scrrect[3]))
 	gl.EnableVertexAttribArrayARB(uint32(postVertAttrib))

--- a/src/system.go
+++ b/src/system.go
@@ -64,14 +64,15 @@ var sys = System{
 	keyInput:         glfw.KeyUnknown,
 	keyString:        "",
 	// Localcoord sceenpack
-	luaSpriteScale:        1,
-	luaSmallPortraitScale: 1,
-	luaBigPortraitScale:   1,
-	luaSpriteOffsetX:      0,
-	lifebarScale:          1,
-	lifebarOffsetX:        0,
+	luaSpriteScale:			1,
+	luaSmallPortraitScale:	1,
+	luaBigPortraitScale:	1,
+	luaSpriteOffsetX:		0,
+	lifebarScale:			1,
+	lifebarOffsetX:			0,
 	//Shader vars
-	PostProcessingShader: 0,
+	MultisampleAntialiasing: false,
+	PostProcessingShader:	0,
 }
 
 type TeamMode int32
@@ -256,6 +257,7 @@ type System struct {
 	LocalcoordScalingType int32
 
 	PostProcessingShader int32
+	MultisampleAntialiasing bool
 }
 
 func (s *System) init(w, h int32) *lua.LState {