Skip to content

Commit

Permalink
codestyle
Browse files Browse the repository at this point in the history
  • Loading branch information
mi-sts committed Mar 12, 2024
1 parent 716f4ff commit ed90bbf
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/main/kotlin/solve/constants/ResourcesPaths.kt
Original file line number Diff line number Diff line change
@@ -37,4 +37,4 @@ const val ShadersFrameGeometryPath = "engine/shaders/frame/frame.geom"
const val ShadersFrameFragmentPath = "engine/shaders/frame/frame.frag"
const val ShadersPointLandmarkVertexPath = "engine/shaders/landmark/point/point.vert"
const val ShadersPointLandmarkGeomPath = "engine/shaders/landmark/point/point.geom"
const val ShadersPointLandmarkFragmentPath = "engine/shaders/landmark/point/point.frag"
const val ShadersPointLandmarkFragmentPath = "engine/shaders/landmark/point/point.frag"
6 changes: 3 additions & 3 deletions src/main/kotlin/solve/rendering/canvas/SceneCanvas.kt
Original file line number Diff line number Diff line change
@@ -38,8 +38,7 @@ class SceneCanvas : OpenGLCanvas() {
initializeCanvasEvents()
}

fun setNewScene(scene: solve.scene.model.Scene)
{
fun setNewScene(scene: solve.scene.model.Scene) {
canvasScene?.clearLandmarkRenderers()
qwe = true
this.scene = scene
@@ -102,8 +101,9 @@ class SceneCanvas : OpenGLCanvas() {
if (qwe) {
val scene = this.scene ?: return
scene.layers.forEach { layer ->
if (layer is Layer.PointLayer)
if (layer is Layer.PointLayer) {
addLandmarkRenderer(layer, scene)
}
}
qwe = false
}
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ class PointsLayerRenderer(

override val maxBatchSize = 1000

private var gridWidth = 6//FramesRenderer.DefaultGridWidth
private var gridWidth = 6 // FramesRenderer.DefaultGridWidth
private var pointsRadius = 1f
private var framesSize = Vector2f()

@@ -110,4 +110,4 @@ class PointsLayerRenderer(

private const val DefaultLocalVerticesPositionsDivider = 70f
}
}
}
2 changes: 1 addition & 1 deletion src/main/kotlin/solve/scene/model/Scene.kt
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ class Scene(

val canvasLayersCount = canvasLayersStorage.size

fun getLayersWithCommonSettings(layerSettings: LayerSettings) : List<Layer> {
fun getLayersWithCommonSettings(layerSettings: LayerSettings): List<Layer> {
val layers = mutableListOf<Layer>()
frames.forEach { frame ->
val frameLayer = frame.layers.firstOrNull { it.settings == layerSettings } ?: return@forEach

0 comments on commit ed90bbf

Please sign in to comment.