sigonasr2
/
AdventuresInLestoria
1
1
Fork 0
Code Issues 9 Pull Requests Projects 1 Releases Wiki Activity

Fix shadow string rendering for vertical scaling.

Browse Source
pull/35/head
sigonasr2 10 months ago
parent 330ceefc5b
commit b8dea862f6
5 changed files with 12 additions and 12 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      Adventures in Lestoria/BlacksmithCraftingWindow.cpp
  2. 2
      Adventures in Lestoria/Version.h
  3. 8
      Adventures in Lestoria/olcPGEX_ViewPort.h
  4. 8
      Adventures in Lestoria/olcPixelGameEngine.h
  5. BIN
      x64/Release/Adventures in Lestoria.exe

6
Adventures in Lestoria/BlacksmithCraftingWindow.cpp
Unescape View File

@ -97,9 +97,9 @@ void Menu::InitializeBlacksmithCraftingWindow(){
const std::weak_ptr<Item>item=comp.lock()->GetItem(); const std::weak_ptr<Item>item=comp.lock()->GetItem();
std::string label=""; std::string label="";
if(Inventory::GetItemCount(item.lock()->ActualName)==0){ //If we don't own the item we have to create it first. if(Inventory::GetItemCount(item.lock()->ActualName())==0){ //If we don't own the item we have to create it first.
if(item.lock()->EnhancementIsPossible()&&item.lock()->GetEnhancementInfo().size()>item.lock()->EnhancementLevel()+1){ if(item.lock()->EnhancementIsPossible()&&item.lock()->GetEnhancementInfo().size()>item.lock()->EnhancementLevel()+1){
label=std::format("#00FF00Craft {}",item.lock()->GetDisplayName()); label=std::format("#00FF00Craft {}",item.lock()->DisplayName());
} }
Component<MenuLabel>(CRAFT_ITEM,"Enhancement Level Header")->SetLabel(label); Component<MenuLabel>(CRAFT_ITEM,"Enhancement Level Header")->SetLabel(label);
Component<MenuLabel>(CRAFT_ITEM,"Item Name Header")->SetLabel(std::format("Crafting {}",item.lock()->DisplayName())); Component<MenuLabel>(CRAFT_ITEM,"Item Name Header")->SetLabel(std::format("Crafting {}",item.lock()->DisplayName()));
@ -111,7 +111,7 @@ void Menu::InitializeBlacksmithCraftingWindow(){
label=std::format("Level {} ->#00AA00 {}",item.lock()->EnhancementLevel(),item.lock()->EnhancementLevel()+1); label=std::format("Level {} ->#00AA00 {}",item.lock()->EnhancementLevel(),item.lock()->EnhancementLevel()+1);
} }
Component<MenuLabel>(CRAFT_ITEM,"Enhancement Level Header")->SetLabel(label); Component<MenuLabel>(CRAFT_ITEM,"Enhancement Level Header")->SetLabel(label);
Component<MenuLabel>(CRAFT_ITEM,"Item Name Header")->SetLabel(std::format("Crafting {}",item.lock()->DisplayName())); Component<MenuLabel>(CRAFT_ITEM,"Item Name Header")->SetLabel(std::format("Enhancing {}",item.lock()->DisplayName()));
Component<EnhancementStatsLabel>(CRAFT_ITEM,"Enhancement Stats Label")->SetItem(item); Component<EnhancementStatsLabel>(CRAFT_ITEM,"Enhancement Stats Label")->SetItem(item);
Component<RequiredMaterialsList>(CRAFT_ITEM,"Required Materials List")->SetItem(item); Component<RequiredMaterialsList>(CRAFT_ITEM,"Required Materials List")->SetItem(item);
Component<MenuComponent>(CRAFT_ITEM,"Craft Button")->SetGrayedOut(!item.lock()->CanEnhanceItem()); Component<MenuComponent>(CRAFT_ITEM,"Craft Button")->SetGrayedOut(!item.lock()->CanEnhanceItem());

2
Adventures in Lestoria/Version.h
Unescape View File

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_PATCH 0 #define VERSION_PATCH 0
#define VERSION_BUILD 6605 #define VERSION_BUILD 6609
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a

8
Adventures in Lestoria/olcPGEX_ViewPort.h
Unescape View File

@ -729,14 +729,14 @@ void olc::ViewPort::DrawShadowStringDecal(const olc::vf2d& pos, std::string_view
} }
if(!garbageCollector.count(key)){ //If the text key already exists, don't have to recreate the decal, just update the expire time. if(!garbageCollector.count(key)){ //If the text key already exists, don't have to recreate the decal, just update the expire time.
vi2d imageSize=pge->GetWrappedTextSize(sText,width,scale); vi2d imageSize=pge->GetWrappedTextSize(sText,width,scale);
Decal*newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.y/scale.x)); Decal*newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.x/scale.x));
garbageCollector[key].decal=newDecal; garbageCollector[key].decal=newDecal;
pge->SetDrawTarget(newDecal->sprite); pge->SetDrawTarget(newDecal->sprite);
pge->Clear(BLANK); pge->Clear(BLANK);
pge->DrawString({0,0},sText,WHITE,1U,width/scale.x); pge->DrawString({0,0},sText,WHITE,1U,width/scale.x);
newDecal->Update(); newDecal->Update();
vf2d adjustedShadowSizeFactor=vf2d{shadowSizeFactor,shadowSizeFactor}*4/scale; vf2d adjustedShadowSizeFactor=vf2d{shadowSizeFactor,shadowSizeFactor}*4/scale;
Decal*newShadowDecal=new Decal(new Sprite((imageSize.x/scale.x*4)+adjustedShadowSizeFactor.x*2,(imageSize.y/scale.x*4)+adjustedShadowSizeFactor.y*2)); Decal*newShadowDecal=new Decal(new Sprite((imageSize.x/scale.x*4)+adjustedShadowSizeFactor.x*2,(imageSize.x/scale.x*4)+adjustedShadowSizeFactor.y*2));
garbageCollector[key+"_SHADOW"].decal=newShadowDecal; garbageCollector[key+"_SHADOW"].decal=newShadowDecal;
pge->SetDrawTarget(newShadowDecal->sprite); pge->SetDrawTarget(newShadowDecal->sprite);
pge->Clear(BLANK); pge->Clear(BLANK);
@ -777,14 +777,14 @@ void olc::ViewPort::DrawShadowStringPropDecal(const olc::vf2d& pos, std::string_
} }
if(!garbageCollector.count(key)){ //If the text key already exists, don't have to recreate the decal, just update the expire time. if(!garbageCollector.count(key)){ //If the text key already exists, don't have to recreate the decal, just update the expire time.
vi2d imageSize=pge->GetWrappedTextSizeProp(sText,width,scale); vi2d imageSize=pge->GetWrappedTextSizeProp(sText,width,scale);
Decal*newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.y/scale.x)); Decal*newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.x/scale.x));
garbageCollector[key].decal=newDecal; garbageCollector[key].decal=newDecal;
pge->SetDrawTarget(newDecal->sprite); pge->SetDrawTarget(newDecal->sprite);
pge->Clear(BLANK); pge->Clear(BLANK);
pge->DrawStringProp({0,0},sText,WHITE,1U,width/scale.x); pge->DrawStringProp({0,0},sText,WHITE,1U,width/scale.x);
newDecal->Update(); newDecal->Update();
vf2d adjustedShadowSizeFactor=vf2d{shadowSizeFactor,shadowSizeFactor}*4/scale; vf2d adjustedShadowSizeFactor=vf2d{shadowSizeFactor,shadowSizeFactor}*4/scale;
Decal*newShadowDecal=new Decal(new Sprite((imageSize.x/scale.x*4)+adjustedShadowSizeFactor.x*2,(imageSize.y/scale.x*4)+adjustedShadowSizeFactor.y*2)); Decal*newShadowDecal=new Decal(new Sprite((imageSize.x/scale.x*4)+adjustedShadowSizeFactor.x*2,(imageSize.x/scale.x*4)+adjustedShadowSizeFactor.y*2));
garbageCollector[key+"_SHADOW"].decal=newShadowDecal; garbageCollector[key+"_SHADOW"].decal=newShadowDecal;
pge->SetDrawTarget(newShadowDecal->sprite); pge->SetDrawTarget(newShadowDecal->sprite);
pge->Clear(BLANK); pge->Clear(BLANK);

8
Adventures in Lestoria/olcPixelGameEngine.h
Unescape View File

@ -3455,14 +3455,14 @@ namespace olc
} }
if(!garbageCollector.count(key)){ //If the text key already exists, don't have to recreate the decal, just update the expire time. if(!garbageCollector.count(key)){ //If the text key already exists, don't have to recreate the decal, just update the expire time.
vi2d imageSize=GetWrappedTextSize(sText,width,scale); vi2d imageSize=GetWrappedTextSize(sText,width,scale);
Decal*newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.y/scale.x)); Decal*newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.x/scale.x));
garbageCollector[key].decal=newDecal; garbageCollector[key].decal=newDecal;
SetDrawTarget(newDecal->sprite); SetDrawTarget(newDecal->sprite);
Clear(BLANK); Clear(BLANK);
DrawString({0,0},sText,WHITE,1U,width/scale.x); DrawString({0,0},sText,WHITE,1U,width/scale.x);
newDecal->Update(); newDecal->Update();
vf2d adjustedShadowSizeFactor=vf2d{shadowSizeFactor,shadowSizeFactor}*4/scale; vf2d adjustedShadowSizeFactor=vf2d{shadowSizeFactor,shadowSizeFactor}*4/scale;
Decal*newShadowDecal=new Decal(new Sprite((imageSize.x/scale.x*4)+adjustedShadowSizeFactor.x*2,(imageSize.y/scale.x*4)+adjustedShadowSizeFactor.y*2)); Decal*newShadowDecal=new Decal(new Sprite((imageSize.x/scale.x*4)+adjustedShadowSizeFactor.x*2,(imageSize.x/scale.x*4)+adjustedShadowSizeFactor.y*2));
garbageCollector[key+"_SHADOW"].decal=newShadowDecal; garbageCollector[key+"_SHADOW"].decal=newShadowDecal;
SetDrawTarget(newShadowDecal->sprite); SetDrawTarget(newShadowDecal->sprite);
Clear(BLANK); Clear(BLANK);
@ -3579,14 +3579,14 @@ namespace olc
} }
if(!garbageCollector.count(key)){ //If the text key already exists, don't have to recreate the decal, just update the expire time. if(!garbageCollector.count(key)){ //If the text key already exists, don't have to recreate the decal, just update the expire time.
vi2d imageSize=GetWrappedTextSizeProp(sText,width,scale); vi2d imageSize=GetWrappedTextSizeProp(sText,width,scale);
Decal*newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.y/scale.x)); Decal*newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.x/scale.x));
garbageCollector[key].decal=newDecal; garbageCollector[key].decal=newDecal;
SetDrawTarget(newDecal->sprite); SetDrawTarget(newDecal->sprite);
Clear(BLANK); Clear(BLANK);
DrawStringProp({0,0},sText,WHITE,1U,width/scale.x); DrawStringProp({0,0},sText,WHITE,1U,width/scale.x);
newDecal->Update(); newDecal->Update();
vf2d adjustedShadowSizeFactor=vf2d{shadowSizeFactor,shadowSizeFactor}*4/scale; vf2d adjustedShadowSizeFactor=vf2d{shadowSizeFactor,shadowSizeFactor}*4/scale;
Decal*newShadowDecal=new Decal(new Sprite((imageSize.x/scale.x*4)+adjustedShadowSizeFactor.x*2,(imageSize.y/scale.x*4)+adjustedShadowSizeFactor.y*2)); Decal*newShadowDecal=new Decal(new Sprite((imageSize.x/scale.x*4)+adjustedShadowSizeFactor.x*2,(imageSize.x/scale.x*4)+adjustedShadowSizeFactor.y*2));
garbageCollector[key+"_SHADOW"].decal=newShadowDecal; garbageCollector[key+"_SHADOW"].decal=newShadowDecal;
SetDrawTarget(newShadowDecal->sprite); SetDrawTarget(newShadowDecal->sprite);
Clear(BLANK); Clear(BLANK);

BIN
x64/Release/Adventures in Lestoria.exe
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save