mirror of
				https://github.com/tobspr/shapez.io.git
				synced 2025-06-13 13:04:03 +00:00 
			
		
		
		
	Merge branch 'SeeableDisplays' into ShrimpZ-WirelessDisplay
This commit is contained in:
		
						commit
						b3f9354820
					
				
							
								
								
									
										
											BIN
										
									
								
								res_raw/sprites/wires/display_logical_acceptor.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								res_raw/sprites/wires/display_logical_acceptor.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 6.4 KiB | 
| @ -84,6 +84,14 @@ export class DisplaySystem extends GameSystemWithFilter { | ||||
|                         globalConfig.tileSize | ||||
|                     ); | ||||
|                 } else if (value.getItemType() === "shape") { | ||||
|                     if (this.root.currentLayer == "wires") { | ||||
|                         value.drawItemCenteredClipped( | ||||
|                             (origin.x + 0.5) * globalConfig.tileSize, | ||||
|                             (origin.y + 0.5) * globalConfig.tileSize, | ||||
|                             parameters, | ||||
|                             30 | ||||
|                         );                  | ||||
|                     } | ||||
|                     value.drawItemCenteredClipped( | ||||
|                         (origin.x + 0.5) * globalConfig.tileSize, | ||||
|                         (origin.y + 0.5) * globalConfig.tileSize, | ||||
|  | ||||
| @ -189,9 +189,13 @@ export class WiredPinsSystem extends GameSystemWithFilter { | ||||
|                 ); | ||||
| 
 | ||||
|                 if (staticComp.getMetaBuilding().getRenderPins()) { | ||||
|                     this.sprite = this.pinSprites[slot.type]; | ||||
|                     if (staticComp.getMetaBuilding().id == "display") {  | ||||
|                         this.sprite = Loader.getSprite("sprites/wires/display_logical_acceptor.png") | ||||
|                     } | ||||
|                     drawRotatedSprite({ | ||||
|                         parameters, | ||||
|                         sprite: this.pinSprites[slot.type], | ||||
|                         sprite: this.sprite, | ||||
|                         x: worldPos.x, | ||||
|                         y: worldPos.y, | ||||
|                         angle: effectiveRotation, | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user