diff --git a/lab_2/src/main/kotlin/Bin.kt b/lab_2/src/main/kotlin/Bin.kt index 2dadcfb..f5183f0 100644 --- a/lab_2/src/main/kotlin/Bin.kt +++ b/lab_2/src/main/kotlin/Bin.kt @@ -3,15 +3,12 @@ package org.exampl import java.io.File import java.nio.ByteBuffer import java.nio.ByteOrder -import java.nio.ShortBuffer -class Bin { - companion object { - var X = 0 - var Y = 0 - var Z = 0 - lateinit var array: ShortArray - } +object Bin { + var X = 0 + var Y = 0 + var Z = 0 + lateinit var array: ShortArray fun readBIN(path: String) { if (File(path).exists()) { @@ -31,4 +28,4 @@ class Bin { } } } -} \ No newline at end of file +} diff --git a/lab_2/src/main/kotlin/Form1.kt b/lab_2/src/main/kotlin/Form1.kt index a2e8765..5bd6911 100644 --- a/lab_2/src/main/kotlin/Form1.kt +++ b/lab_2/src/main/kotlin/Form1.kt @@ -8,7 +8,7 @@ import javax.swing.filechooser.FileNameExtensionFilter class Form1 { private var loaded = false var currentLayer = 0 - private val bin = Bin() + private val bin = Bin val view = View() private var minTF = -3000 @@ -35,6 +35,7 @@ class Form1 { bin.readBIN(file.absolutePath) view.setupView(800, 600) // Установите размеры окна loaded = true + view.needReload = true // Убедимся, что текстура загружается сразу после выбора файла } } diff --git a/lab_2/src/main/kotlin/View.kt b/lab_2/src/main/kotlin/View.kt index 5d97b8f..8037607 100644 --- a/lab_2/src/main/kotlin/View.kt +++ b/lab_2/src/main/kotlin/View.kt @@ -1,7 +1,6 @@ package org.exampl import org.lwjgl.opengl.GL11.* -import java.awt.Color import java.awt.image.BufferedImage import java.nio.ByteBuffer