HD: World is not rendered #639
Comments
|
On Full stdout log: |
|
Looking at the history, I suspect HD (#488) which got merged in a343f9b. And it works, map renders before HD PR: Then I tested commit a343f9b, there map is black. |
|
In fullscreen it is also broken. |
|
World is rendered on the diff --git a/src/road.cpp b/src/road.cpp
index c0b5722..c12b2b0 100644
--- a/src/road.cpp
+++ b/src/road.cpp
@@ -2055,7 +2055,7 @@ void iGameMap::draw(int self)
FirstDraw = 0;
//2D Rendring in game.
#ifdef ACTINT
- XGR_Obj.set_2d_render_buffer();
+ XGR_Obj.set_default_render_buffer();
//XGR_Obj.fill(2);
if(GeneralSystemSkip) {
aScrDisp -> redraw();But I don't understand what exactly this does, "fixed" it by trying to understand the code and changing random things. |
|
Another patch that "fixes" the rendering of the world: diff --git a/lib/xgraph/xgraph.cpp b/lib/xgraph/xgraph.cpp
index 9da17c0..4e0457e 100644
--- a/lib/xgraph/xgraph.cpp
+++ b/lib/xgraph/xgraph.cpp
@@ -865,7 +865,9 @@ void XGR_Screen::blitRgba(uint32_t *dstRgba, uint8_t *screenIndexes, uint32_t *s
*dstRgba = XGR32_PaletteCache[*screen2DIndexes];
} else if (((uint8_t*)screen2DRgba)[3] != 0) {
*dstRgba = *screen2DRgba;
- } else {
+ }
+
+ if (*screenIndexes != 0) {
*dstRgba = XGR32_PaletteCache[*screenIndexes];
}This makes default buffer take precedence over 2d buffer. The result is this: So apparently the problem is that 2D buffer is not "tranparent", but is black where the map should be. |
|
Another change: diff --git a/src/actint/actint.cpp b/src/actint/actint.cpp
index e984445..917080b 100644
--- a/src/actint/actint.cpp
+++ b/src/actint/actint.cpp
@@ -3300,7 +3300,7 @@ void actIntDispatcher::redraw(void)
}
break;
}
- if(!(flags & AS_FULL_REDRAW)){
+ if(false && !(flags & AS_FULL_REDRAW)){
XGR_MouseObj.flags &= ~XGM_PROMPT_ACTIVE;
XGR_Obj.fill(0);
for(int i = 0; i < curIbs -> backs.size(); i++) {With only this patch applied the result is this one: So apparently somewhere within this |
|
I have tracked down the problem to this: diff --git a/src/actint/actint.cpp b/src/actint/actint.cpp
index e984445..a42b7d3 100644
--- a/src/actint/actint.cpp
+++ b/src/actint/actint.cpp
@@ -3304,7 +3304,7 @@ void actIntDispatcher::redraw(void)
XGR_MouseObj.flags &= ~XGM_PROMPT_ACTIVE;
XGR_Obj.fill(0);
for(int i = 0; i < curIbs -> backs.size(); i++) {
- curIbs -> backs[i] -> show(0);
+ //curIbs -> backs[i] -> show(0);
}
if(curMode == AS_INV_MODE && curMatrix && curMatrix -> back){
curMatrix -> back -> show();With this change it looks like this: So the problem is that background rendered into 2D buffer here is rendered without proper transparency. |
|
Here is another patch: diff --git a/lib/xgraph/xgraph.cpp b/lib/xgraph/xgraph.cpp
index 9da17c0..578895c 100644
--- a/lib/xgraph/xgraph.cpp
+++ b/lib/xgraph/xgraph.cpp
@@ -446,7 +446,7 @@ void XGR_Screen::putspr(int x,int y,int sx,int sy,void* p,int mode)
} else {//Other
for(i = 0; i < _sy; i ++){
for(j = 0; j < _sx; j ++){
- if(memBuf[j]){
+ if(memBuf[j] && memBuf[j] != 72){
scrBuf[j] = memBuf[j];
}
}With this change it looks like this: So it looks like the problem is that background images have 72 as the background color instead of 0. I have printed
|
|
I made a fix: #641 |
|
That's strange. We built steam version from master and it works fine, isn't it @stalkerg ? |
|
Prob, GOG resources is broken |
|
Which exactly? |
|
I am running version from GOG, Using this script to build and run (warning, it removes save files too): Here is the version of the background that is full of Does steam use newer version of By the way Windows version on GOG is 1.46 and Linux version is 1.45. But steam version is probably 2.0? So GOG version is outdated compared to Steam and its resources cannot be used? Is there a plan to upload 2.0 to GOG? Also would be nice if you publish sha256sum of all game files so it can be checked that the latest versions of resources are used. |
|
@link2xt hello, sorry for the long response, probably we did this changes during HD remastering, in that case we should put all changes into this repo. |
Steps to reproduce:
vangers_1_45_44317.shfrom GOG.com.masterbranch at the time of writing) into./Vangersdatafiles with this script:cd safe_placeand run./vangersMenus work, but the world is not rendered:
The problem is reproducible both with Wayland and Xorg.
The text was updated successfully, but these errors were encountered: