Add pro meshes for surfaces in all camera views

Author: Scarabol

README.md

@@ -65,7 +65,6 @@ using modern web technologies.
 - Orange smoke column above lava tiles missing
 - Add tiny rockies running around after crumbling
 - Two buttons in priority list can be hovered/pressed/released at the same time
-- Use pro-meshes to render high-detail walls in first person and shoulder view
 - Middle wheel meshes of small digger do not rotate after engine upgrade
 - When switching fast from one level to another in level selection no level name is shown, but the level is highlighted
 

src/game/LevelLoader.ts

@@ -15,6 +15,7 @@ export interface LevelConfData {
     fullName: string
     generateSpiders: boolean
     video: string
+    meshBasename: string
     textureBasename: string
     roofTexture: string
     rockFallStyle: RockFallStyle
@@ -72,6 +73,7 @@ export class LevelLoader {
             video: levelConf.video,
             mapWidth: terrainMap.width,
             mapHeight: terrainMap.height,
+            meshBasename: textureSet.meshBasename,
             textureBasename: textureSet.textureBasename,
             roofTexture: textureSet.roofTexture,
             rockFallStyle: rockFallStyle,

src/game/SceneManager.ts

@@ -87,6 +87,9 @@ export class SceneManager implements Updatable {
         EventBroker.subscribe(EventKey.BUILDINGS_CHANGED, () => {
             this.setBuildModeSelection(undefined) // TODO Check dependencies precisely
         })
+        EventBroker.subscribe(EventKey.COMMAND_CHANGE_PREFERENCES, (event) => {
+            this.terrain.forEachSurface((s) => s.mesh.setProMeshEnabled(SaveGameManager.preferences.wallDetails))
+        })
     }
 
     setActiveCamera(camera: PerspectiveCamera) {
@@ -135,10 +138,8 @@ export class SceneManager implements Updatable {
         this.setBuildModeSelection(undefined)
 
         this.floorGroup = new Group()
-        this.floorGroup.scale.setScalar(TILESIZE)
         this.roofGroup = new Group()
         this.roofGroup.visible = false
-        this.roofGroup.scale.setScalar(TILESIZE)
         this.terrain = TerrainLoader.loadTerrain(levelConf, this.worldMgr)
         this.terrain.forEachSurface((s) => {
             this.floorGroup.add(s.mesh)

src/game/TerrainLoader.ts

@@ -83,7 +83,7 @@ export class TerrainLoader {
                                     case SurfaceType.LAVA5:
                                     // fallthrough
                                     case SurfaceType.WATER:
-                                        worldMgr.ecs.addComponent(surface.entity, new FluidSurfaceComponent(surface.x, surface.y, surface.mesh.geometry.attributes.uv))
+                                        worldMgr.ecs.addComponent(surface.entity, new FluidSurfaceComponent(surface.x, surface.y, surface.mesh.lowMesh.geometry.attributes.uv))
                                         break
                                     case SurfaceType.SLUG_HOLE:
                                         terrain.slugHoles.add(surface)

src/game/model/building/BuildPlacementMarkerMesh.ts

@@ -2,10 +2,11 @@ import { BufferGeometry, Mesh, MeshPhongMaterial, Vector2 } from 'three'
 import { TILESIZE } from '../../../params'
 import { SceneManager } from '../../SceneManager'
 import { Surface } from '../../terrain/Surface'
+import { SurfaceMesh } from '../../terrain/SurfaceMesh'
 
 export class BuildPlacementMarkerMesh extends Mesh<BufferGeometry, MeshPhongMaterial> {
     sceneMgr: SceneManager
-    lastSurfaceMesh?: Mesh
+    lastSurfaceMesh?: SurfaceMesh
 
     constructor(sceneMgr: SceneManager) {
         super(new BufferGeometry(), new MeshPhongMaterial({
@@ -28,7 +29,7 @@ export class BuildPlacementMarkerMesh extends Mesh<BufferGeometry, MeshPhongMate
         this.position.copy(surfaceMesh.position.clone().multiplyScalar(TILESIZE))
         this.position.y += TILESIZE / 20
         this.geometry?.dispose()
-        this.geometry = surfaceMesh.geometry.clone()
+        this.geometry = surfaceMesh.lowMesh.geometry.clone()
     }
 
     setColor(hexColor: number) {

src/game/system/LaserShotSystem.ts

@@ -88,7 +88,7 @@ export class LaserShotSystem extends AbstractGameSystem {
             this.worldMgr.sceneMgr.addPositionalAudio(soundParent, 'SFX_LaserHit', false)
             this.worldMgr.sceneMgr.addMiscAnim(GameConfig.instance.miscObjects.boulderExplode, rockyIntersection.point, PRNG.animation.random() * 2 * Math.PI, false)
         } else {
-            const floorIntersection = this.raycaster.intersectObjects<SurfaceMesh>(this.worldMgr.sceneMgr.floorGroup.children, false)[0]
+            const floorIntersection = this.raycaster.intersectObjects<SurfaceMesh>(this.worldMgr.sceneMgr.floorGroup.children, true)[0]
             if (floorIntersection) {
                 beamLength = floorIntersection.distance
                 const surface = floorIntersection.object.userData.selectable

src/game/terrain/Surface.ts

@@ -1,4 +1,4 @@
-import { BackSide, Raycaster, Vector2, Vector3 } from 'three'
+import { Raycaster, Vector2, Vector3 } from 'three'
 import { SoundManager } from '../../audio/SoundManager'
 import { DeselectAll, SelectionChanged, UpdateRadarSurface, UpdateRadarTerrain } from '../../event/LocalEvents'
 import { CavernDiscovered, JobCreateEvent, OreFoundEvent, WorldLocationEvent } from '../../event/WorldEvents'
@@ -13,7 +13,7 @@ import { DrillJob } from '../model/job/surface/DrillJob'
 import { ReinforceJob } from '../model/job/surface/ReinforceJob'
 import { GameEntity } from '../ECS'
 import { SurfaceVertex } from './SurfaceGeometry'
-import { SurfaceMesh } from './SurfaceMesh'
+import { RoofMesh, SurfaceMesh } from './SurfaceMesh'
 import { SurfaceType } from './SurfaceType'
 import { Terrain } from './Terrain'
 import { WALL_TYPE, WallType } from './WallType'
@@ -34,6 +34,8 @@ import { PRNG } from '../factory/PRNG'
 import { GameState } from '../model/GameState'
 import { CompleteSurfaceJob } from '../model/job/surface/CompleteSurfaceJob'
 import { MaterialEntity } from '../model/material/MaterialEntity'
+import { ResourceManager } from '../../resource/ResourceManager'
+import { SaveGameManager } from '../../resource/SaveGameManager'
 
 export class Surface {
     readonly worldMgr: WorldManager
@@ -53,7 +55,7 @@ export class Surface {
     drillProgress: number = 0
 
     readonly mesh: SurfaceMesh
-    readonly roofMesh: SurfaceMesh
+    readonly roofMesh: RoofMesh
     wallType: WallType = WALL_TYPE.floor
     needsMeshUpdate: boolean = false
 
@@ -83,15 +85,10 @@ export class Surface {
                 this.rubblePositions = [this.getRandomPosition(), this.getRandomPosition(), this.getRandomPosition(), this.getRandomPosition()]
                 break
         }
-        // TODO Use pro meshes for high wall details in FPV
-        // const proMesh = ResourceManager.getLwoModel(this.terrain.textureSet.meshBasename + '01b.lwo')
-        // proMesh.position.copy(this.mesh.position)
-        // proMesh.scale.setScalar(1 / TILESIZE)
-        // this.terrain.floorGroup.add(proMesh)
         this.mesh = new SurfaceMesh(x, y, {selectable: this, surface: this})
-        this.roofMesh = new SurfaceMesh(x, y, {})
-        this.roofMesh.material.side = BackSide
-        this.roofMesh.position.y = 3
+        this.mesh.setProMeshEnabled(SaveGameManager.preferences.wallDetails)
+        const roofTexture = ResourceManager.getSurfaceTexture(this.terrain.levelConf.roofTexture, 0) ?? null // TODO Move to config handling
+        this.roofMesh = new RoofMesh(x, y, roofTexture)
     }
 
     private updateObjectName() {
@@ -143,7 +140,7 @@ export class Surface {
                 case SurfaceType.LAVA5:
                 // fallthrough
                 case SurfaceType.WATER:
-                    this.worldMgr.ecs.addComponent(this.entity, new FluidSurfaceComponent(this.x, this.y, this.mesh.geometry.attributes.uv))
+                    this.worldMgr.ecs.addComponent(this.entity, new FluidSurfaceComponent(this.x, this.y, this.mesh.lowMesh.geometry.attributes.uv))
                     break
                 case SurfaceType.HIDDEN_CAVERN:
                     this.surfaceType = SurfaceType.GROUND
@@ -351,7 +348,7 @@ export class Surface {
         this.terrain.pathFinder.updateSurface(this)
     }
 
-    private getVertex(x: number, y: number, s1: Surface, s2: Surface, s3: Surface): SurfaceVertex {
+    getVertex(x: number, y: number, s1: Surface, s2: Surface, s3: Surface): SurfaceVertex {
         const high = [this, s1, s2, s3].some((s) => !s.discovered) || ![this, s1, s2, s3].some((s) => s.surfaceType.floor)
         const minSeamProgress = Math.min(this.getSeamProgress(), s1.getSeamProgress(), s2.getSeamProgress(), s3.getSeamProgress())
         const offset = this.terrain.getHeightOffset(x, y)
@@ -365,9 +362,9 @@ export class Surface {
     private updateWallType(topLeft: SurfaceVertex, topRight: SurfaceVertex, bottomRight: SurfaceVertex, bottomLeft: SurfaceVertex) {
         let wallType: WallType = Surface.getWallType(topLeft.high, topRight.high, bottomRight.high, bottomLeft.high)
         if (wallType === WALL_TYPE.wall && topLeft.high === bottomRight.high) wallType = WALL_TYPE.weirdCrevice
-        this.wallType = wallType
+        this.wallType = wallType // TODO Update wall type only when necessary
         this.mesh.setHeights(wallType, topLeft, topRight, bottomRight, bottomLeft)
-        this.roofMesh.setHeights(wallType, topLeft.flipY(), topRight.flipY(), bottomRight.flipY(), bottomLeft.flipY())
+        this.roofMesh.setHeights(wallType, topLeft, topRight, bottomRight, bottomLeft)
         if (this.wallType !== WALL_TYPE.wall) this.cancelReinforceJobs()
         if (this.wallType < WALL_TYPE.wall) this.worldMgr.ecs.removeComponent(this.entity, EmergeComponent)
     }
@@ -427,7 +424,9 @@ export class Surface {
         }
         const textureFilepath = this.terrain.levelConf.textureBasename + suffix + '.bmp'
         this.mesh.setTexture(textureFilepath, rotation)
-        this.roofMesh.setTexture(this.terrain.levelConf.roofTexture, rotation)
+        const proMeshSuffix = suffix.startsWith('1') ? '10' : suffix
+        const proMeshFilepath = (this.terrain.levelConf.meshBasename + proMeshSuffix).toLowerCase()
+        this.mesh.updateProMesh(proMeshFilepath)
     }
 
     private determinePowerPathTextureNameSuffixAndRotation(rotation: number, suffix: string) {
@@ -480,7 +479,7 @@ export class Surface {
     select(): boolean {
         if (!this.isSelectable()) return false
         this.selected = true
-        this.mesh.setHighlightColor(0x6060a0)
+        this.setHighlightColor(0x6060a0)
         if (this.surfaceType.floor) SoundManager.playSfxSound('SFX_Floor')
         else if (this.surfaceType.shaping) SoundManager.playSfxSound('SFX_Wall')
         if (DEV_MODE) console.log(`Surface selected ${this.x}/${this.y}`, this)
@@ -502,7 +501,11 @@ export class Surface {
         } else if (this.drillJob) {
             color = 0xa0a0a0
         }
-        this.mesh.setHighlightColor(color)
+        this.setHighlightColor(color)
+    }
+
+    setHighlightColor(hex: number) {
+        this.mesh.setHighlightColor(hex)
     }
 
     hasRubble(): boolean {
@@ -595,7 +598,7 @@ export class Surface {
         const wasPath = this.surfaceType === SurfaceType.POWER_PATH || this.surfaceType === SurfaceType.POWER_PATH_BUILDING
         this.surfaceType = surfaceType
         if (this.surfaceType === SurfaceType.WATER || this.surfaceType === SurfaceType.LAVA5) {
-            this.worldMgr.ecs.addComponent(this.entity, new FluidSurfaceComponent(this.x, this.y, this.mesh.geometry.attributes.uv))
+            this.worldMgr.ecs.addComponent(this.entity, new FluidSurfaceComponent(this.x, this.y, this.mesh.lowMesh.geometry.attributes.uv))
         } else {
             this.worldMgr.ecs.removeComponent(this.entity, FluidSurfaceComponent)
         }

src/game/terrain/SurfaceGeometry.ts

@@ -1,6 +1,7 @@
 import { BufferGeometry, Vector2, Vector3 } from 'three'
 import { BufferAttribute } from 'three/src/core/BufferAttribute'
 import { WALL_TYPE, WallType } from './WallType'
+import { TILESIZE } from '../../params'
 
 export class SurfaceGeometry extends BufferGeometry {
     constructor() {
@@ -13,10 +14,10 @@ export class SurfaceGeometry extends BufferGeometry {
     setHeights(wallType: WallType, topLeft: SurfaceVertex, topRight: SurfaceVertex, bottomRight: SurfaceVertex, bottomLeft: SurfaceVertex) {
         const uvOffset = SurfaceGeometry.determineUvOffset(wallType, topLeft.high, bottomRight.high, topRight.high, bottomLeft.high)
 
-        const topLeftVertex = new Vector3(0, topLeft.height, 0)
-        const topRightVertex = new Vector3(1, topRight.height, 0)
-        const bottomRightVertex = new Vector3(1, bottomRight.height, 1)
-        const bottomLeftVertex = new Vector3(0, bottomLeft.height, 1)
+        const topLeftVertex = new Vector3(0, topLeft.height, 0).multiplyScalar(TILESIZE)
+        const topRightVertex = new Vector3(1, topRight.height, 0).multiplyScalar(TILESIZE)
+        const bottomRightVertex = new Vector3(1, bottomRight.height, 1).multiplyScalar(TILESIZE)
+        const bottomLeftVertex = new Vector3(0, bottomLeft.height, 1).multiplyScalar(TILESIZE)
 
         const vertices: Vector3[] = []
         const normals: Vector3[] = []