fix bltCommand scale problem

YuriSizuku · Feb 14, 2023 · 84ae516 · 84ae516
1 parent ff9bf35
commit 84ae516
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 asset/*test*/**
+asset/stdout.txt
+asset/stderr.txt
 build/**
 build_*/**
 thirdparty/**

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -281,7 +281,6 @@ set(CMAKE_CXX_STANDARD 11)
 set(ONSYURI_CODE
     src/onsyuri/AnimationInfo.cpp
     src/onsyuri/coding2utf16.cpp
-    src/onsyuri/conv_shared.cpp
     src/onsyuri/DirectReader.cpp
     src/onsyuri/DirtyRect.cpp
     src/onsyuri/FontInfo.cpp

diff --git a/src/onsyuri/ONScripter.cpp b/src/onsyuri/ONScripter.cpp
@@ -799,7 +799,7 @@ void ONScripter::flush( int refresh_mode, SDL_Rect *rect, bool clear_dirty_flag,
 
 void ONScripter::flushDirect( SDL_Rect &rect, int refresh_mode )
 {
-    // utils::printInfo("flush %d: %d %d %d %d\n", refresh_mode, rect.x, rect.y, rect.w, rect.h );
+    // printf("## flush %d: %d %d %d %d\n", refresh_mode, rect.x, rect.y, rect.w, rect.h );
 
     SDL_Rect dst_rect = rect;
 

diff --git a/src/onsyuri/ONScripter_command.cpp b/src/onsyuri/ONScripter_command.cpp
@@ -3676,6 +3676,17 @@ int ONScripter::bltCommand()
         src_rect.x -= blt_texture_src_rect.x;
         src_rect.y -= blt_texture_src_rect.y;
         screen_dirty_flag = true;
+
+        // printf("## flush src(%d, %d, %d, %d), dst(%d, %d, %d, %d)\n", 
+        //     src_rect.x, src_rect.y, src_rect.w, src_rect.h,
+        //     dst_rect.x, dst_rect.y, dst_rect.w, dst_rect.h);
+
+        // fix blt scale
+        dst_rect.x += render_view_rect.x;
+        dst_rect.y += render_view_rect.y;
+        dst_rect.w /= screen_scale_ratio1;
+        dst_rect.h /= screen_scale_ratio2;
+
         SDL_RenderCopy(renderer, blt_texture, &src_rect, &dst_rect);
         SDL_RenderPresent(renderer);
         dirty_rect.clear();