curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 11:34:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

wall now uses terrain tileset

Browse Source 
Former-commit-id: 13b5389d905c1c302ec4e7991fbfdd06ed333814
Former-commit-id: 1416055d9aa0755147c461512f9b638e25df908e
This commit is contained in:
Song Minjae
2017-01-09 22:56:15 +09:00
parent 0b7485fd57
commit 0f8f64cddf
17 changed files with 72 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/net/torvald/terrarum/StateInGame.kt
View File

@@ -291,7 +291,12 @@ constructor() : BasicGameState() {
blendNormal()
drawSkybox(worldDrawFrameBuffer.graphics)
drawSkybox(gwin)
/*drawSkybox(worldDrawFrameBuffer.graphics)
uisDrawFrameBuffer.graphics.color = Color(255, 255, 255, 0)
uisDrawFrameBuffer.graphics.fillRect(
0f, 0f, uisDrawFrameBuffer.width.toFloat(), uisDrawFrameBuffer.height.toFloat()
)*/
// make camara work //
@@ -304,20 +309,19 @@ constructor() : BasicGameState() {
// draw map related stuffs //
/////////////////////////////
TilesDrawer.renderBehind(gc, worldDrawFrameBuffer.graphics)
// --> blendNormal() <-- by TilesDrawer.renderBehind
/////////////////
// draw actors //
/////////////////
// --> Change of blend mode <-- introduced by ActorWithBody //
actorContainer.forEach { actor ->
if (actor is ActorWithBody && actor.inScreen() && actor !is Player && !actor.drawTopmost) {
actor.drawBody(gc, worldDrawFrameBuffer.graphics)
}
}
// --> Change of blend mode <-- introduced by ActorWithBody //
player.drawBody(gc, worldDrawFrameBuffer.graphics)
// --> Change of blend mode <-- introduced by ActorWithBody //
// actors that are drawTopmost
actorContainer.forEach { actor ->
if (actor is ActorWithBody && actor.inScreen() && actor !is Player && actor.drawTopmost) {
actor.drawBody(gc, worldDrawFrameBuffer.graphics)
@@ -331,13 +335,11 @@ constructor() : BasicGameState() {
/////////////////////////////
LightmapRenderer.renderLightMap()
// --> blendMul() <-- by TilesDrawer.renderFront
TilesDrawer.renderFront(gc, worldDrawFrameBuffer.graphics)
TilesDrawer.renderFront(gc, worldDrawFrameBuffer.graphics, false)
// --> blendNormal() <-- by TilesDrawer.renderFront
FeaturesDrawer.render(gc, worldDrawFrameBuffer.graphics)
// --> blendMul() <-- by TilesDrawer.drawEnvOverlay
FeaturesDrawer.drawEnvOverlay(worldDrawFrameBuffer.graphics)
if (!KeyToggler.isOn(KEY_LIGHTMAP_RENDER)) blendMul()
@@ -348,14 +350,19 @@ constructor() : BasicGameState() {
//////////////////////
// draw actor glows //
//////////////////////
// --> blendLightenOnly() <-- introduced by ActorWithBody //
actorContainer.forEach { actor ->
if (actor is ActorWithBody && actor.inScreen() && actor !is Player) {
actor.drawGlow(gc, worldDrawFrameBuffer.graphics)
}
}
// --> blendLightenOnly() <-- introduced by ActorWithBody //
player.drawGlow(gc, worldDrawFrameBuffer.graphics)
// actors that are drawTopmost
actorContainer.forEach { actor ->
if (actor is ActorWithBody && actor.inScreen() && actor !is Player && actor.drawTopmost) {
actor.drawGlow(gc, worldDrawFrameBuffer.graphics)
}
}
// --> blendLightenOnly() <-- introduced by ActorWithBody //
////////////////////////