Skip to content

Commit

Permalink
Version 6.00 update
Browse files Browse the repository at this point in the history
So many moving parts... Win32 build fails on run.
  • Loading branch information
erich666 committed Aug 1, 2018
1 parent 9e31293 commit 37bc076
Show file tree
Hide file tree
Showing 52 changed files with 10,944 additions and 2,761 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*.opensdf
*.cppcheck
*.zip
*.VC.db
*.VC.opendb
copy_*.bat
update.txt
Debug
Expand Down
5 changes: 5 additions & 0 deletions TileMaker/TileMaker/results.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

C:\Users\erich\Documents\_Documents\minecraft\Mineways\git_code\TileMaker\TileMaker>..\x64\Release\TileMaker.exe -d blocks -o terrainExt.png -m

C:\Users\erich\Documents\_Documents\minecraft\Mineways\git_code\TileMaker\TileMaker>pause
Press any key to continue . . .
13 changes: 7 additions & 6 deletions Win/ColorSchemes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,12 @@ ColorManager::~ColorManager()
void ColorManager::Init(ColorScheme *cs)
{
int i;
for (i=0;i<NUM_BLOCKS;i++)
for (i=0;i<NUM_BLOCKS_CS;i++)
{
cs->colors[i]=blockColor(i);
}
for (int i=NUM_BLOCKS; i < 256; i++)
// fill in rest, if NUM_BLOCKS_CS is higher than NUM_BLOCKS
for (i=NUM_BLOCKS; i < NUM_BLOCKS_CS; i++)
{
// fill the rest with almost-black; if we detect this color on loading
// a color scheme in a place that should have been a normal color, then
Expand Down Expand Up @@ -404,7 +405,7 @@ INT_PTR CALLBACK ColorSchemeEdit(HWND hDlg,UINT message,WPARAM wParam,LPARAM lPa
item.state=0;
item.stateMask=0;
item.pszText=LPSTR_TEXTCALLBACK;
for (int i=0;i<NUM_BLOCKS;i++)
for (int i=0;i<NUM_BLOCKS_CS;i++)
{
item.iItem=i;
ListView_InsertItem(lv,&item);
Expand Down Expand Up @@ -504,12 +505,12 @@ INT_PTR CALLBACK ColorSchemeEdit(HWND hDlg,UINT message,WPARAM wParam,LPARAM lPa
case IDC_HIDE_ALL_BLOCKS:
{
// set all blocks' alphas to zero. Useful for printing out just one material
for (int i=0;i<NUM_BLOCKS;i++)
for (int i=0;i<NUM_BLOCKS_CS;i++)
{
curCS.colors[i] &= ~0xff;
}
HWND lv=GetDlgItem(hDlg,IDC_COLORLIST);
ListView_RedrawItems(lv,0,NUM_BLOCKS-1);
ListView_RedrawItems(lv,0,NUM_BLOCKS_CS-1);
}
break;
case IDC_HIDE_TREE_BLOCKS:
Expand All @@ -521,7 +522,7 @@ INT_PTR CALLBACK ColorSchemeEdit(HWND hDlg,UINT message,WPARAM wParam,LPARAM lPa
curCS.colors[BLOCK_AD_LEAVES] &= ~0xff;

HWND lv=GetDlgItem(hDlg,IDC_COLORLIST);
ListView_RedrawItems(lv,0,NUM_BLOCKS-1);
ListView_RedrawItems(lv,0,NUM_BLOCKS_CS-1);
}
break;
case IDCANCEL:
Expand Down
2 changes: 1 addition & 1 deletion Win/ColorSchemes.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ typedef struct
{
int id;
wchar_t name[255];
unsigned int colors[256]; // RGBA, unmultiplied by A
unsigned int colors[NUM_BLOCKS_CS]; // RGBA, unmultiplied by A
} ColorScheme;

class ColorManager
Expand Down
Loading

0 comments on commit 37bc076

Please sign in to comment.