diff --git a/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/common/Ray.kt b/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/api/render/Ray.kt similarity index 78% rename from raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/common/Ray.kt rename to raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/api/render/Ray.kt index 0d890a4..7811bc0 100644 --- a/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/common/Ray.kt +++ b/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/api/render/Ray.kt @@ -1,5 +1,6 @@ -package org.crg.raymarchin.engine.common +package org.crg.raymarchin.engine.api.render +import org.crg.raymarchin.engine.common.Coordinates import org.crg.raymarchin.engine.dto.ReflectionDto import java.awt.Color diff --git a/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/api/render/RayConsumer.kt b/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/api/render/RayConsumer.kt index 70390dc..0f0671b 100644 --- a/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/api/render/RayConsumer.kt +++ b/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/api/render/RayConsumer.kt @@ -1,6 +1,5 @@ package org.crg.raymarchin.engine.api.render -import org.crg.raymarchin.engine.common.Ray import org.crg.raymarchin.engine.dto.RenderDto /** diff --git a/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/api/render/ReflectionSurface.kt b/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/api/render/ReflectionSurface.kt index 0c54442..15ba15c 100644 --- a/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/api/render/ReflectionSurface.kt +++ b/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/api/render/ReflectionSurface.kt @@ -1,7 +1,5 @@ package org.crg.raymarchin.engine.api.render -import org.crg.raymarchin.engine.common.Ray - /** * Интерфейс для видимых объектов */ diff --git a/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/core/render/LightSource.kt b/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/core/render/LightSource.kt index efe1bbb..f21112c 100644 --- a/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/core/render/LightSource.kt +++ b/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/core/render/LightSource.kt @@ -1,6 +1,6 @@ package org.crg.raymarchin.engine.core.render -import org.crg.raymarchin.engine.common.Ray +import org.crg.raymarchin.engine.api.render.Ray import org.crg.raymarchin.engine.dto.RenderDto import org.crg.raymarchin.engine.api.render.RayConsumer diff --git a/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/dto/ReflectionDto.kt b/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/dto/ReflectionDto.kt index b3142f8..3b18c6c 100644 --- a/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/dto/ReflectionDto.kt +++ b/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/dto/ReflectionDto.kt @@ -1,7 +1,6 @@ package org.crg.raymarchin.engine.dto import org.crg.raymarchin.engine.common.Coordinates - import java.awt.Color data class ReflectionDto(val coordinates: Coordinates, val color: Color) diff --git a/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/dto/RenderDto.kt b/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/dto/RenderDto.kt index a265e02..184250a 100644 --- a/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/dto/RenderDto.kt +++ b/raymarchin-api/src/main/kotlin/org/crg/raymarchin/engine/dto/RenderDto.kt @@ -1,7 +1,6 @@ package org.crg.raymarchin.engine.dto import org.crg.raymarchin.engine.common.Coordinates - import java.awt.Color /**