Night Owl
7 years ago
53 changed files with 1213 additions and 87 deletions
@ -0,0 +1,28 @@
@@ -0,0 +1,28 @@
|
||||
version: 1.0.{build} |
||||
|
||||
branches: |
||||
only: |
||||
- master |
||||
|
||||
environment: |
||||
matrix: |
||||
- os: Visual Studio 2013 |
||||
GENERATOR_NAME: "Visual Studio 12 2013" |
||||
- os: Visual Studio 2015 |
||||
GENERATOR_NAME: "Visual Studio 14 2015" |
||||
# TODO: Uncomment when AppVeyor will provide XP toolchain for VS2017 |
||||
# - os: Visual Studio 2017 |
||||
# GENERATOR_NAME: "Visual Studio 15 2017" |
||||
|
||||
clone_folder: c:\projects\xash\hlsdk-xash3d |
||||
|
||||
build: |
||||
project: INSTALL.vcxproj |
||||
verbosity: normal |
||||
|
||||
configuration: |
||||
- Debug |
||||
|
||||
before_build: |
||||
- git submodule update --init --recursive |
||||
- cmake -G "%GENERATOR_NAME%" |
||||
@ -0,0 +1,29 @@
@@ -0,0 +1,29 @@
|
||||
if(WIN32) |
||||
# Windows XP compatible platform toolset. Must be set before project(), |
||||
# otherwise change of CMAKE_*_TOOLSET will take no effect. |
||||
# We get VS version from the generator name because neither MSVC* nor other |
||||
# variables that describe the compiler aren't available before project(). |
||||
if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([0-9]+)") |
||||
if(${CMAKE_MATCH_1} LESS 11) |
||||
# Nothing. Older VS does support XP by default. |
||||
elseif(${CMAKE_MATCH_1} EQUAL 11) |
||||
# Visual Studio 11 2012 |
||||
set(CMAKE_GENERATOR_TOOLSET "v110_xp" CACHE STRING "CMAKE_GENERATOR_TOOLSET" FORCE) |
||||
set(CMAK_VS_PLATFORM_TOOLSET "v110_xp" CACHE STRING "CMAKE_VS_PLATFORM_TOOLSET" FORCE) |
||||
elseif (${CMAKE_MATCH_1} EQUAL 12) |
||||
# Visual Studio 12 2013 |
||||
set(CMAKE_GENERATOR_TOOLSET "v120_xp" CACHE STRING "CMAKE_GENERATOR_TOOLSET" FORCE) |
||||
set(CMAKE_VS_PLATFORM_TOOLSET "v120_xp" CACHE STRING "CMAKE_VS_PLATFORM_TOOLSET" FORCE) |
||||
elseif (${CMAKE_MATCH_1} EQUAL 14) |
||||
# Visual Studio 14 2015 |
||||
set(CMAKE_GENERATOR_TOOLSET "v140_xp" CACHE STRING "CMAKE_GENERATOR_TOOLSET" FORCE) |
||||
set(CMAKE_VS_PLATFORM_TOOLSET "v140_xp" CACHE STRING "CMAKE_VS_PLATFORM_TOOLSET" FORCE) |
||||
elseif (${CMAKE_MATCH_1} EQUAL 15) |
||||
# Visual Studio 15 2017 |
||||
set(CMAKE_GENERATOR_TOOLSET "v141_xp" CACHE STRING "CMAKE_GENERATOR_TOOLSET" FORCE) |
||||
set(CMAKE_VS_PLATFORM_TOOLSET "v141_xp" CACHE STRING "CMAKE_VS_PLATFORM_TOOLSET" FORCE) |
||||
else() |
||||
message(WARNING "WARNING: You maybe building without Windows XP compability. See which toolchain version Visual Studio provides, and say cmake to use it: cmake -G \"Visual Studio XX\" -T \"vXXX_xp\"") |
||||
endif() |
||||
endif() |
||||
endif() |
||||
@ -0,0 +1,845 @@
@@ -0,0 +1,845 @@
|
||||
/***
|
||||
* |
||||
* Copyright (c) 1996-2002, Valve LLC. All rights reserved. |
||||
* |
||||
* This product contains software technology licensed from Id |
||||
* Software, Inc. ("Id Technology"). Id Technology (c) 1996 Id Software, Inc. |
||||
* All Rights Reserved. |
||||
* |
||||
* Use, distribution, and modification of this source code and/or resulting |
||||
* object code is restricted to non-commercial enhancements to products from |
||||
* Valve LLC. All other use, distribution, or modification is prohibited |
||||
* without written permission from Valve LLC. |
||||
* |
||||
****/ |
||||
|
||||
#define _NOENUMQBOOL |
||||
|
||||
#include <windows.h> |
||||
|
||||
extern "C" |
||||
{ |
||||
#include "cmdlib.h" |
||||
#include "wadlib.h" |
||||
} |
||||
#include "qfont.h" |
||||
|
||||
#define DEFAULT_FONT "Arial" |
||||
|
||||
#define FONT_TAG 6 // Font's are the 6th tag after the TYP_LUMPY base ( 64 )...i.e., type == 70
|
||||
|
||||
BOOL bItalic = FALSE; |
||||
BOOL bBold = FALSE; |
||||
BOOL bUnderline = FALSE; |
||||
|
||||
char fontname[ 256 ]; |
||||
int pointsize[3] = { 9, 11, 15 }; |
||||
|
||||
/*
|
||||
================= |
||||
zeromalloc |
||||
|
||||
Allocates and zeroes memory |
||||
================= |
||||
*/ |
||||
void *zeromalloc( size_t size ) |
||||
{ |
||||
unsigned char *pbuffer; |
||||
pbuffer = ( unsigned char * )malloc( size ); |
||||
if ( !pbuffer ) |
||||
{ |
||||
printf( "Failed on allocation of %i bytes", size ); |
||||
exit( -1 ); |
||||
} |
||||
|
||||
memset( pbuffer, 0, size ); |
||||
return ( void * )pbuffer; |
||||
} |
||||
|
||||
/*
|
||||
================= |
||||
Draw_SetupConsolePalette |
||||
|
||||
Set's the palette to full brightness ( 192 ) and |
||||
set's up palette entry 0 -- black |
||||
================= |
||||
*/ |
||||
void Draw_SetupConsolePalette( unsigned char *pal ) |
||||
{ |
||||
unsigned char *pPalette; |
||||
int i; |
||||
|
||||
pPalette = pal; |
||||
|
||||
*(short *)pPalette = 3 * 256; |
||||
pPalette += sizeof( short ); |
||||
|
||||
for ( i = 0; i < 256; i++ ) |
||||
{ |
||||
pPalette[3 * i + 0 ] = i; |
||||
pPalette[3 * i + 1 ] = i; |
||||
pPalette[3 * i + 2 ] = i; |
||||
} |
||||
|
||||
// Set palette zero correctly
|
||||
pPalette[ 0 ] = 0; |
||||
pPalette[ 1 ] = 0; |
||||
pPalette[ 2 ] = 0; |
||||
} |
||||
|
||||
//DJXX added for debugging
|
||||
BOOL WriteDIB(LPTSTR szFile, HANDLE hDIB) |
||||
{ |
||||
BITMAPFILEHEADER hdr; |
||||
LPBITMAPINFOHEADER lpbi; |
||||
|
||||
if (!hDIB) |
||||
return FALSE; |
||||
|
||||
FILE *file; |
||||
file = SafeOpenWrite(szFile); |
||||
|
||||
|
||||
lpbi = (LPBITMAPINFOHEADER)hDIB; |
||||
|
||||
int nColors = 1 << lpbi->biBitCount; |
||||
|
||||
// Fill in the fields of the file header
|
||||
hdr.bfType = ((WORD)('M' << 8) | 'B'); // is always "BM"
|
||||
hdr.bfSize = GlobalSize(hDIB) + sizeof(hdr); |
||||
printf("WriteDIB. Error code = %i\n",GetLastError()); |
||||
hdr.bfReserved1 = 0; |
||||
hdr.bfReserved2 = 0; |
||||
hdr.bfOffBits = (DWORD)(sizeof(hdr)+lpbi->biSize + |
||||
nColors * sizeof(RGBQUAD)); |
||||
|
||||
// Write the file header
|
||||
SafeWrite(file, &hdr, sizeof(hdr)); |
||||
|
||||
// Write the DIB header and the bits
|
||||
SafeWrite(file, lpbi, GlobalSize(hDIB)); |
||||
fclose(file); |
||||
return TRUE; |
||||
} |
||||
|
||||
|
||||
/*
|
||||
================= |
||||
CreateProportionalConsoleFont |
||||
|
||||
Renders TT font into memory dc and creates appropriate qfont_t structure |
||||
================= |
||||
*/ |
||||
//DJXX: New version, draws chararacters closely to each other without spaces
|
||||
|
||||
// YWB: Sigh, VC 6.0's global optimizer causes weird stack fixups in release builds. Disable the globabl optimizer for this function.
|
||||
#pragma optimize( "g", off ) |
||||
qfont_t *CreateProportionalConsoleFont(char *pszFont, int nPointSize, BOOL bItalic, BOOL bUnderline, BOOL bBold, int *outsize) |
||||
{ |
||||
HDC hdc; |
||||
HDC hmemDC; |
||||
HBITMAP hbm, oldbm; |
||||
RECT rc; |
||||
HFONT fnt, oldfnt; |
||||
TEXTMETRIC tm; |
||||
int startchar = 32; |
||||
int c; |
||||
int i, j; |
||||
int x, y; |
||||
int nScans; |
||||
unsigned char *bits; |
||||
BITMAPINFO tempbmi; |
||||
BITMAPINFO *pbmi; |
||||
BITMAPINFOHEADER *pbmheader; |
||||
unsigned char *pqdata; |
||||
unsigned char *pCur; |
||||
int x1, y1; |
||||
unsigned char *pPalette; |
||||
qfont_t *pqf = NULL; |
||||
int fullsize; |
||||
int w = 16; |
||||
//int h = (128 - 32) / 16;
|
||||
int h = (256 - 32) / 16; |
||||
int charheight = nPointSize + 5; |
||||
int charwidth = 16;//now used only for calculating width of wad texture
|
||||
int fontcharwidth; |
||||
int edge = 1; |
||||
RECT rcChar; |
||||
boolean lShadow = true;//draw shadow instead of outline
|
||||
|
||||
// Create the font
|
||||
fnt = CreateFont(-nPointSize, 0, 0, 0, bBold ? FW_HEAVY : FW_MEDIUM, bItalic, bUnderline, 0, /*ANSI_CHARSET*/DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, VARIABLE_PITCH | FF_DONTCARE, pszFont); |
||||
|
||||
bits = NULL; |
||||
|
||||
fullsize = sizeof(qfont_t)-4 + (/*128*/256 * w * charwidth) + sizeof(short)+768 + 64; |
||||
|
||||
// Store off final size
|
||||
*outsize = fullsize; |
||||
|
||||
pqf = (qfont_t *)zeromalloc(fullsize); |
||||
pqdata = (unsigned char *)pqf + sizeof(qfont_t)-4; |
||||
|
||||
pPalette = pqdata + (/*128*/256 * w * charwidth); |
||||
|
||||
// Configure palette
|
||||
Draw_SetupConsolePalette(pPalette); |
||||
|
||||
hdc = GetDC(NULL); |
||||
hmemDC = CreateCompatibleDC(hdc); |
||||
|
||||
oldfnt = (HFONT)SelectObject(hmemDC, fnt); |
||||
|
||||
if (GetTextMetrics(hmemDC, &tm)) |
||||
{ |
||||
fontcharwidth = tm.tmMaxCharWidth; |
||||
if (fontcharwidth % 2)//hack: on odd values of fontcharwidth, bitmaps pixel check gives false triggering
|
||||
fontcharwidth++; |
||||
} |
||||
else { |
||||
fontcharwidth = charwidth; |
||||
} |
||||
|
||||
if (lShadow) |
||||
charheight += edge;//adding 1 pixel to bottom for shadowing
|
||||
|
||||
rc.top = 0; |
||||
rc.left = 0; |
||||
rc.right = fontcharwidth * w; |
||||
rc.bottom = charheight * h; |
||||
|
||||
hbm = CreateBitmap(fontcharwidth * w, charheight * h, 1, 1, NULL); |
||||
oldbm = (HBITMAP)SelectObject(hmemDC, hbm); |
||||
|
||||
SetTextColor(hmemDC, 0x00ffffff); |
||||
SetBkMode(hmemDC, TRANSPARENT); |
||||
|
||||
// Paint black background
|
||||
FillRect(hmemDC, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH)); |
||||
|
||||
// Draw character set into memory DC
|
||||
for (j = 0; j < h; j++) |
||||
{ |
||||
for (i = 0; i < w; i++) |
||||
{ |
||||
x = i * fontcharwidth; |
||||
y = j * charheight; |
||||
|
||||
c = (unsigned char)(startchar + j * w + i); |
||||
|
||||
// Only draw printable characters, of course
|
||||
//if ( isprint( c ) && c <= 127 )
|
||||
{ |
||||
// Draw it.
|
||||
rcChar.left = x + 1; |
||||
rcChar.top = y + 1; |
||||
rcChar.right = x + fontcharwidth - 1; |
||||
rcChar.bottom = y + charheight - 1; |
||||
|
||||
DrawText(hmemDC, (char *)&c, 1, &rcChar, DT_NOPREFIX | DT_LEFT); |
||||
} |
||||
} |
||||
} |
||||
|
||||
// Now turn the qfont into raw format
|
||||
memset(&tempbmi, 0, sizeof(BITMAPINFO)); |
||||
|
||||
pbmheader = (BITMAPINFOHEADER *)&tempbmi; |
||||
|
||||
pbmheader->biSize = sizeof(BITMAPINFOHEADER); |
||||
pbmheader->biWidth = w * fontcharwidth; |
||||
pbmheader->biHeight = -h * charheight; |
||||
pbmheader->biPlanes = 1; |
||||
pbmheader->biBitCount = 1; |
||||
pbmheader->biCompression = BI_RGB; |
||||
|
||||
// Find out how big the bitmap is
|
||||
nScans = GetDIBits(hmemDC, hbm, 0, h * charheight, NULL, &tempbmi, DIB_RGB_COLORS); |
||||
|
||||
// Allocate space for all bits
|
||||
pbmi = (BITMAPINFO *)zeromalloc(sizeof (BITMAPINFOHEADER)+2 * sizeof(RGBQUAD)+pbmheader->biSizeImage); |
||||
|
||||
memcpy(pbmi, &tempbmi, sizeof(BITMAPINFO)); |
||||
|
||||
bits = (unsigned char *)pbmi + sizeof(BITMAPINFOHEADER)+2 * sizeof(RGBQUAD); |
||||
|
||||
// Now read in bits
|
||||
nScans = GetDIBits(hmemDC, hbm, 0, h * charheight, bits, pbmi, DIB_RGB_COLORS); |
||||
|
||||
if (nScans > 0) |
||||
{ |
||||
#if 0 //for debugging
|
||||
char sz[128];//DJXX write dib to file
|
||||
sprintf(sz, "font_%s_%i.bmp", pszFont, nPointSize); |
||||
WriteDIB(sz, pbmi); |
||||
#endif |
||||
// Now convert to proper raw format
|
||||
//
|
||||
// Now get results from dib
|
||||
pqf->height = /*128*/256; // Always set to 128
|
||||
pqf->width = charwidth; |
||||
pqf->rowheight = charheight; |
||||
pqf->rowcount = h; |
||||
pCur = pqdata; |
||||
|
||||
// Set everything to index 255 ( 0xff ) == transparent
|
||||
memset(pCur, 0xFF, w * charwidth * pqf->height); |
||||
|
||||
int k = 0, dest_x = 0, dest_y = 0; |
||||
|
||||
for (j = 0; j < h; j++) |
||||
for (i = 0; i < w; i++) |
||||
{ |
||||
int rightmost, leftmost, realcharwidth; |
||||
|
||||
x = i * fontcharwidth; |
||||
y = j * charheight; |
||||
|
||||
//c = (char)( startchar + j * w + i ); here was memory bug
|
||||
c = (unsigned char)(startchar + j * w + i); |
||||
|
||||
rightmost = 0; |
||||
leftmost = fontcharwidth; |
||||
|
||||
//Calculate real width of the character
|
||||
for (y1 = 0; y1 < charheight; y1++) |
||||
for (x1 = 0; x1 < fontcharwidth; x1++) |
||||
{ |
||||
int src_offset; |
||||
|
||||
src_offset = (y + y1) * w * fontcharwidth + x + x1; |
||||
|
||||
if (bits[src_offset >> 3] & (1 << (7 - src_offset & 7)))//on odd values of fontcharwidth this check gives false triggering
|
||||
{ |
||||
if (x1 > rightmost) |
||||
rightmost = x1; |
||||
|
||||
if (x1 < leftmost) |
||||
leftmost = x1; |
||||
} |
||||
} |
||||
if (leftmost > rightmost)//empty characters
|
||||
{ |
||||
leftmost = 0; |
||||
rightmost = 7; |
||||
} else { |
||||
rightmost += edge; |
||||
if (!lShadow) |
||||
leftmost -= edge; |
||||
} |
||||
|
||||
realcharwidth = rightmost - leftmost + 1; |
||||
pqf->fontinfo[c].charwidth = realcharwidth; |
||||
|
||||
if (dest_x + realcharwidth >= w * charwidth)//if it not fits on current line then carry it to the next line
|
||||
{ |
||||
dest_x = 0; |
||||
k++; |
||||
} |
||||
|
||||
dest_y = k * charheight; |
||||
pqf->fontinfo[c].startoffset = dest_y * w * charwidth + dest_x; |
||||
|
||||
if (lShadow) |
||||
{ |
||||
int shift = edge; |
||||
//Draw shadow by shifting character to 1 pixel right and down
|
||||
for (y1 = 0; y1 < charheight; y1++) |
||||
for (x1 = 0; x1 < realcharwidth; x1++) |
||||
{ |
||||
int src_offset, dest_offset; |
||||
|
||||
src_offset = (y + y1) * w * fontcharwidth + x + x1 + leftmost; |
||||
dest_offset = (dest_y + shift + y1) * w * charwidth + (dest_x + shift + x1); |
||||
|
||||
// Dest
|
||||
pCur = pqdata + dest_offset; |
||||
|
||||
if (bits[src_offset >> 3] & (1 << (7 - src_offset & 7))) |
||||
{ |
||||
// Near Black
|
||||
//pCur[0] = 32;
|
||||
pCur[0] = 0;//full black so shadow remains black even it's coloured text
|
||||
} |
||||
} |
||||
} |
||||
else |
||||
{ |
||||
// Put black pixels below and to the right of each pixel(outline)
|
||||
for (y1 = edge; y1 < charheight - edge; y1++) |
||||
for (x1 = 0; x1 < realcharwidth; x1++) |
||||
{ |
||||
int src_offset, dest_offset; |
||||
|
||||
int xx0, yy0; |
||||
|
||||
dest_offset = (dest_y + y1) * w * charwidth + (dest_x + x1); |
||||
|
||||
// Dest
|
||||
pCur = pqdata + dest_offset; |
||||
|
||||
for (xx0 = -edge; xx0 <= edge; xx0++) |
||||
for (yy0 = -edge; yy0 <= edge; yy0++) |
||||
{ |
||||
src_offset = (y + y1 + yy0) * w * fontcharwidth + x + x1 + xx0 + leftmost;//adding shift
|
||||
|
||||
if (bits[src_offset >> 3] & (1 << (7 - src_offset & 7))) |
||||
{ |
||||
// Near Black
|
||||
pCur[0] = 32; |
||||
} |
||||
} |
||||
} |
||||
} |
||||
|
||||
// Now copy in the actual font pixels
|
||||
for (y1 = 0; y1 < charheight; y1++) |
||||
for (x1 = 0; x1 < realcharwidth; x1++) |
||||
{ |
||||
int src_offset, dest_offset; |
||||
|
||||
src_offset = (y + y1) * w * fontcharwidth + x + x1 + leftmost; |
||||
dest_offset = (dest_y + y1) * w * charwidth + (dest_x + x1); |
||||
|
||||
// Dest
|
||||
pCur = pqdata + dest_offset; |
||||
|
||||
if (bits[src_offset >> 3] & (1 << (7 - src_offset & 7))) |
||||
{ |
||||
pCur[0] = 192; |
||||
} |
||||
} |
||||
dest_x += realcharwidth; |
||||
} |
||||
} |
||||
// Free memory bits
|
||||
free(pbmi); |
||||
SelectObject(hmemDC, oldfnt); |
||||
DeleteObject(fnt); |
||||
|
||||
SelectObject(hmemDC, oldbm); |
||||
|
||||
DeleteObject(hbm); |
||||
|
||||
DeleteDC(hmemDC); |
||||
ReleaseDC(NULL, hdc); |
||||
|
||||
return pqf; |
||||
} |
||||
#pragma optimize( "g", on ) |
||||
|
||||
|
||||
/*
|
||||
================= |
||||
CreateConsoleFont |
||||
|
||||
Renders TT font into memory dc and creates appropriate qfont_t structure |
||||
================= |
||||
*/ |
||||
//DJXX: original version, just added drawing of locale characters and fixed memory bug.
|
||||
// YWB: Sigh, VC 6.0's global optimizer causes weird stack fixups in release builds. Disable the globabl optimizer for this function.
|
||||
#pragma optimize( "g", off ) |
||||
qfont_t *CreateConsoleFont( char *pszFont, int nPointSize, BOOL bItalic, BOOL bUnderline, BOOL bBold, int *outsize ) |
||||
{ |
||||
HDC hdc; |
||||
HDC hmemDC; |
||||
HBITMAP hbm, oldbm; |
||||
RECT rc; |
||||
HFONT fnt, oldfnt; |
||||
int startchar = 32; |
||||
int c; |
||||
int i, j; |
||||
int x, y; |
||||
int nScans; |
||||
unsigned char *bits; |
||||
BITMAPINFO tempbmi; |
||||
BITMAPINFO *pbmi; |
||||
BITMAPINFOHEADER *pbmheader; |
||||
unsigned char *pqdata; |
||||
unsigned char *pCur; |
||||
int x1, y1; |
||||
unsigned char *pPalette; |
||||
qfont_t *pqf = NULL; |
||||
int fullsize; |
||||
int w = 16; |
||||
//int h = (128-32)/16;
|
||||
int h = (256 - 32) / 16; |
||||
int charheight = nPointSize + 5; |
||||
int charwidth = 16; |
||||
RECT rcChar; |
||||
|
||||
// Create the font
|
||||
fnt = CreateFont( -nPointSize, 0, 0, 0, bBold ? FW_HEAVY : FW_MEDIUM, bItalic, bUnderline, 0, /*ANSI_CHARSET*/DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, VARIABLE_PITCH | FF_DONTCARE, pszFont ); |
||||
|
||||
bits = NULL; |
||||
|
||||
fullsize = sizeof( qfont_t ) - 4 + ( /*128*/256 * w * charwidth ) + sizeof(short) + 768 + 64; |
||||
|
||||
// Store off final size
|
||||
*outsize = fullsize; |
||||
|
||||
pqf = ( qfont_t * )zeromalloc( fullsize ); |
||||
pqdata = (unsigned char *)pqf + sizeof( qfont_t ) - 4; |
||||
|
||||
pPalette = pqdata + ( /*128*/256 * w * charwidth); |
||||
|
||||
// Configure palette
|
||||
Draw_SetupConsolePalette( pPalette ); |
||||
|
||||
hdc = GetDC( NULL ); |
||||
hmemDC = CreateCompatibleDC( hdc ); |
||||
|
||||
rc.top = 0; |
||||
rc.left = 0; |
||||
rc.right = charwidth * w; |
||||
rc.bottom = charheight * h; |
||||
|
||||
hbm = CreateBitmap( charwidth * w, charheight * h, 1, 1, NULL ); |
||||
oldbm = (HBITMAP)SelectObject( hmemDC, hbm ); |
||||
oldfnt = (HFONT)SelectObject( hmemDC, fnt ); |
||||
|
||||
SetTextColor( hmemDC, 0x00ffffff ); |
||||
SetBkMode( hmemDC, TRANSPARENT ); |
||||
|
||||
// Paint black background
|
||||
FillRect( hmemDC, &rc, (HBRUSH)GetStockObject( BLACK_BRUSH ) ); |
||||
|
||||
// Draw character set into memory DC
|
||||
for ( j = 0; j < h; j++ ) |
||||
{ |
||||
for ( i = 0; i < w; i++ ) |
||||
{ |
||||
x = i * charwidth; |
||||
y = j * charheight; |
||||
|
||||
c = (unsigned char)( startchar + j * w + i ); |
||||
|
||||
// Only draw printable characters, of course
|
||||
//if ( isprint( c ) && c <= 127 )
|
||||
{ |
||||
// Draw it.
|
||||
rcChar.left = x + 1; |
||||
rcChar.top = y + 1; |
||||
rcChar.right = x + charwidth - 1; |
||||
rcChar.bottom = y + charheight - 1; |
||||
|
||||
DrawText( hmemDC, (char *)&c, 1, &rcChar, DT_NOPREFIX | DT_LEFT ); |
||||
} |
||||
} |
||||
} |
||||
|
||||
// Now turn the qfont into raw format
|
||||
memset( &tempbmi, 0, sizeof( BITMAPINFO ) ); |
||||
pbmheader = ( BITMAPINFOHEADER * )&tempbmi; |
||||
|
||||
pbmheader->biSize = sizeof( BITMAPINFOHEADER ); |
||||
pbmheader->biWidth = w * charwidth; |
||||
pbmheader->biHeight = -h * charheight; |
||||
pbmheader->biPlanes = 1; |
||||
pbmheader->biBitCount = 1; |
||||
pbmheader->biCompression = BI_RGB; |
||||
|
||||
// Find out how big the bitmap is
|
||||
nScans = GetDIBits( hmemDC, hbm, 0, h * charheight, NULL, &tempbmi, DIB_RGB_COLORS ); |
||||
|
||||
// Allocate space for all bits
|
||||
pbmi = ( BITMAPINFO * )zeromalloc( sizeof ( BITMAPINFOHEADER ) + 2 * sizeof( RGBQUAD ) + pbmheader->biSizeImage ); |
||||
|
||||
memcpy( pbmi, &tempbmi, sizeof( BITMAPINFO ) ); |
||||
|
||||
bits = ( unsigned char * )pbmi + sizeof( BITMAPINFOHEADER ) + 2 * sizeof( RGBQUAD ); |
||||
|
||||
// Now read in bits
|
||||
nScans = GetDIBits( hmemDC, hbm, 0, h * charheight, bits, pbmi, DIB_RGB_COLORS ); |
||||
|
||||
if ( nScans > 0 ) |
||||
{ |
||||
#if 0 //for debugging
|
||||
char sz[128];//DJXX write dib to file
|
||||
sprintf(sz, "font_%s_%i.bmp", pszFont, nPointSize); |
||||
WriteDIB(sz, pbmi); |
||||
#endif |
||||
|
||||
// Now convert to proper raw format
|
||||
//
|
||||
// Now get results from dib
|
||||
pqf->height = /*128*/256; // Always set to 128
|
||||
pqf->width = charwidth; |
||||
pqf->rowheight = charheight; |
||||
pqf->rowcount = h; |
||||
pCur = pqdata; |
||||
|
||||
// Set everything to index 255 ( 0xff ) == transparent
|
||||
memset( pCur, 0xFF, w * charwidth * pqf->height ); |
||||
|
||||
for ( j = 0; j < h; j++ ) |
||||
{ |
||||
for ( i = 0; i < w; i++ ) |
||||
{ |
||||
int edge = 1; |
||||
int bestwidth; |
||||
x = i * charwidth; |
||||
y = j * charheight; |
||||
|
||||
|
||||
//c = (char)( startchar + j * w + i ); here was memory bug
|
||||
c = (unsigned char)(startchar + j * w + i); |
||||
|
||||
pqf->fontinfo[ c ].charwidth = charwidth; |
||||
pqf->fontinfo[ c ].startoffset = y * w * charwidth + x; |
||||
|
||||
bestwidth = 0; |
||||
|
||||
// In this first pass, place the black drop shadow so characters draw ok in the engine against
|
||||
// most backgrounds.
|
||||
// YWB: FIXME, apply a box filter and enable blending?
|
||||
#if 0//DJXX: we already did that for a whole image by memset
|
||||
// Make it all transparent for starters
|
||||
for ( y1 = 0; y1 < charheight; y1++ ) |
||||
{ |
||||
for ( x1 = 0; x1 < charwidth; x1++ ) |
||||
{ |
||||
int offset; |
||||
offset = ( y + y1 ) * w * charwidth + x + x1 ; |
||||
// Dest
|
||||
pCur = pqdata + offset; |
||||
// Assume transparent
|
||||
pCur[0] = 255; |
||||
} |
||||
} |
||||
#endif |
||||
// Put black pixels below and to the right of each pixel
|
||||
for ( y1 = edge; y1 < charheight - edge; y1++ ) |
||||
{ |
||||
for ( x1 = 0; x1 < charwidth; x1++ ) |
||||
{ |
||||
int offset; |
||||
int srcoffset; |
||||
|
||||
int xx0, yy0; |
||||
|
||||
offset = ( y + y1 ) * w * charwidth + x + x1 ; |
||||
|
||||
// Dest
|
||||
pCur = pqdata + offset; |
||||
|
||||
for ( xx0 = -edge; xx0 <= edge; xx0++ ) |
||||
{ |
||||
for ( yy0 = -edge; yy0 <= edge; yy0++ ) |
||||
{ |
||||
srcoffset = ( y + y1 + yy0 ) * w * charwidth + x + x1 + xx0; |
||||
|
||||
if ( bits[ srcoffset >> 3 ] & ( 1 << ( 7 - srcoffset & 7 ) ) ) |
||||
{ |
||||
// Near Black
|
||||
pCur[0] = 32; |
||||
} |
||||
} |
||||
} |
||||
} |
||||
} |
||||
|
||||
// Now copy in the actual font pixels
|
||||
for ( y1 = 0; y1 < charheight; y1++ ) |
||||
{ |
||||
for ( x1 = 0; x1 < charwidth; x1++ ) |
||||
{ |
||||
int offset; |
||||
|
||||
offset = ( y + y1 ) * w * charwidth + x + x1; |
||||
|
||||
// Dest
|
||||
pCur = pqdata + offset; |
||||
|
||||
if ( bits[ offset >> 3 ] & ( 1 << ( 7 - offset & 7 ) ) ) |
||||
{ |
||||
if ( x1 > bestwidth ) |
||||
{ |
||||
bestwidth = x1; |
||||
} |
||||
|
||||
// Full color
|
||||
// FIXME: Enable true palette support in engine?
|
||||
pCur[0] = 192; |
||||
} |
||||
} |
||||
} |
||||
|
||||
// bestwidth += 1;
|
||||
/*
|
||||
// Now blend it
|
||||
for ( y1 = 0; y1 < charheight; y1++ ) |
||||
{ |
||||
for ( x1 = 0; x1 < charwidth; x1++ ) |
||||
{ |
||||
int offset; |
||||
|
||||
offset = ( y + y1 ) * w * charwidth + x + x1; |
||||
|
||||
// Dest
|
||||
pCur = pqdata + offset; |
||||
|
||||
if ( bits[ offset >> 3 ] & ( 1 << ( 7 - offset & 7 ) ) ) |
||||
{ |
||||
if ( x1 > bestwidth ) |
||||
{ |
||||
bestwidth = x1; |
||||
} |
||||
|
||||
// Full color
|
||||
// FIXME: Enable true palette support in engine?
|
||||
pCur[0] = 192; |
||||
} |
||||
} |
||||
} |
||||
*/ |
||||
|
||||
// Space character width
|
||||
if ( c == 32 ) |
||||
{ |
||||
bestwidth = 8; |
||||
} |
||||
else |
||||
{ |
||||
// Small characters needs can be padded a bit so they don't run into each other
|
||||
if ( bestwidth <= 14 ) |
||||
{ |
||||
bestwidth += 2; |
||||
} |
||||
} |
||||
|
||||
// Store off width
|
||||
pqf->fontinfo[ c ].charwidth = bestwidth; |
||||
} |
||||
} |
||||
} |
||||
|
||||
// Free memory bits
|
||||
free ( pbmi ); |
||||
|
||||
SelectObject( hmemDC, oldfnt ); |
||||
DeleteObject( fnt ); |
||||
|
||||
SelectObject( hmemDC, oldbm ); |
||||
|
||||
DeleteObject( hbm ); |
||||
|
||||
DeleteDC( hmemDC ); |
||||
ReleaseDC( NULL, hdc ); |
||||
|
||||
return pqf; |
||||
} |
||||
|
||||
#pragma optimize( "g", on ) |
||||
|
||||
/*
|
||||
================= |
||||
main |
||||
|
||||
================= |
||||
*/ |
||||
int main(int argc, char* argv[]) |
||||
{ |
||||
int i; |
||||
DWORD start, end; |
||||
char destfile[1024]; |
||||
char sz[ 32 ]; |
||||
int outsize[ 3 ]; |
||||
|
||||
qfont_t *fonts[ 3 ]; |
||||
|
||||
strcpy( fontname, DEFAULT_FONT ); |
||||
|
||||
printf("makefont.exe Version 2.0 by valve and DJXX (%s)\n", __DATE__ ); |
||||
|
||||
printf ("----- Creating Console Font ----\n"); |
||||
|
||||
for (i=1 ; i<argc ; i++) |
||||
{ |
||||
if (!strcmp(argv[i],"-font")) |
||||
{ |
||||
strcpy( fontname, argv[i+1] ); |
||||
i++; |
||||
} |
||||
else if (!strcmp(argv[i],"-pointsizes")) |
||||
{ |
||||
if ( i + 3 >= argc ) |
||||
{ |
||||
Error( "Makefont: Insufficient point sizes specified\n" ); |
||||
} |
||||
pointsize[0] = atoi( argv[i+1] ); |
||||
pointsize[1] = atoi( argv[i+2] ); |
||||
pointsize[2] = atoi( argv[i+3] ); |
||||
i += 3; |
||||
} |
||||
else if (!strcmp(argv[i],"-italic")) |
||||
{ |
||||
bItalic = TRUE; |
||||
printf ( "italic set\n"); |
||||
} |
||||
else if (!strcmp(argv[i],"-bold")) |
||||
{ |
||||
bBold = TRUE; |
||||
printf ( "bold set\n"); |
||||
} |
||||
else if (!strcmp(argv[i],"-underline")) |
||||
{ |
||||
bUnderline = TRUE; |
||||
printf ( "underline set\n"); |
||||
} |
||||
else if ( argv[i][0] == '-' ) |
||||
{ |
||||
Error ("Unknown option \"%s\"", argv[i]); |
||||
} |
||||
else |
||||
break; |
||||
} |
||||
|
||||
if ( i != argc - 1 ) |
||||
{ |
||||
Error ("usage: makefont [-font \"fontname\"] [-italic] [-underline] [-bold] [-pointsizes sm med lg] outfile"); |
||||
} |
||||
|
||||
printf( "Creating %i, %i, and %i point %s fonts\n", pointsize[0], pointsize[1], pointsize[2], fontname ); |
||||
|
||||
start = timeGetTime(); |
||||
|
||||
// Create the fonts
|
||||
for ( i = 0 ; i < 3; i++ ) |
||||
{ |
||||
fonts[ i ] = CreateProportionalConsoleFont( fontname, pointsize[i], bItalic, bUnderline, bBold, &outsize[ i ] ); |
||||
//fonts[i] = CreateConsoleFont(fontname, pointsize[i], bItalic, bUnderline, bBold, &outsize[i]);
|
||||
} |
||||
|
||||
// Create wad file
|
||||
strcpy (destfile, argv[argc - 1]); |
||||
StripExtension (destfile); |
||||
DefaultExtension (destfile, ".wad"); |
||||
|
||||
NewWad( destfile, false ); |
||||
|
||||
// Add fonts as lumps
|
||||
for ( i = 0; i < 3; i++ ) |
||||
{ |
||||
sprintf( sz, "font%i", i ); |
||||
AddLump( sz, fonts[ i ], outsize[ i ], TYP_LUMPY + FONT_TAG, false ); |
||||
} |
||||
|
||||
// Store results as a WAD3
|
||||
// NOTE: ( should be named fonts.wad in the valve\ subdirectory )
|
||||
WriteWad( 3 ); |
||||
|
||||
// Clean up memory
|
||||
for ( i = 0 ; i < 3; i++ ) |
||||
{ |
||||
free( fonts[ i ] ); |
||||
} |
||||
|
||||
end = timeGetTime (); |
||||
|
||||
printf ( "%5.5f seconds elapsed\n", (float)( end - start )/1000.0 ); |
||||
|
||||
// Display for a second since it might not be running from command prompt
|
||||
Sleep( 1000 ); |
||||
return 0; |
||||
} |
||||
@ -0,0 +1,138 @@
@@ -0,0 +1,138 @@
|
||||
# Microsoft Developer Studio Project File - Name="makefont" - Package Owner=<4> |
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00 |
||||
# ** DO NOT EDIT ** |
||||
|
||||
# TARGTYPE "Win32 (x86) Console Application" 0x0103 |
||||
|
||||
CFG=makefont - Win32 Debug |
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE, |
||||
!MESSAGE use the Export Makefile command and run |
||||
!MESSAGE |
||||
!MESSAGE NMAKE /f "makefont.mak". |
||||
!MESSAGE |
||||
!MESSAGE You can specify a configuration when running NMAKE |
||||
!MESSAGE by defining the macro CFG on the command line. For example: |
||||
!MESSAGE |
||||
!MESSAGE NMAKE /f "makefont.mak" CFG="makefont - Win32 Debug" |
||||
!MESSAGE |
||||
!MESSAGE Possible choices for configuration are: |
||||
!MESSAGE |
||||
!MESSAGE "makefont - Win32 Release" (based on "Win32 (x86) Console Application") |
||||
!MESSAGE "makefont - Win32 Debug" (based on "Win32 (x86) Console Application") |
||||
!MESSAGE |
||||
|
||||
# Begin Project |
||||
# PROP AllowPerConfigDependencies 0 |
||||
# PROP Scc_ProjName "" |
||||
# PROP Scc_LocalPath "" |
||||
CPP=cl.exe |
||||
RSC=rc.exe |
||||
|
||||
!IF "$(CFG)" == "makefont - Win32 Release" |
||||
|
||||
# PROP BASE Use_MFC 0 |
||||
# PROP BASE Use_Debug_Libraries 0 |
||||
# PROP BASE Output_Dir "Release" |
||||
# PROP BASE Intermediate_Dir "Release" |
||||
# PROP BASE Target_Dir "" |
||||
# PROP Use_MFC 0 |
||||
# PROP Use_Debug_Libraries 0 |
||||
# PROP Output_Dir "Release" |
||||
# PROP Intermediate_Dir "Release" |
||||
# PROP Ignore_Export_Lib 0 |
||||
# PROP Target_Dir "" |
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c |
||||
# ADD CPP /nologo /W3 /GX /Zi /O2 /I "../../common" /I "../common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX"qfont.h" /FD /c |
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG" |
||||
# ADD RSC /l 0x409 /d "NDEBUG" |
||||
BSC32=bscmake.exe |
||||
# ADD BASE BSC32 /nologo |
||||
# ADD BSC32 /nologo |
||||
LINK32=link.exe |
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 |
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 |
||||
# Begin Special Build Tool |
||||
TargetPath=.\Release\makefont.exe |
||||
SOURCE="$(InputPath)" |
||||
PostBuild_Desc=Copyint to valve\ |
||||
PostBuild_Cmds=xcopy $(TargetPath) ..\..\..\valve /r /i |
||||
# End Special Build Tool |
||||
|
||||
!ELSEIF "$(CFG)" == "makefont - Win32 Debug" |
||||
|
||||
# PROP BASE Use_MFC 0 |
||||
# PROP BASE Use_Debug_Libraries 1 |
||||
# PROP BASE Output_Dir "Debug" |
||||
# PROP BASE Intermediate_Dir "Debug" |
||||
# PROP BASE Target_Dir "" |
||||
# PROP Use_MFC 0 |
||||
# PROP Use_Debug_Libraries 1 |
||||
# PROP Output_Dir "Debug" |
||||
# PROP Intermediate_Dir "Debug" |
||||
# PROP Ignore_Export_Lib 0 |
||||
# PROP Target_Dir "" |
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c |
||||
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../common" /I "../common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX"qfont.h" /FD /GZ /c |
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG" |
||||
# ADD RSC /l 0x409 /d "_DEBUG" |
||||
BSC32=bscmake.exe |
||||
# ADD BASE BSC32 /nologo |
||||
# ADD BSC32 /nologo |
||||
LINK32=link.exe |
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept |
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept |
||||
# Begin Special Build Tool |
||||
TargetPath=.\Debug\makefont.exe |
||||
SOURCE="$(InputPath)" |
||||
PostBuild_Desc=Copyint to valve\ |
||||
PostBuild_Cmds=xcopy $(TargetPath) ..\..\..\valve /r /i |
||||
# End Special Build Tool |
||||
|
||||
!ENDIF |
||||
|
||||
# Begin Target |
||||
|
||||
# Name "makefont - Win32 Release" |
||||
# Name "makefont - Win32 Debug" |
||||
# Begin Group "Source Files" |
||||
|
||||
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" |
||||
# Begin Source File |
||||
|
||||
SOURCE=..\common\cmdlib.c |
||||
# End Source File |
||||
# Begin Source File |
||||
|
||||
SOURCE=.\makefont.cpp |
||||
# End Source File |
||||
# Begin Source File |
||||
|
||||
SOURCE=..\common\wadlib.c |
||||
# End Source File |
||||
# End Group |
||||
# Begin Group "Header Files" |
||||
|
||||
# PROP Default_Filter "h;hpp;hxx;hm;inl" |
||||
# Begin Source File |
||||
|
||||
SOURCE=..\common\cmdlib.h |
||||
# End Source File |
||||
# Begin Source File |
||||
|
||||
SOURCE=.\StdAfx.h |
||||
# End Source File |
||||
# Begin Source File |
||||
|
||||
SOURCE=..\common\wadlib.h |
||||
# End Source File |
||||
# End Group |
||||
# Begin Group "Resource Files" |
||||
|
||||
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" |
||||
# End Group |
||||
# Begin Source File |
||||
|
||||
SOURCE=.\ReadMe.txt |
||||
# End Source File |
||||
# End Target |
||||
# End Project |
||||
Loading…
Reference in new issue