Fixed image editor aspect ration selection

leuat · Feb 18, 2024 · 0e65b1c · 0e65b1c
1 parent f8b2736
commit 0e65b1c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/Publish/tutorials/C64/Tutorials/easy/13_multicolor_images.ras b/Publish/tutorials/C64/Tutorials/easy/13_multicolor_images.ras
@@ -10,14 +10,8 @@ var
 */
 
 // Exports flf image directly to binary with each build. Select between image 1 or 2
-@define img 1
 
-@if img=1
-	@export "resources/images/neo_rider_by_the_diad.flf" "resources/images/neo_rider.bin" 0
-@endif
-@if img=2
-	@export "resources/images/jack.flf" "resources/images/neo_rider.bin" 0
-@endif
+@export "resources/images/neo_rider_by_the_diad.flf" "resources/images/neo_rider.bin" 0
 
 	image_color: IncBin("resources/images/neo_rider_color.bin", $5000);
 	image_data: IncBin("resources/images/neo_rider_data.bin", $6000);

diff --git a/Publish/tutorials/C64/Tutorials/easy/28_hires_images.ras b/Publish/tutorials/C64/Tutorials/easy/28_hires_images.ras
@@ -11,11 +11,11 @@ var
 
 
 begin
-	// Turn off multicolor if you want hires! 
 
 	Screen::SetBitmapMode();
+	// Sets hires
 	Screen::SetHiresMode();
-	// Set data pointer to $6000
+	// Set data pointer to $6000, color data at $4400
 	Screen::SetScreenLocation($4400); // color data
 	Screen::SetCharsetLocation($6000); // bitmap data
 	// Set bank 1 ($4000-$7FFF)

diff --git a/Publish/tutorials/C64/Tutorials/resources/charsets/charset.flf b/Publish/tutorials/C64/Tutorials/resources/charsets/charset.flf
diff --git a/source/trsedocuments/formimageeditor.cpp b/source/trsedocuments/formimageeditor.cpp
@@ -238,7 +238,7 @@ void FormImageEditor::SelectFromLeftClick()
     m_prefMode = m_keepMode;
     m_work.m_currentImage->m_image->m_currentChar =
             m_work.m_currentImage->m_image->getCharAtPos(
-                (QPoint(m_updateThread.m_currentPos.x(),m_updateThread.m_currentPos.y())),
+        (QPoint(m_updateThread.m_currentPos.x(),m_updateThread.m_currentPos.y()*m_work.m_currentImage->m_image->m_aspect)),
                 m_updateThread.m_zoom,m_updateThread.m_zoomCenter);
     //showDetailCharButtons(true);
     SetSingleCharsetEdit();