diff options
Diffstat (limited to 'intern')
97 files changed, 1223 insertions, 8796 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index 81ef8c121d1..697d0b6b575 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -24,10 +24,20 @@ # # ***** END GPL LICENSE BLOCK ***** -SUBDIRS(SoundSystem string ghost guardedalloc bmfont moto container memutil decimation iksolver boolop opennl) +ADD_SUBDIRECTORY(SoundSystem) +ADD_SUBDIRECTORY(string) +ADD_SUBDIRECTORY(ghost) +ADD_SUBDIRECTORY(guardedalloc) +ADD_SUBDIRECTORY(moto) +ADD_SUBDIRECTORY(container) +ADD_SUBDIRECTORY(memutil) +ADD_SUBDIRECTORY(decimation) +ADD_SUBDIRECTORY(iksolver) +ADD_SUBDIRECTORY(boolop) +ADD_SUBDIRECTORY(opennl) IF(WITH_ELBEEM) - SUBDIRS(elbeem) + ADD_SUBDIRECTORY(elbeem) ENDIF(WITH_ELBEEM) -SUBDIRS(bsp) +ADD_SUBDIRECTORY(bsp) diff --git a/intern/Makefile b/intern/Makefile index 357e28309e3..995dc56c7d3 100644 --- a/intern/Makefile +++ b/intern/Makefile @@ -31,7 +31,7 @@ SOURCEDIR = intern # include nan_subdirs.mk -ALLDIRS = string ghost guardedalloc bmfont moto container memutil +ALLDIRS = string ghost guardedalloc moto container memutil ALLDIRS += decimation iksolver bsp SoundSystem opennl elbeem boolop all:: diff --git a/intern/SConscript b/intern/SConscript index 82c7739bf42..bb8525d5ce5 100644 --- a/intern/SConscript +++ b/intern/SConscript @@ -5,7 +5,6 @@ SConscript(['SoundSystem/SConscript', 'string/SConscript', 'ghost/SConscript', 'guardedalloc/SConscript', - 'bmfont/SConscript', 'moto/SConscript', 'container/SConscript', 'memutil/SConscript/', diff --git a/intern/SoundSystem/Makefile b/intern/SoundSystem/Makefile index 4e5a8363955..4d346f65138 100644 --- a/intern/SoundSystem/Makefile +++ b/intern/SoundSystem/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # @@ -55,16 +57,13 @@ endif include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_SOUNDSYSTEM) ] || mkdir $(NAN_SOUNDSYSTEM) @[ -d $(NAN_SOUNDSYSTEM)/include ] || mkdir $(NAN_SOUNDSYSTEM)/include - @[ -d $(NAN_SOUNDSYSTEM)/lib ] || mkdir $(NAN_SOUNDSYSTEM)/lib - @[ -d $(NAN_SOUNDSYSTEM)/lib/debug ] || mkdir $(NAN_SOUNDSYSTEM)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libSoundSystem.a $(NAN_SOUNDSYSTEM)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libSoundSystem.a $(NAN_SOUNDSYSTEM)/lib/debug/ + @[ -d $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libSoundSystem.a $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_SOUNDSYSTEM)/lib/libSoundSystem.a - ranlib $(NAN_SOUNDSYSTEM)/lib/debug/libSoundSystem.a + ranlib $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR)libSoundSystem.a endif @../tools/cpifdiff.sh *.h $(NAN_SOUNDSYSTEM)/include/ diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript index be19c4b7915..256b7904a0f 100644 --- a/intern/SoundSystem/SConscript +++ b/intern/SoundSystem/SConscript @@ -17,4 +17,4 @@ else: if not env['WITH_BF_SDL']: defs += ' DISABLE_SDL' -env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [20,140] ) +env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['intern','player'], priority = [25,135] ) diff --git a/intern/SoundSystem/SND_Utils.h b/intern/SoundSystem/SND_Utils.h index 26cf1bda11c..82b7c69a595 100644 --- a/intern/SoundSystem/SND_Utils.h +++ b/intern/SoundSystem/SND_Utils.h @@ -97,8 +97,8 @@ extern unsigned int SND_GetSampleFormat(void* sample); extern unsigned int SND_GetNumberOfChannels(void* sample); extern unsigned int SND_GetSampleRate(void* sample); extern unsigned int SND_GetBitRate(void* sample); -extern unsigned int SND_GetNumberOfSamples(void* sample, int sample_length); -extern unsigned int SND_GetHeaderSize(void* sample, int sample_length); +extern unsigned int SND_GetNumberOfSamples(void* sample, unsigned int sample_length); +extern unsigned int SND_GetHeaderSize(void* sample, unsigned int sample_length); extern unsigned int SND_GetExtraChunk(void* sample); extern void SND_GetSampleInfo(signed char* sample, SND_WaveSlot* waveslot); diff --git a/intern/SoundSystem/fmod/Makefile b/intern/SoundSystem/fmod/Makefile deleted file mode 100644 index 47bc0348fe2..00000000000 --- a/intern/SoundSystem/fmod/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = FmodSoundSystem -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += -I$(NAN_FMOD)/include -CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I../intern -CPPFLAGS += -I.. -CPPFLAGS += -I. diff --git a/intern/SoundSystem/fmod/SND_FmodDevice.cpp b/intern/SoundSystem/fmod/SND_FmodDevice.cpp deleted file mode 100644 index 3ba0802a5b0..00000000000 --- a/intern/SoundSystem/fmod/SND_FmodDevice.cpp +++ /dev/null @@ -1,574 +0,0 @@ -/* - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - * SND_FmodDevice derived from SND_IAudioDevice - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#ifdef WIN32 -#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning -#endif //WIN32 - -#include "SND_FmodDevice.h" -#include "SoundDefines.h" -#include "SND_Utils.h" - -SND_FmodDevice::SND_FmodDevice() -{ - /* Removed the functionality for checking if noaudio was provided on */ - /* the commandline. */ - m_dspunit = NULL; - - m_audio = true; - - // let's check if we can get fmod to initialize... - if (m_audio) - { - signed char MinHardwareChannels = FSOUND_SetMinHardwareChannels(NUM_FMOD_MIN_HW_CHANNELS); - signed char MaxHardwareChannels = FSOUND_SetMaxHardwareChannels(NUM_FMOD_MAX_HW_CHANNELS); - - if (FSOUND_Init(MIXRATE, NUM_SOURCES, 0)) - { - m_max_channels = FSOUND_GetMaxChannels(); - m_num_hardware_channels = FSOUND_GetNumHardwareChannels(); - m_num_software_channels = NUM_SOURCES; - - // let's get us a wavecache - m_wavecache = new SND_WaveCache(); - - int i; - for (i = 0; i < NUM_BUFFERS; i++) - m_buffers[i] = NULL; - - for (i = 0; i < NUM_SOURCES; i++) - { - m_sources[i] = NULL; - m_frequencies[i] = 0; - m_channels[i] = 0; - } - } - else - { - m_audio = false; - } - } - -#ifdef ONTKEVER - int numdrivers = FSOUND_GetNumDrivers(); - int output = FSOUND_GetOutput(); - int oputputrate = FSOUND_GetOutputRate(); - int mixer = FSOUND_GetMixer(); - - printf("maxchannels is: %d\n", m_max_channels); - printf("num hw channels is: %d\n", m_num_hardware_channels); - printf("num sw channels is: %d\n", m_num_software_channels); - printf("numdrivers is: %d\n", numdrivers); - printf("output is: %d\n", output); - printf("oputputrate is: %d\n", oputputrate); - printf("mixer is: %d\n", mixer); -#endif -} - - - -SND_FmodDevice::~SND_FmodDevice() -{ - // let's see if we used the cd. if not, just leave it alone - SND_CDObject* pCD = SND_CDObject::Instance(); - - if (pCD) - { - this->StopCD(); - SND_CDObject::DisposeSystem(); - } - - StopUsingDSP(); - - FSOUND_Close(); -} - - - -void SND_FmodDevice::UseCD() const -{ - // only fmod has CD support, so only create it here - SND_CDObject::CreateSystem(); -} - - - -void SND_FmodDevice::MakeCurrent() const -{ - // empty -} - - - -SND_WaveSlot* SND_FmodDevice::LoadSample(const STR_String& name, - void* memlocation, - int size) -{ - SND_WaveSlot* waveslot = NULL; - STR_String samplename = name; - - if (m_audio) - { - /* first check if the sample is supported */ - if (SND_IsSampleValid(name, memlocation)) - { - /* create the waveslot */ - waveslot = m_wavecache->GetWaveSlot(samplename); - - if (waveslot) - { - int buffer = waveslot->GetBuffer(); - - /* load the sample from memory? */ - if (size && memlocation) - { - m_buffers[buffer] = FSOUND_Sample_Load(buffer, (char*)memlocation, FSOUND_LOADMEMORY, size); - - /* if the loading succeeded, fill the waveslot with info */ - if (m_buffers[buffer]) - { - int sampleformat = SND_GetSampleFormat(memlocation); - int numberofchannels = SND_GetNumberOfChannels(memlocation); - int samplerate = SND_GetSampleRate(memlocation); - int bitrate = SND_GetBitRate(memlocation); - int numberofsamples = SND_GetNumberOfSamples(memlocation, size); - - waveslot->SetFileSize(size); - waveslot->SetData(memlocation); - waveslot->SetSampleFormat(sampleformat); - waveslot->SetNumberOfChannels(numberofchannels); - waveslot->SetSampleRate(samplerate); - waveslot->SetBitRate(bitrate); - waveslot->SetNumberOfSamples(numberofsamples); - } - } - /* or from file? */ - else - { - m_buffers[buffer] = FSOUND_Sample_Load(buffer, samplename.Ptr(), FSOUND_LOOP_NORMAL, NULL); - } - -#ifdef ONTKEVER - int error = FSOUND_GetError(); - printf("sample load: errornumber is: %d\n", error); -#endif - - /* if the loading succeeded, mark the waveslot */ - if (m_buffers[buffer]) - { - waveslot->SetLoaded(true); - } - /* or when it failed, free the waveslot */ - else - { - m_wavecache->RemoveSample(waveslot->GetSampleName(), waveslot->GetBuffer()); - waveslot = NULL; - } - } - } - } - - return waveslot; -} - - - - -// listener's and general stuff ////////////////////////////////////////////////////// - - - -/* sets the global dopplervelocity */ -void SND_FmodDevice::SetDopplerVelocity(MT_Scalar dopplervelocity) const -{ - /* not supported by fmod */ - FSOUND_3D_Listener_SetDopplerFactor(dopplervelocity); -} - - - -/* sets the global dopplerfactor */ -void SND_FmodDevice::SetDopplerFactor(MT_Scalar dopplerfactor) const -{ - FSOUND_3D_Listener_SetDopplerFactor(dopplerfactor); -} - - - -/* sets the global rolloff factor */ -void SND_FmodDevice::SetListenerRollOffFactor(MT_Scalar rollofffactor) const -{ - // not implemented in openal -} - - - -void SND_FmodDevice::NextFrame() const -{ - FSOUND_3D_Update(); -} - - - -// set the gain for the listener -void SND_FmodDevice::SetListenerGain(float gain) const -{ - int fmod_gain = (int)(gain * 255); - FSOUND_SetSFXMasterVolume(fmod_gain); -} - - - -void SND_FmodDevice::InitListener() -{ - // initialize the listener with these values that won't change - // (as long as we can have only one listener) - // now we can superimpose all listeners on each other (for they - // have the same settings) - float lispos[3] = {0,0,0}; - float lisvel[3] = {0,0,0}; - - FSOUND_3D_Listener_SetAttributes(lispos, lisvel, 0, -1, 0, 0, 0, 1); -} - - - -// source playstate stuff //////////////////////////////////////////////////////////// - - - -// check if the sound's still playing -int SND_FmodDevice::GetPlayState(int id) -{ - int result = SND_STOPPED; - - // klopt niet, fixen - signed char isplaying = FSOUND_IsPlaying(id); - - if (isplaying) - { - result = SND_PLAYING; - } - -/* hi reevan, just swap // of these 2 lines */ -// return result; - return 0; -} - - - -/* sets the buffer */ -void SND_FmodDevice::SetObjectBuffer(int id, unsigned int buffer) -{ - m_sources[id] = m_buffers[buffer]; -} - - - -// make the source play -void SND_FmodDevice::PlayObject(int id) -{ - m_channels[id] = FSOUND_PlaySound(FSOUND_FREE, m_sources[id]); - m_frequencies[id] = FSOUND_GetFrequency(m_channels[id]); -// printf("fmod: play \n"); -} - - - -// make the source stop -void SND_FmodDevice::StopObject(int id) const -{ - FSOUND_StopSound(m_channels[id]); -// printf("fmod: stop \n"); -} - - - -// stop all sources -void SND_FmodDevice::StopAllObjects() -{ - FSOUND_StopSound(FSOUND_ALL); -} - - - -// pause the source -void SND_FmodDevice::PauseObject(int id) const -{ - FSOUND_StopSound(m_channels[id]); -} - - - -// source properties stuff //////////////////////////////////////////////////////////// - - - -// give openal the object's pitch -void SND_FmodDevice::SetObjectPitch(int id, MT_Scalar pitch) const -{ - pitch = pitch * m_frequencies[id]; - char result = FSOUND_SetFrequency(m_channels[id], (int)pitch); -} - - - -// give openal the object's gain -void SND_FmodDevice::SetObjectGain(int id, MT_Scalar gain) const -{ - int vol = (int)(gain * 255); - FSOUND_SetVolume(m_channels[id], vol); -} - - - -// give openal the object's looping -void SND_FmodDevice::SetObjectLoop(int id, unsigned int loopmode) const -{ -// printf("loopmode: %d\n", loopmode); - switch (loopmode) - { - case SND_LOOP_OFF: - { -#ifndef __APPLE__ - char result = FSOUND_Sample_SetLoopMode(m_sources[id], FSOUND_LOOP_OFF); -#else - char result = FSOUND_SetLoopMode(m_sources[id], FSOUND_LOOP_OFF); -#endif -// char result = FSOUND_SetLoopMode(m_channels[id], FSOUND_LOOP_OFF); - break; - } - case SND_LOOP_NORMAL: - { -#ifndef __APPLE__ - char result = FSOUND_Sample_SetLoopMode(m_sources[id], FSOUND_LOOP_NORMAL); -#else - char result = FSOUND_SetLoopMode(m_sources[id], FSOUND_LOOP_NORMAL); -#endif -// char result = FSOUND_SetLoopMode(m_channels[id], FSOUND_LOOP_NORMAL); - break; - } - case SND_LOOP_BIDIRECTIONAL: - { -#ifndef __APPLE__ - char result = FSOUND_Sample_SetLoopMode(m_sources[id], FSOUND_LOOP_BIDI); -#else - char result = FSOUND_SetLoopMode(m_sources[id], FSOUND_LOOP_BIDI); -#endif -// char result = FSOUND_SetLoopMode(m_channels[id], FSOUND_LOOP_NORMAL); - break; - } - default: - break; - } -} - - - -void SND_FmodDevice::SetObjectLoopPoints(int id, unsigned int loopstart, unsigned int loopend) const -{ - FSOUND_Sample_SetLoopPoints(m_sources[id], loopstart, loopend); -} - - - -void SND_FmodDevice::SetObjectMinGain(int id, MT_Scalar mingain) const -{ - /* not supported by fmod */ -} - - - -void SND_FmodDevice::SetObjectMaxGain(int id, MT_Scalar maxgain) const -{ - /* not supported by fmod */ -} - - - -void SND_FmodDevice::SetObjectRollOffFactor(int id, MT_Scalar rollofffactor) const -{ - /* not supported by fmod */ -} - - - -void SND_FmodDevice::SetObjectReferenceDistance(int id, MT_Scalar referencedistance) const -{ - /* not supported by fmod */ -} - - - -// give openal the object's position -void SND_FmodDevice::ObjectIs2D(int id) const -{ - float obpos[3] = {0,0,0}; - float obvel[3] = {0,0,0}; - - FSOUND_3D_SetAttributes(m_channels[id], obpos, obvel); -} - - - -void SND_FmodDevice::SetObjectTransform(int id, - const MT_Vector3& position, - const MT_Vector3& velocity, - const MT_Matrix3x3& orientation, - const MT_Vector3& lisposition, - const MT_Scalar& rollofffactor) const -{ - float obpos[3]; - float obvel[3]; - - obpos[0] = (float)position[0] * (float)rollofffactor; //x (l/r) - obpos[1] = (float)position[1] * (float)rollofffactor; - obpos[2] = (float)position[2] * (float)rollofffactor; - - velocity.getValue(obvel); - FSOUND_3D_SetAttributes(m_channels[id], obpos, obvel); -} - - - -// cd support stuff //////////////////////////////////////////////////////////// - - -void SND_FmodDevice::PlayCD(int track) const -{ -#ifndef __APPLE__ - signed char result = FSOUND_CD_Play(track); -#else - signed char result = FSOUND_CD_Play(0, track); -#endif - -#ifdef ONTKEVER - printf("SND_FmodDevice::PlayCD(): track=%d, result=%d\n", track, (int)result); -#endif -} - - - -void SND_FmodDevice::PauseCD(bool pause) const -{ -#ifndef __APPLE__ - signed char result = FSOUND_CD_SetPaused(pause); -#else - signed char result = FSOUND_CD_SetPaused(0, pause); -#endif - -#ifdef ONTKEVER - printf("SND_FmodDevice::PauseCD(): pause=%d, result=%d\n", pause, (int)result); -#endif -} - - - -void SND_FmodDevice::StopCD() const -{ - SND_CDObject* pCD = SND_CDObject::Instance(); - - if (pCD) - { - if (pCD->GetUsed()) - { -#ifndef __APPLE__ - signed char result = FSOUND_CD_Stop(); -#else - signed char result = FSOUND_CD_Stop(0); -#endif - -#ifdef ONTKEVER - printf("SND_FmodDevice::StopCD(): result=%d\n", (int)result); -#endif - } - } -} - - - -void SND_FmodDevice::SetCDPlaymode(int playmode) const -{ -#ifndef __APPLE__ - FSOUND_CD_SetPlayMode(playmode); -#else - FSOUND_CD_SetPlayMode(0, playmode); -#endif - -#ifdef ONTKEVER - printf("SND_FmodDevice::SetCDPlaymode(): playmode=%d,\n", playmode); -#endif -} - - - -void SND_FmodDevice::SetCDGain(MT_Scalar gain) const -{ - int volume = gain * 255; -#ifndef __APPLE__ - signed char result = FSOUND_CD_SetVolume(volume); -#else - signed char result = FSOUND_CD_SetVolume(0, volume); -#endif - -#ifdef ONTKEVER - printf("SND_FmodDevice::SetCDGain(): gain=%f, volume=%d, result=%d\n", gain, volume, (int)result); -#endif -} - - - -void SND_FmodDevice::StartUsingDSP() -{ - m_dspunit = FSOUND_DSP_GetFFTUnit(); - - FSOUND_DSP_SetActive(m_dspunit, true); -} - - - -float* SND_FmodDevice::GetSpectrum() -{ - m_spectrum = FSOUND_DSP_GetSpectrum(); - - return m_spectrum; -} - - - -void SND_FmodDevice::StopUsingDSP() -{ - if (m_dspunit) - FSOUND_DSP_SetActive(m_dspunit, false); -} diff --git a/intern/SoundSystem/fmod/SND_FmodDevice.h b/intern/SoundSystem/fmod/SND_FmodDevice.h deleted file mode 100644 index 294ee4e3a72..00000000000 --- a/intern/SoundSystem/fmod/SND_FmodDevice.h +++ /dev/null @@ -1,103 +0,0 @@ -/** - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ -#ifndef SND_FMODDEVICE -#define SND_FMODDEVICE - -#include "fmod.h" -#include "SND_AudioDevice.h" -#include "SoundDefines.h" - -class SND_FmodDevice : public SND_AudioDevice -{ -public: - SND_FmodDevice(); - ~SND_FmodDevice(); - - SND_WaveSlot* LoadSample(const STR_String& samplename, - void* memlocation, - int size); - - void InitListener(); - void SetListenerGain(float gain) const; - void SetDopplerVelocity(MT_Scalar dopplervelocity) const; - void SetDopplerFactor(MT_Scalar dopplerfactor) const; - void SetListenerRollOffFactor(MT_Scalar rollofffactor) const; - - void MakeCurrent() const; - void NextFrame() const; - void UseCD() const; - - void SetObjectBuffer(int id, unsigned int buffer); - int GetPlayState(int id); - void PlayObject(int id); - void StopObject(int id) const; - void StopAllObjects(); - void PauseObject(int id) const; - - void SetObjectLoop(int id, unsigned int loopmode) const; - void SetObjectLoopPoints(int id, unsigned int loopstart, unsigned int loopend) const; - void SetObjectPitch(int id, MT_Scalar pitch) const; - void SetObjectGain(int id, MT_Scalar gain) const; - void SetObjectMinGain(int id, MT_Scalar mingain) const; - void SetObjectMaxGain(int id, MT_Scalar maxgain) const; - void SetObjectRollOffFactor(int id, MT_Scalar rolloff) const; - void SetObjectReferenceDistance(int id, MT_Scalar distance) const; - - void SetObjectTransform(int id, - const MT_Vector3& position, - const MT_Vector3& velocity, - const MT_Matrix3x3& orientation, - const MT_Vector3& lisposition, - const MT_Scalar& rollofffactor) const; - void ObjectIs2D(int id) const; - - void PlayCD(int track) const; - void PauseCD(bool pause) const; - void StopCD() const; - void SetCDPlaymode(int playmode) const; - void SetCDGain(MT_Scalar gain) const; - - void StartUsingDSP(); - float* GetSpectrum(); - void StopUsingDSP(); - -private: - FSOUND_SAMPLE* m_buffers[NUM_BUFFERS]; - FSOUND_SAMPLE* m_sources[NUM_SOURCES]; - FSOUND_DSPUNIT* m_dspunit; - int m_frequencies[NUM_SOURCES]; - int m_max_channels; - int m_num_hardware_channels; - int m_num_software_channels; - int m_channels[NUM_SOURCES]; - float* m_spectrum; -}; - -#endif //SND_FMODDEVICE - diff --git a/intern/SoundSystem/intern/SND_Utils.cpp b/intern/SoundSystem/intern/SND_Utils.cpp index 7890d2a3d63..dbc3135b35c 100644 --- a/intern/SoundSystem/intern/SND_Utils.cpp +++ b/intern/SoundSystem/intern/SND_Utils.cpp @@ -258,7 +258,7 @@ unsigned int SND_GetBitRate(void* sample) /* gets the length of the actual sample data (without the header) */ -unsigned int SND_GetNumberOfSamples(void* sample, int sample_length) +unsigned int SND_GetNumberOfSamples(void* sample, unsigned int sample_length) { unsigned int chunklength, length = 0, offset; unsigned short block_align; @@ -298,7 +298,7 @@ unsigned int SND_GetNumberOfSamples(void* sample, int sample_length) /* gets the size of the entire header (file - sampledata) */ -unsigned int SND_GetHeaderSize(void* sample, int sample_length) +unsigned int SND_GetHeaderSize(void* sample, unsigned int sample_length) { unsigned int chunklength, headersize = 0, offset = 16; unsigned short block_align; diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp index 3649cf6de5a..424a05246ac 100644 --- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp +++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp @@ -43,11 +43,9 @@ #ifdef APPLE_FRAMEWORK_FIX #include <al.h> #include <alc.h> -#include <alut.h> #else #include <AL/al.h> #include <AL/alc.h> -#include <AL/alut.h> #endif #include <stdio.h> @@ -61,13 +59,12 @@ #include <signal.h> -/* untill openal gets unified we need this hack for non-windows systems */ -#if !defined(WIN32) && !defined(ALC_MAJOR_VERSION) +/*************************** ALUT replacement *****************************/ -#include <malloc.h> +/* instead of relying on alut, we just implement our own + * WAV loading functions, hopefully more reliable */ -ALvoid alutLoadWAVMemory(ALbyte *memory,ALenum *format,ALvoid **data,ALsizei *size,ALsizei *freq,ALboolean *loop); -ALvoid alutUnloadWAV(ALenum format,ALvoid *data,ALsizei size,ALsizei freq); +#include <stdlib.h> typedef struct /* WAV File-header */ { @@ -120,93 +117,189 @@ typedef struct /* WAV Chunk-header */ ALuint Size; } WAVChunkHdr_Struct; -ALvoid alutLoadWAVMemory(ALbyte *memory,ALenum *format,ALvoid **data,ALsizei *size,ALsizei *freq,ALboolean *loop) +static void *SND_loadFileIntoMemory(const char *filename, int *len_r) +{ + FILE *fp= fopen(filename, "rb"); + void *data; + + if (!fp) { + *len_r= -1; + return NULL; + } + + fseek(fp, 0L, SEEK_END); + *len_r= ftell(fp); + fseek(fp, 0L, SEEK_SET); + + data= malloc(*len_r); + if (!data) { + *len_r= -1; + return NULL; + } + + if (fread(data, *len_r, 1, fp)!=1) { + *len_r= -1; + free(data); + return NULL; + } + + return data; +} + +#define TEST_SWITCH_INT(a) if(big_endian) { \ + char s_i, *p_i; \ + p_i= (char *)&(a); \ + s_i=p_i[0]; p_i[0]=p_i[3]; p_i[3]=s_i; \ + s_i=p_i[1]; p_i[1]=p_i[2]; p_i[2]=s_i; } + +#define TEST_SWITCH_SHORT(a) if(big_endian) { \ + char s_i, *p_i; \ + p_i= (char *)&(a); \ + s_i=p_i[0]; p_i[0]=p_i[1]; p_i[1]=s_i; } + +static int stream_read(void *out, ALbyte **stream, ALsizei size, ALsizei *memsize) +{ + if(size <= *memsize) { + memcpy(out, *stream, size); + return 1; + } + else { + memset(out, 0, size); + return 0; + } +} + +static int stream_skip(ALbyte **stream, ALsizei size, ALsizei *memsize) +{ + if(size <= *memsize) { + *stream += size; + *memsize -= size; + return 1; + } + else + return 0; +} + +ALvoid SND_alutLoadWAVMemory(ALbyte *memory,ALsizei memsize,ALenum *format,ALvoid **data,ALsizei *size,ALsizei *freq,ALboolean *loop) { WAVChunkHdr_Struct ChunkHdr; WAVFmtExHdr_Struct FmtExHdr; WAVFileHdr_Struct FileHdr; WAVSmplHdr_Struct SmplHdr; WAVFmtHdr_Struct FmtHdr; - ALbyte *Stream; + ALbyte *Stream= memory; + int test_endian= 1; + int big_endian= !((char*)&test_endian)[0]; *format=AL_FORMAT_MONO16; *data=NULL; *size=0; *freq=22050; *loop=AL_FALSE; - if (memory) + + if(!Stream) + return; + + stream_read(&FileHdr,&Stream,sizeof(WAVFileHdr_Struct),&memsize); + stream_skip(&Stream,sizeof(WAVFileHdr_Struct),&memsize); + + TEST_SWITCH_INT(FileHdr.Size); + FileHdr.Size=((FileHdr.Size+1)&~1)-4; + + while((FileHdr.Size!=0) && stream_read(&ChunkHdr,&Stream,sizeof(WAVChunkHdr_Struct),&memsize)) { - Stream=memory; - if (Stream) + TEST_SWITCH_INT(ChunkHdr.Size); + stream_skip(&Stream,sizeof(WAVChunkHdr_Struct),&memsize); + + if (!memcmp(ChunkHdr.Id,"fmt ",4)) { - memcpy(&FileHdr,Stream,sizeof(WAVFileHdr_Struct)); - Stream+=sizeof(WAVFileHdr_Struct); - FileHdr.Size=((FileHdr.Size+1)&~1)-4; - while ((FileHdr.Size!=0)&&(memcpy(&ChunkHdr,Stream,sizeof(WAVChunkHdr_Struct)))) + stream_read(&FmtHdr,&Stream,sizeof(WAVFmtHdr_Struct),&memsize); + + TEST_SWITCH_SHORT(FmtHdr.Format); + TEST_SWITCH_SHORT(FmtHdr.Channels); + TEST_SWITCH_INT(FmtHdr.SamplesPerSec); + TEST_SWITCH_INT(FmtHdr.BytesPerSec); + TEST_SWITCH_SHORT(FmtHdr.BlockAlign); + TEST_SWITCH_SHORT(FmtHdr.BitsPerSample); + + if (FmtHdr.Format==0x0001) { - Stream+=sizeof(WAVChunkHdr_Struct); - if (!memcmp(ChunkHdr.Id,"fmt ",4)) - { - memcpy(&FmtHdr,Stream,sizeof(WAVFmtHdr_Struct)); - if (FmtHdr.Format==0x0001) - { - *format=(FmtHdr.Channels==1? - (FmtHdr.BitsPerSample==8?AL_FORMAT_MONO8:AL_FORMAT_MONO16): - (FmtHdr.BitsPerSample==8?AL_FORMAT_STEREO8:AL_FORMAT_STEREO16)); - *freq=FmtHdr.SamplesPerSec; - Stream+=ChunkHdr.Size; - } - else - { - memcpy(&FmtExHdr,Stream,sizeof(WAVFmtExHdr_Struct)); - Stream+=ChunkHdr.Size; - } - } - else if (!memcmp(ChunkHdr.Id,"data",4)) + *format=(FmtHdr.Channels==1? + (FmtHdr.BitsPerSample==8?AL_FORMAT_MONO8:AL_FORMAT_MONO16): + (FmtHdr.BitsPerSample==8?AL_FORMAT_STEREO8:AL_FORMAT_STEREO16)); + *freq=FmtHdr.SamplesPerSec; + } + else + { + stream_read(&FmtExHdr,&Stream,sizeof(WAVFmtExHdr_Struct),&memsize); + TEST_SWITCH_SHORT(FmtExHdr.Size); + TEST_SWITCH_SHORT(FmtExHdr.SamplesPerBlock); + } + } + else if (!memcmp(ChunkHdr.Id,"data",4)) + { + if (FmtHdr.Format==0x0001) + { + if((ALsizei)ChunkHdr.Size <= memsize) { - if (FmtHdr.Format==0x0001) - { - *size=ChunkHdr.Size; - *data=malloc(ChunkHdr.Size+31); - if (*data) memcpy(*data,Stream,ChunkHdr.Size); + *size=ChunkHdr.Size; + *data=malloc(ChunkHdr.Size+31); + + if (*data) { + stream_read(*data,&Stream,ChunkHdr.Size,&memsize); memset(((char *)*data)+ChunkHdr.Size,0,31); - Stream+=ChunkHdr.Size; - } - else if (FmtHdr.Format==0x0011) - { - //IMA ADPCM - } - else if (FmtHdr.Format==0x0055) - { - //MP3 WAVE + + if(FmtHdr.BitsPerSample == 16 && big_endian) { + int a, len= *size/2; + short *samples= (short*)*data; + + for(a=0; a<len; a++) { + TEST_SWITCH_SHORT(samples[a]) + } + } } } - else if (!memcmp(ChunkHdr.Id,"smpl",4)) - { - memcpy(&SmplHdr,Stream,sizeof(WAVSmplHdr_Struct)); - *loop = (SmplHdr.Loops ? AL_TRUE : AL_FALSE); - Stream+=ChunkHdr.Size; - } - else Stream+=ChunkHdr.Size; - Stream+=ChunkHdr.Size&1; - FileHdr.Size-=(((ChunkHdr.Size+1)&~1)+8); + } + else if (FmtHdr.Format==0x0011) + { + //IMA ADPCM + } + else if (FmtHdr.Format==0x0055) + { + //MP3 WAVE } } + else if (!memcmp(ChunkHdr.Id,"smpl",4)) + { + stream_read(&SmplHdr,&Stream,sizeof(WAVSmplHdr_Struct),&memsize); + + TEST_SWITCH_INT(SmplHdr.Manufacturer); + TEST_SWITCH_INT(SmplHdr.Product); + TEST_SWITCH_INT(SmplHdr.SamplePeriod); + TEST_SWITCH_INT(SmplHdr.Note); + TEST_SWITCH_INT(SmplHdr.FineTune); + TEST_SWITCH_INT(SmplHdr.SMPTEFormat); + TEST_SWITCH_INT(SmplHdr.SMPTEOffest); + TEST_SWITCH_INT(SmplHdr.Loops); + TEST_SWITCH_INT(SmplHdr.SamplerData); + + *loop = (SmplHdr.Loops ? AL_TRUE : AL_FALSE); + } + + if(!stream_skip(&Stream, ChunkHdr.Size + (ChunkHdr.Size&1), &memsize)) + break; + + FileHdr.Size-=(((ChunkHdr.Size+1)&~1)+8); } } -ALvoid alutUnloadWAV(ALenum format,ALvoid *data,ALsizei size,ALsizei freq) +ALvoid SND_alutUnloadWAV(ALenum format,ALvoid *data,ALsizei size,ALsizei freq) { if (data) free(data); } -#endif /* WIN32 */ - -#ifdef __APPLE__ -#define OUDE_OPENAL 1 -#endif - +/************************ Device Implementation ****************************/ SND_OpenALDevice::SND_OpenALDevice() : SND_AudioDevice(), @@ -223,10 +316,6 @@ SND_OpenALDevice::SND_OpenALDevice() // let's check if we can get openal to initialize... if (m_audio) { -#ifdef OUDE_OPENAL - m_audio = true; // openal_2.12 - alutInit(NULL, NULL); // openal_2.12 -#else m_audio = false; ALCdevice *dev = alcOpenDevice(NULL); @@ -236,7 +325,6 @@ SND_OpenALDevice::SND_OpenALDevice() if (m_context) { #ifdef AL_VERSION_1_1 alcMakeContextCurrent((ALCcontext*)m_context); - alutInitWithoutContext(NULL, NULL); /* in this case we dont want alut to initialize the context, see above */ #else alcMakeContextCurrent(m_context); #endif @@ -259,7 +347,6 @@ SND_OpenALDevice::SND_OpenALDevice() } } -#endif } // then try to generate some buffers @@ -283,7 +370,7 @@ SND_OpenALDevice::SND_OpenALDevice() // next: the sources if (m_audio) { -#ifdef OUDE_OPENAL +#ifdef __APPLE__ ALenum alc_error = ALC_NO_ERROR; // openal_2.12 #elif defined(_WIN32) // alcGetError has no arguments on windows @@ -375,20 +462,11 @@ SND_OpenALDevice::~SND_OpenALDevice() if (m_cdrom) delete m_cdrom; #endif -#ifdef OUDE_OPENAL - if (m_audio) - alutExit(); -#else if (m_device) alcCloseDevice((ALCdevice*) m_device); -#ifdef AL_VERSION_1_1 - alutExit(); -#endif -#endif } - SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name, void* memlocation, int size) @@ -406,23 +484,22 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name, { if (waveslot) { + bool freemem = false; int buffer = waveslot->GetBuffer(); void* data = NULL; -#ifndef __APPLE__ char loop = 'a'; -#endif int sampleformat, bitrate, numberofchannels; ALenum al_error = alGetError(); - -#ifdef OUDE_OPENAL - ALsizei samplerate, numberofsamples; // openal_2.12 -#else - int samplerate, numberofsamples; // openal_2.14+ -#endif + ALsizei samplerate, numberofsamples; // openal_2.14+ /* Give them some safe defaults just incase */ bitrate = numberofchannels = 0; + if (!(size && memlocation)) { + memlocation = SND_loadFileIntoMemory(samplename.Ptr(), &size); + freemem = true; + } + /* load the sample from memory? */ if (size && memlocation) { @@ -437,33 +514,14 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name, bitrate = SND_GetBitRate(memlocation); /* load the sample into openal */ -#if defined(OUDE_OPENAL) || defined (__APPLE__) - alutLoadWAVMemory((char*)memlocation, &sampleformat, &data, &numberofsamples, &samplerate); // openal_2.12 -#else -#ifdef AL_VERSION_1_1 - float frequency = 0.0f; - data = alutLoadMemoryFromFileImage(memlocation, size, &sampleformat, &numberofsamples, &frequency); - samplerate = (int)frequency; -#else - alutLoadWAVMemory((signed char*)memlocation, &sampleformat, &data, &numberofsamples, &samplerate, &loop);// openal_2.14+ - -#endif -#endif - /* put it in the buffer */ - alBufferData(m_buffers[buffer], sampleformat, data, numberofsamples, samplerate); - } - /* or from file? */ - else - { -#ifdef __APPLE__ - alutLoadWAVFile((ALbyte *)samplename.Ptr(), &sampleformat, &data, &numberofsamples, &samplerate); -#else - alutLoadWAVFile((ALbyte *)samplename.Ptr(), &sampleformat, &data, &numberofsamples, &samplerate, &loop); -#endif + SND_alutLoadWAVMemory((ALbyte*)memlocation, size, &sampleformat, &data, &numberofsamples, &samplerate, &loop); /* put it in the buffer */ alBufferData(m_buffers[buffer], sampleformat, data, numberofsamples, samplerate); } + if(freemem) + free(memlocation); + /* fill the waveslot with info */ al_error = alGetError(); if (al_error == AL_NO_ERROR && m_buffers[buffer]) @@ -486,11 +544,7 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name, } /* and free the original stuff (copy was made in openal) */ -#if defined(OUDE_OPENAL) || defined (__APPLE__) || !defined(AL_VERSION_1_1) - alutUnloadWAV(sampleformat, data, numberofsamples, samplerate); -#else - free(data); -#endif + SND_alutUnloadWAV(sampleformat, data, numberofsamples, samplerate); } } else @@ -594,7 +648,7 @@ int SND_OpenALDevice::GetPlayState(int id) #ifdef __APPLE__ alGetSourcei(m_sources[id], AL_SOURCE_STATE, &alstate); #else - alGetSourceiv(m_sources[id], AL_SOURCE_STATE, &alstate); + alGetSourceiv(m_sources[id], AL_SOURCE_STATE, &alstate); #endif switch(alstate) diff --git a/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp b/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp index b1bac964c61..5054c39e8a1 100644 --- a/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp +++ b/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp @@ -43,6 +43,8 @@ #ifndef DISABLE_SDL #include <SDL.h> +#else +#include <stdio.h> #endif SND_SDLCDDevice::SND_SDLCDDevice() : diff --git a/intern/bmfont/BMF_Api.h b/intern/bmfont/BMF_Api.h deleted file mode 100644 index 252f60623a7..00000000000 --- a/intern/bmfont/BMF_Api.h +++ /dev/null @@ -1,162 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - * - * API of the OpenGL bitmap font library. - * Currently draws fonts using the glBitmap routine. - * This implies that drawing speed is heavyly dependant on - * the 2D capabilities of the graphics card. - */ - -#ifndef __BMF_API_H -#define __BMF_API_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include "BMF_Fonts.h" - -/** - * Returns the font for a given font type. - * @param font The font to retrieve. - * @return The font (or nil if not found). - */ -BMF_Font* BMF_GetFont(BMF_FontType font); - -/** - * Draws a character at the current raster position. - * @param font The font to use. - * @param c The character to draw. - * @return Indication of success (0 == error). - */ -int BMF_DrawCharacter(BMF_Font* font, char c); - -/** - * Draws a string at the current raster position. - * @param font The font to use. - * @param str The string to draw. - * @return Indication of success (0 == error). - */ -int BMF_DrawString(BMF_Font* font, char* str); - -/** - * Returns the width of a character in pixels. - * @param font The font to use. - * @param c The character. - * @return The length. - */ -int BMF_GetCharacterWidth(BMF_Font* font, char c); - -/** - * Returns the width of a string of characters. - * @param font The font to use. - * @param str The string. - * @return The length. - */ -int BMF_GetStringWidth(BMF_Font* font, char* str); - -/** - * Returns the bounding box of a string of characters. - * @param font The font to use. - * @param str The string. - * @param llx Lower left x coord - * @param lly Lower left y coord - * @param urx Upper right x coord - * @param ury Upper right y coord - */ -void BMF_GetStringBoundingBox(BMF_Font* font, char* str, float*llx, float *lly, float *urx, float *ury); - - -/** - * Returns the bounding box of the font. The width and - * height represent the bounding box of the union of - * all glyps. The minimum and maximum values of the - * box represent the extent of the font and its positioning - * about the origin. - */ -void BMF_GetFontBoundingBox(BMF_Font* font, int *xmin_r, int *ymin_r, int *xmax_r, int *ymax_r); - -/** - * Same as GetFontBoundingBox but only returns the height - */ -int BMF_GetFontHeight(BMF_Font* font); - -/** - * Convert the given @a font to a texture, and return the GL texture - * ID of the texture. If the texture ID is bound, text can - * be drawn using the texture by calling DrawStringTexture. - * - * @param font The font to create the texture from. - * @return The GL texture ID of the new texture, or -1 if unable - * to create. - */ -int BMF_GetFontTexture(BMF_Font* font); - -/** - * Draw the given @a str at the point @a x, @a y, @a z, using - * texture coordinates. This assumes that an appropriate texture - * has been bound, see BMF_BitmapFont::GetTexture(). The string - * is drawn along the positive X axis. - * - * @param font The font to draw with. - * @param string The c-string to draw. - * @param x The x coordinate to start drawing at. - * @param y The y coordinate to start drawing at. - * @param z The z coordinate to start drawing at. - */ -void BMF_DrawStringTexture(BMF_Font* font, char* string, float x, float y, float z); - - /** - * Draw the given @a string at the point @a xpos, @a ypos using - * char and float buffers. - * - * @param string The c-string to draw. - * @param xpos The x coordinate to start drawing at. - * @param ypos The y coordinate to start drawing at. - * @param fgcol The forground color. - * @param bgcol The background color. - * @param buf Unsigned char image buffer, when NULL to not operate on it. - * @param fbuf float image buffer, when NULL to not operate on it. - * @param w image buffer width. - * @param h image buffer height. - * @param channels number of channels in the image (3 or 4 - currently) - */ -void BMF_DrawStringBuf(BMF_Font* font, char *str, int posx, int posy, float *col, unsigned char *buf, float *fbuf, int w, int h, int channels); - - -#ifdef __cplusplus -} -#endif - -#endif /* __BMF_API_H */ - diff --git a/intern/bmfont/BMF_Fonts.h b/intern/bmfont/BMF_Fonts.h deleted file mode 100644 index 00a902573fb..00000000000 --- a/intern/bmfont/BMF_Fonts.h +++ /dev/null @@ -1,74 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - * Defines the names of the fonts in the library. - */ - -#ifndef __BMF_FONTS_H -#define __BMF_FONTS_H - -#include "BMF_Settings.h" - -typedef enum -{ - BMF_kHelvetica10 = 0, -#if BMF_INCLUDE_HELV12 - BMF_kHelvetica12, -#endif -#if BMF_INCLUDE_HELVB8 - BMF_kHelveticaBold8, -#endif -#if BMF_INCLUDE_HELVB10 - BMF_kHelveticaBold10, -#endif -#if BMF_INCLUDE_HELVB12 - BMF_kHelveticaBold12, -#endif -#if BMF_INCLUDE_HELVB14 - BMF_kHelveticaBold14, -#endif -#if BMF_INCLUDE_SCR12 - BMF_kScreen12, -#endif -#if BMF_INCLUDE_SCR14 - BMF_kScreen14, -#endif -#if BMF_INCLUDE_SCR15 - BMF_kScreen15, -#endif - BMF_kNumFonts -} BMF_FontType; - -typedef struct BMF_Font BMF_Font; - -#endif /* __BMF_FONTS_H */ - diff --git a/intern/bmfont/BMF_Settings.h b/intern/bmfont/BMF_Settings.h deleted file mode 100644 index b599c97d6ee..00000000000 --- a/intern/bmfont/BMF_Settings.h +++ /dev/null @@ -1,67 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - * Allows you to determine which fonts to include in the library. - */ - -#ifndef __BMF_SETTINGS_H -#define __BMF_SETTINGS_H - -/* This font is included always */ -#define BMF_INCLUDE_HELV10 1 - -#ifndef BMF_MINIMAL - -/* These fonts are included with the minimal setting defined */ -#define BMF_INCLUDE_HELV12 1 -#define BMF_INCLUDE_HELVB8 1 -#define BMF_INCLUDE_HELVB10 1 -#define BMF_INCLUDE_HELVB12 1 -#define BMF_INCLUDE_HELVB14 1 -#define BMF_INCLUDE_SCR12 1 -#define BMF_INCLUDE_SCR14 1 -#define BMF_INCLUDE_SCR15 1 - -#else /* BMF_MINIMAL */ -#define BMF_INCLUDE_HELV12 0 -#define BMF_INCLUDE_HELVB8 0 -#define BMF_INCLUDE_HELVB10 0 -#define BMF_INCLUDE_HELVB12 0 -#define BMF_INCLUDE_HELVB14 0 -#define BMF_INCLUDE_SCR12 0 -#define BMF_INCLUDE_SCR14 0 -#define BMF_INCLUDE_SCR15 0 - -#endif /* BMF_MINIMAL */ - -#endif /* __BMF_SETTINGS_H */ - diff --git a/intern/bmfont/CMakeLists.txt b/intern/bmfont/CMakeLists.txt deleted file mode 100644 index 3ae636a6097..00000000000 --- a/intern/bmfont/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# $Id$ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2006, Blender Foundation -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurain. -# -# ***** END GPL LICENSE BLOCK ***** - -SET(INC . intern) - -FILE(GLOB SRC intern/*.cpp) - -BLENDERLIB(bf_bmfont "${SRC}" "${INC}") -#, libtype=['intern','player'], priority = [20, 185] ) diff --git a/intern/bmfont/Makefile b/intern/bmfont/Makefile deleted file mode 100644 index bc42f52a1fb..00000000000 --- a/intern/bmfont/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont -# -# ***** END GPL LICENSE BLOCK ***** -# bmfont main makefile. -# - -include nan_definitions.mk - -LIBNAME = bmfont -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -#not ready yet TESTDIRS = test - -include nan_subdirs.mk - -install: all debug - @[ -d $(NAN_BMFONT) ] || mkdir $(NAN_BMFONT) - @[ -d $(NAN_BMFONT)/include ] || mkdir $(NAN_BMFONT)/include - @[ -d $(NAN_BMFONT)/lib ] || mkdir $(NAN_BMFONT)/lib - @[ -d $(NAN_BMFONT)/lib/debug ] || mkdir $(NAN_BMFONT)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libbmfont.a $(NAN_BMFONT)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libbmfont.a $(NAN_BMFONT)/lib/debug/ -ifeq ($(OS),darwin) - ranlib $(NAN_BMFONT)/lib/libbmfont.a - ranlib $(NAN_BMFONT)/lib/debug/libbmfont.a -endif - @../tools/cpifdiff.sh *.h $(NAN_BMFONT)/include/ - diff --git a/intern/bmfont/SConscript b/intern/bmfont/SConscript deleted file mode 100644 index 4febe2735e7..00000000000 --- a/intern/bmfont/SConscript +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/python -Import ('env') - -sources = env.Glob('intern/*.cpp') - -incs = '. intern' -incs += ' ' + env['BF_OPENGL_INC'] -defs = '' - -env.BlenderLib ('bf_bmfont', sources, Split(incs), Split(defs), libtype=['intern','player'], priority = [20, 185] ) diff --git a/intern/bmfont/intern/BDF2BMF.py b/intern/bmfont/intern/BDF2BMF.py deleted file mode 100644 index 15b9e5b8eb4..00000000000 --- a/intern/bmfont/intern/BDF2BMF.py +++ /dev/null @@ -1,177 +0,0 @@ -#!/usr/bin/python - -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# ***** END GPL LICENCE BLOCK ***** -# -------------------------------------------------------------------------- - -HELP_TXT = \ -''' -Convert BDF pixmap fonts into C++ files Blender can read. -Use to replace bitmap fonts or add new ones. - -Usage - python bdf2bmf.py -name=SomeName myfile.bdf - -Blender currently supports fonts with a maximum width of 8 pixels. -''' - -# -------- Simple BDF parser -import sys -def parse_bdf(f, MAX_CHARS=256): - lines = [l.strip().upper().split() for l in f.readlines()] - - is_bitmap = False - dummy = {'BITMAP':[]} - char_data = [dummy.copy() for i in xrange(MAX_CHARS)] - context_bitmap = [] - - for l in lines: - if l[0]=='ENCODING': enc = int(l[1]) - elif l[0]=='BBX': bbx = [int(c) for c in l[1:]] - elif l[0]=='DWIDTH': dwidth = int(l[1]) - elif l[0]=='BITMAP': is_bitmap = True - elif l[0]=='ENDCHAR': - if enc < MAX_CHARS: - char_data[enc]['BBX'] = bbx - char_data[enc]['DWIDTH'] = dwidth - char_data[enc]['BITMAP'] = context_bitmap - - context_bitmap = [] - enc = bbx = None - is_bitmap = False - else: - # None of the above, Ok, were reading a bitmap - if is_bitmap and enc < MAX_CHARS: - context_bitmap.append( int(l[0], 16) ) - - return char_data -# -------- end simple BDF parser - -def bdf2cpp_name(path): - return path.split('.')[0] + '.cpp' - -def convert_to_blender(bdf_dict, font_name, origfilename, MAX_CHARS=256): - - # first get a global width/height, also set the offsets - xmin = ymin = 10000000 - xmax = ymax = -10000000 - - bitmap_offsets = [-1] * MAX_CHARS - bitmap_tot = 0 - for i, c in enumerate(bdf_dict): - if c.has_key('BBX'): - bbx = c['BBX'] - xmax = max(bbx[0], xmax) - ymax = max(bbx[1], ymax) - xmin = min(bbx[2], xmin) - ymin = min(bbx[3], ymin) - - bitmap_offsets[i] = bitmap_tot - bitmap_tot += len(c['BITMAP']) - - c['BITMAP'].reverse() - - # Now we can write. Ok if we have no .'s in the path. - f = open(bdf2cpp_name(origfilename), 'w') - - f.write(''' -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "BMF_FontData.h" - -#include "BMF_Settings.h" -''') - - f.write('#if BMF_INCLUDE_%s\n\n' % font_name.upper()) - f.write('static unsigned char bitmap_data[]= {') - newline = 8 - - for i, c in enumerate(bdf_dict): - - for cdata in c['BITMAP']: - # Just formatting - newline+=1 - if newline >= 8: - newline = 0 - f.write('\n\t') - # End formatting - - f.write('0x%.2hx,' % cdata) # 0x80 <- format - - f.write("\n};\n") - - f.write("BMF_FontData BMF_font_%s = {\n" % font_name) - f.write('\t%d, %d,\n' % (xmin, ymin)) - f.write('\t%d, %d,\n' % (xmax, ymax)) - - f.write('\t{\n') - - - for i, c in enumerate(bdf_dict): - if bitmap_offsets[i] == -1 or c.has_key('BBX') == False: - f.write('\t\t{0,0,0,0,0, -1},\n') - else: - bbx = c['BBX'] - f.write('\t\t{%d,%d,%d,%d,%d, %d},\n' % (bbx[0], bbx[1], -bbx[2], -bbx[3], c['DWIDTH'], bitmap_offsets[i])) - - f.write(''' - }, - bitmap_data -}; - -#endif -''') - -def main(): - # replace "[-name=foo]" with "[-name] [foo]" - args = [] - for arg in sys.argv: - for a in arg.replace('=', ' ').split(): - args.append(a) - - name = 'untitled' - done_anything = False - for i, arg in enumerate(args): - if arg == '-name': - if i==len(args)-1: - print 'no arg given for -name, aborting' - return - else: - name = args[i+1] - - elif arg.lower().endswith('.bdf'): - try: - f = open(arg) - print '...Writing to:', bdf2cpp_name(arg) - except: - print 'could not open "%s", aborting' % arg - - - bdf_dict = parse_bdf(f) - convert_to_blender(bdf_dict, name, arg) - done_anything = True - - if not done_anything: - print HELP_TXT - print '...nothing to do' - -if __name__ == '__main__': - main() - diff --git a/intern/bmfont/intern/BMF_Api.cpp b/intern/bmfont/intern/BMF_Api.cpp deleted file mode 100644 index 1699393e53d..00000000000 --- a/intern/bmfont/intern/BMF_Api.cpp +++ /dev/null @@ -1,183 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - * - * Implementation of the API of the OpenGL bitmap font library. - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "BMF_Api.h" - -#include "BMF_BitmapFont.h" - - -#if BMF_INCLUDE_HELV10 -extern BMF_FontData BMF_font_helv10; -static BMF_BitmapFont bmfHelv10(&BMF_font_helv10); -#endif // BMF_INCLUDE_HELV10 -#if BMF_INCLUDE_HELV12 -extern BMF_FontData BMF_font_helv12; -static BMF_BitmapFont bmfHelv12(&BMF_font_helv12); -#endif // BMF_INCLUDE_HELV12 -#if BMF_INCLUDE_HELVB8 -extern BMF_FontData BMF_font_helvb8; -static BMF_BitmapFont bmfHelvb8(&BMF_font_helvb8); -#endif // BMF_INCLUDE_HELVB8 -#if BMF_INCLUDE_HELVB10 -extern BMF_FontData BMF_font_helvb10; -static BMF_BitmapFont bmfHelvb10(&BMF_font_helvb10); -#endif // BMF_INCLUDE_HELVB10 -#if BMF_INCLUDE_HELVB12 -extern BMF_FontData BMF_font_helvb12; -static BMF_BitmapFont bmfHelvb12(&BMF_font_helvb12); -#endif // BMF_INCLUDE_HELVB12 -#if BMF_INCLUDE_HELVB14 -extern BMF_FontData BMF_font_helvb14; -static BMF_BitmapFont bmfHelvb14(&BMF_font_helvb14); -#endif // BMF_INCLUDE_HELVB14 -#if BMF_INCLUDE_SCR12 -extern BMF_FontData BMF_font_scr12; -static BMF_BitmapFont bmfScreen12(&BMF_font_scr12); -#endif // BMF_INCLUDE_SCR12 -#if BMF_INCLUDE_SCR14 -extern BMF_FontData BMF_font_scr14; -static BMF_BitmapFont bmfScreen14(&BMF_font_scr14); -#endif // BMF_INCLUDE_SCR14 -#if BMF_INCLUDE_SCR15 -extern BMF_FontData BMF_font_scr15; -static BMF_BitmapFont bmfScreen15(&BMF_font_scr15); -#endif // BMF_INCLUDE_SCR15 - - -BMF_Font* BMF_GetFont(BMF_FontType font) -{ - switch (font) - { -#if BMF_INCLUDE_HELV10 - case BMF_kHelvetica10: return (BMF_Font*) &bmfHelv10; -#endif // BMF_INCLUDE_HELV10 -#if BMF_INCLUDE_HELV12 - case BMF_kHelvetica12: return (BMF_Font*) &bmfHelv12; -#endif // BMF_INCLUDE_HELV12 -#if BMF_INCLUDE_HELVB8 - case BMF_kHelveticaBold8: return (BMF_Font*) &bmfHelvb8; -#endif // BMF_INCLUDE_HELVB8 -#if BMF_INCLUDE_HELVB10 - case BMF_kHelveticaBold10: return (BMF_Font*) &bmfHelvb10; -#endif // BMF_INCLUDE_HELVB10 -#if BMF_INCLUDE_HELVB12 - case BMF_kHelveticaBold12: return (BMF_Font*) &bmfHelvb12; -#endif // BMF_INCLUDE_HELVB12 -#if BMF_INCLUDE_HELVB14 - case BMF_kHelveticaBold14: return (BMF_Font*) &bmfHelvb14; -#endif // BMF_INCLUDE_HELVB12 -#if BMF_INCLUDE_SCR12 - case BMF_kScreen12: return (BMF_Font*) &bmfScreen12; -#endif // BMF_INCLUDE_SCR12 -#if BMF_INCLUDE_SCR14 - case BMF_kScreen14: return (BMF_Font*) &bmfScreen14; -#endif // BMF_INCLUDE_SCR14 -#if BMF_INCLUDE_SCR15 - case BMF_kScreen15: return (BMF_Font*) &bmfScreen15; -#endif // BMF_INCLUDE_SCR15 - default: - break; - } - return 0; -} - - -int BMF_DrawCharacter(BMF_Font* font, char c) -{ - char str[2] = {c, '\0'}; - return BMF_DrawString(font, str); -} - - -int BMF_DrawString(BMF_Font* font, char* str) -{ - if (!font) return 0; - ((BMF_BitmapFont*)font)->DrawString(str); - return 1; -} - - -int BMF_GetCharacterWidth(BMF_Font* font, char c) -{ - char str[2] = {c, '\0'}; - return BMF_GetStringWidth(font, str); -} - - -int BMF_GetStringWidth(BMF_Font* font, char* str) -{ - if (!font) return 0; - return ((BMF_BitmapFont*)font)->GetStringWidth(str); -} - -void BMF_GetStringBoundingBox(BMF_Font* font, char* str, float*llx, float *lly, float *urx, float *ury){ - if (!font){ - *llx = *lly = *urx = *ury = 0; - }else{ - ((BMF_BitmapFont*)font)->GetStringBoundingBox(str, llx, lly, urx, ury); - } -} - -void BMF_GetFontBoundingBox(BMF_Font* font, int *xmin_r, int *ymin_r, int *xmax_r, int *ymax_r) -{ - if (!font) return; - ((BMF_BitmapFont*)font)->GetFontBoundingBox(*xmin_r, *ymin_r, *xmax_r, *ymax_r); -} - -int BMF_GetFontHeight(BMF_Font* font) -{ - if (!font) return -1; - return ((BMF_BitmapFont*)font)->GetFontHeight(); -} - -int BMF_GetFontTexture(BMF_Font* font) { - if (!font) return -1; - return ((BMF_BitmapFont*)font)->GetTexture(); -} - -void BMF_DrawStringTexture(BMF_Font* font, char *string, float x, float y, float z) { - if (!font) return; - ((BMF_BitmapFont*)font)->DrawStringTexture(string, x, y, z); -} - -void BMF_DrawStringBuf(BMF_Font* font, char *str, int posx, int posy, float *col, unsigned char *buf, float *fbuf, int w, int h, int channels) { - if (!font) return; - ((BMF_BitmapFont*)font)->DrawStringBuf(str, posx, posy, col, buf, fbuf, w, h, channels); -} diff --git a/intern/bmfont/intern/BMF_BitmapFont.cpp b/intern/bmfont/intern/BMF_BitmapFont.cpp deleted file mode 100644 index 0111e9c3f93..00000000000 --- a/intern/bmfont/intern/BMF_BitmapFont.cpp +++ /dev/null @@ -1,323 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - */ - - -#include <stdio.h> - - - -#include <string.h> - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#if defined(WIN32) || defined(__APPLE__) - #ifdef WIN32 - #if !defined(__CYGWIN32__) - #pragma warning(disable:4244) - #endif /* __CYGWIN32__ */ - #include <windows.h> - #include <GL/gl.h> - #else // WIN32 - // __APPLE__ is defined - #include <AGL/gl.h> - #endif // WIN32 -#else // defined(WIN32) || defined(__APPLE__) - #include <GL/gl.h> -#endif // defined(WIN32) || defined(__APPLE__) - -#include "BMF_BitmapFont.h" - - -BMF_BitmapFont::BMF_BitmapFont(BMF_FontData* fontData) -: m_fontData(fontData) -{ -} - - -BMF_BitmapFont::~BMF_BitmapFont(void) -{ -} - -void BMF_BitmapFont::DrawString(char* str) -{ - GLint alignment; - unsigned char c; - - glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment); - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - - while ( (c = (unsigned char) *str++) ) { - BMF_CharData & cd = m_fontData->chars[c]; - - if (cd.data_offset==-1) { - GLubyte nullBitmap = 0; - - glBitmap(1, 1, 0, 0, cd.advance, 0, &nullBitmap); - } else { - GLubyte *bitmap = &m_fontData->bitmap_data[cd.data_offset]; - - glBitmap(cd.width, cd.height, cd.xorig, cd.yorig, cd.advance, 0, bitmap); - } - } - - glPixelStorei(GL_UNPACK_ALIGNMENT, alignment); -} - - -int BMF_BitmapFont::GetStringWidth(char* str) -{ - unsigned char c; - int length = 0; - - while ( (c = (unsigned char) *str++) ) { - length += m_fontData->chars[c].advance; - } - - return length; -} - -void BMF_BitmapFont::GetFontBoundingBox(int & xMin, int & yMin, int & xMax, int & yMax) -{ - xMin = m_fontData->xmin; - yMin = m_fontData->ymin; - xMax = m_fontData->xmax; - yMax = m_fontData->ymax; -} - -int BMF_BitmapFont::GetFontHeight( void ) -{ - return m_fontData->ymax - m_fontData->ymin; -} - -void BMF_BitmapFont::GetStringBoundingBox(char* str, float*llx, float *lly, float *urx, float *ury) -{ - unsigned char c; - int length = 0; - int ascent = 0; - int descent = 0; - - while ( (c = (unsigned char) *str++) ) { - length += m_fontData->chars[c].advance; - int d = m_fontData->chars[c].yorig; - int a = m_fontData->chars[c].height - m_fontData->chars[c].yorig; - if(a > ascent) ascent = a; - if(d > descent) descent = d; - } - *llx = (float)0; - *lly = (float)-descent; - *urx = (float)length; - *ury = (float)ascent; -} - - -int BMF_BitmapFont::GetTexture() -{ - int fWidth = m_fontData->xmax - m_fontData->xmin; - int fHeight = m_fontData->ymax - m_fontData->ymin; - - if (fWidth>=16 || fHeight>=16) { - return -1; - } - - int cRows = 16, cCols = 16; - int cWidth = 16, cHeight = 16; - int iWidth = cCols*cWidth; - int iHeight = cRows*cHeight; - GLubyte *img = new GLubyte [iHeight*iWidth]; - GLuint texId; - - int baseLine = -(m_fontData->ymin); - - memset(img, 0, iHeight*iWidth); - for (int i = 0; i<256; i++) { - BMF_CharData & cd = m_fontData->chars[i]; - - if (cd.data_offset != -1) { - int cellX = i%16; - int cellY = i/16; - - for (int y = 0; y<cd.height; y++) { - GLubyte* imgRow = &img[(cellY*cHeight + y + baseLine - cd.yorig)*iWidth]; - GLubyte* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*y]; - - for (int x = 0; x<cd.width; x++) { - GLubyte* imgPxl = &imgRow[(cellX*cWidth + x - cd.xorig)]; - int byteIdx = x/8; - int bitIdx = 7 - (x%8); - - if (chrRow[byteIdx]&(1<<bitIdx)) { - imgPxl[0] = 255; - } - } - } - } - } - - glGenTextures(1, &texId); - - glBindTexture(GL_TEXTURE_2D, texId); - - glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA4, iWidth, iHeight, 0, GL_ALPHA, GL_UNSIGNED_BYTE, img); - if (glGetError()) { - glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE4_ALPHA4, iWidth, iHeight, 0, GL_ALPHA, GL_UNSIGNED_BYTE, img); - } - - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - - delete [] img; - - return texId; -} - -void BMF_BitmapFont::DrawStringTexture(char *str, float x, float y, float z) -{ - unsigned char c; - float pos = 0; - - int baseLine = -(m_fontData->ymin); - - glBegin(GL_QUADS); - while ( (c = (unsigned char) *str++) ) { - BMF_CharData & cd = m_fontData->chars[c]; - - if (cd.data_offset != -1) { - float cellX = (c%16)/16.0; - float cellY = (c/16)/16.0; - - glTexCoord2f(cellX + 1.0/16.0, cellY); - glVertex3f(x + pos + 16.0, -baseLine + y + 0.0, z); - - glTexCoord2f(cellX + 1.0/16.0, cellY + 1.0/16.0); - glVertex3f(x + pos + 16.0, -baseLine + y + 16.0, z); - - glTexCoord2f(cellX, cellY + 1.0/16.0); - glVertex3f(x + pos + 0.0, -baseLine + y + 16.0, z); - - glTexCoord2f(cellX, cellY); - glVertex3f(x + pos + 0.0, -baseLine + y + 0.0, z); - } - - pos += cd.advance; - } - glEnd(); -} - -#define FTOCHAR(val) val<=0.0f?0: (val>=1.0f?255: (char)(255.0f*val)) -void BMF_BitmapFont::DrawStringBuf(char *str, int posx, int posy, float *col, unsigned char *buf, float *fbuf, int w, int h, int channels) -{ - int x, y; - - if (buf==0 && fbuf==0) - return; - - /*offset for font*/ - posx -= m_fontData->xmin; - posy -= m_fontData->ymin; - - if (buf) { - unsigned char colch[4]; - unsigned char *max, *pixel; - unsigned char c; - - for (x=0; x<4; x++) { - colch[x] = FTOCHAR(col[x]); - } - - max = buf + (4 * (w * h)); - while ((c = (unsigned char) *str++)) { - BMF_CharData & cd = m_fontData->chars[c]; - if (cd.data_offset != -1) { - for (y = 0; y < cd.height; y++) { - unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*y]; - for (x = cd.xorig; x < cd.width; x++) { - pixel = buf + 4 * (((posy + y - cd.yorig) * w) + (posx + x)); - if ((pixel < max) && (pixel > buf)) { - int byteIdx = x/8; - int bitIdx = 7 - (x%8); - - if (chrRow[byteIdx]&(1<<bitIdx)) { - pixel[0] = colch[0]; - pixel[1] = colch[1]; - pixel[2] = colch[2]; - if (channels==4) { - pixel[4] = 1; /*colch[3];*/ - } - - } - } - } - } - } - posx += cd.advance; - } - } - - if (fbuf) { - float *pixel, *max; - unsigned char c; - int xi, yi; - - max = fbuf + (4 * (w * h)); - - while ((c = (unsigned char) *str++)) { - BMF_CharData & cd = m_fontData->chars[c]; - if (cd.data_offset != -1) { - for (yi = 0; yi < cd.height; yi++) { - unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*yi]; - for (xi = cd.xorig; xi < cd.width; xi++) { - pixel = fbuf + 4 * (((posy + yi - cd.yorig) * w) + (posx + xi)); - if ((pixel < max) && (pixel > fbuf)) { - int byteIdx = xi/8; - int bitIdx = 7 - (xi%8); - - if (chrRow[byteIdx]&(1<<bitIdx)) { - pixel[0] = col[0]; - pixel[1] = col[1]; - pixel[2] = col[2]; - if (channels==4) { - pixel[3] = 1; /*col[3];*/ - } - } - } - } - } - } - posx += cd.advance; - } - } -} diff --git a/intern/bmfont/intern/BMF_BitmapFont.h b/intern/bmfont/intern/BMF_BitmapFont.h deleted file mode 100644 index ed060818f71..00000000000 --- a/intern/bmfont/intern/BMF_BitmapFont.h +++ /dev/null @@ -1,140 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - */ - -#ifndef __BMF_BITMAP_FONT_H -#define __BMF_BITMAP_FONT_H - -#include "BMF_FontData.h" - -/** - * Base class for OpenGL bitmap fonts. - */ -class BMF_BitmapFont -{ -public: - /** - * Default constructor. - */ - BMF_BitmapFont(BMF_FontData* fontData); - - /** - * Destructor. - */ - virtual ~BMF_BitmapFont(void); - - /** - * Draws a string at the current raster position. - * @param str The string to draw. - */ - void DrawString(char* str); - - /** - * Draws a string at the current raster position. - * @param str The string to draw. - * @return The width of the string. - */ - int GetStringWidth(char* str); - - /** - * Returns the bounding box of the font. The width and - * height represent the bounding box of the union of - * all glyps. The minimum and maximum values of the - * box represent the extent of the font and its positioning - * about the origin. - */ - void GetFontBoundingBox(int & xMin, int & yMin, int & xMax, int & yMax); - - /** - * Return the bounding box height of the font. - */ - int GetFontHeight(void); - - /** - * Returns the bounding box of a string of characters. - * @param font The font to use. - * @param str The string. - * @param llx Lower left x coord - * @param lly Lower left y coord - * @param urx Upper right x coord - * @param ury Upper right y coord - */ - void GetStringBoundingBox(char* str, float*llx, float *lly, float *urx, float *ury); - - - /** - * Convert the font to a texture, and return the GL texture - * ID of the texture. If the texture ID is bound, text can - * be drawn using the texture by calling DrawStringTexture. - * - * @return The GL texture ID of the new texture, or -1 if unable - * to create. - */ - int GetTexture(); - - /** - * Draw the given @a string at the point @a x, @a y, @a z, using - * texture coordinates. This assumes that an appropriate texture - * has been bound, see BMF_BitmapFont::GetTexture(). The string - * is drawn along the positive X axis. - * - * @param string The c-string to draw. - * @param x The x coordinate to start drawing at. - * @param y The y coordinate to start drawing at. - * @param z The z coordinate to start drawing at. - */ - void DrawStringTexture(char* string, float x, float y, float z); - - /** - * Draw the given @a string at the point @a xpos, @a ypos using - * char and float buffers. - * - * @param string The c-string to draw. - * @param xpos The x coordinate to start drawing at. - * @param ypos The y coordinate to start drawing at. - * @param col The forground color. - * @param buf Unsigned char image buffer, when NULL to not operate on it. - * @param fbuf float image buffer, when NULL to not operate on it. - * @param w image buffer width. - * @param h image buffer height. - * @param channels number of channels in the image (3 or 4 - currently) - */ - void DrawStringBuf(char *str, int posx, int posy, float *col, unsigned char *buf, float *fbuf, int w, int h, int channels); - -protected: - /** Pointer to the font data. */ - BMF_FontData* m_fontData; -}; - -#endif // __BMF_BITMAP_FONT_H - diff --git a/intern/bmfont/intern/BMF_FontData.h b/intern/bmfont/intern/BMF_FontData.h deleted file mode 100644 index 603d291d47d..00000000000 --- a/intern/bmfont/intern/BMF_FontData.h +++ /dev/null @@ -1,55 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - */ - -#ifndef __BMF_FONTDATA_H__ -#define __BMF_FONTDATA_H__ - -typedef struct { - signed char width, height; - signed char xorig, yorig; - signed char advance; - - short data_offset; -} BMF_CharData; - -typedef struct { - int xmin, ymin; - int xmax, ymax; - - BMF_CharData chars[256]; - unsigned char* bitmap_data; -} BMF_FontData; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_helv10.cpp b/intern/bmfont/intern/BMF_font_helv10.cpp deleted file mode 100644 index 2430e9f6d81..00000000000 --- a/intern/bmfont/intern/BMF_font_helv10.cpp +++ /dev/null @@ -1,494 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "BMF_FontData.h" - -#include "BMF_Settings.h" - -#if BMF_INCLUDE_HELV10 - -static unsigned char bitmap_data[]= { - 0x80,0x00,0x80,0x80,0x80,0x80,0x80,0x80, - 0xa0,0xa0,0x50,0x50,0xf8,0x28,0x7c,0x28, - 0x28,0x20,0x70,0xa8,0x28,0x70,0xa0,0xa8, - 0x70,0x20,0x26,0x29,0x16,0x10,0x08,0x68, - 0x94,0x64,0x64,0x98,0x98,0xa4,0x60,0x50, - 0x50,0x20,0x80,0x40,0x40,0x20,0x40,0x40, - 0x80,0x80,0x80,0x80,0x40,0x40,0x20,0x80, - 0x40,0x40,0x20,0x20,0x20,0x20,0x40,0x40, - 0x80,0xa0,0x40,0xa0,0x20,0x20,0xf8,0x20, - 0x20,0x80,0x40,0x40,0xf8,0x80,0x80,0x80, - 0x40,0x40,0x40,0x40,0x20,0x20,0x70,0x88, - 0x88,0x88,0x88,0x88,0x88,0x70,0x40,0x40, - 0x40,0x40,0x40,0x40,0xc0,0x40,0xf8,0x80, - 0x40,0x30,0x08,0x08,0x88,0x70,0x70,0x88, - 0x08,0x08,0x30,0x08,0x88,0x70,0x10,0x10, - 0xf8,0x90,0x50,0x50,0x30,0x10,0x70,0x88, - 0x08,0x08,0xf0,0x80,0x80,0xf8,0x70,0x88, - 0x88,0xc8,0xb0,0x80,0x88,0x70,0x40,0x40, - 0x20,0x20,0x10,0x10,0x08,0xf8,0x70,0x88, - 0x88,0x88,0x70,0x88,0x88,0x70,0x70,0x88, - 0x08,0x68,0x98,0x88,0x88,0x70,0x80,0x00, - 0x00,0x00,0x00,0x80,0x80,0x40,0x40,0x00, - 0x00,0x00,0x00,0x40,0x20,0x40,0x80,0x40, - 0x20,0xf0,0x00,0xf0,0x80,0x40,0x20,0x40, - 0x80,0x40,0x00,0x40,0x40,0x20,0x10,0x90, - 0x60,0x3e,0x00,0x40,0x00,0x9b,0x00,0xa4, - 0x80,0xa4,0x80,0xa2,0x40,0x92,0x40,0x4d, - 0x40,0x20,0x80,0x1f,0x00,0x82,0x82,0x7c, - 0x44,0x28,0x28,0x10,0x10,0xf0,0x88,0x88, - 0x88,0xf0,0x88,0x88,0xf0,0x78,0x84,0x80, - 0x80,0x80,0x80,0x84,0x78,0xf0,0x88,0x84, - 0x84,0x84,0x84,0x88,0xf0,0xf8,0x80,0x80, - 0x80,0xf8,0x80,0x80,0xf8,0x80,0x80,0x80, - 0x80,0xf0,0x80,0x80,0xf8,0x74,0x8c,0x84, - 0x8c,0x80,0x80,0x84,0x78,0x84,0x84,0x84, - 0x84,0xfc,0x84,0x84,0x84,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x60,0x90,0x10, - 0x10,0x10,0x10,0x10,0x10,0x88,0x88,0x90, - 0x90,0xe0,0xa0,0x90,0x88,0xf0,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x92,0x92,0x92, - 0xaa,0xaa,0xc6,0xc6,0x82,0x8c,0x8c,0x94, - 0x94,0xa4,0xa4,0xc4,0xc4,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x78,0x80,0x80,0x80, - 0x80,0xf0,0x88,0x88,0xf0,0x02,0x7c,0x8c, - 0x94,0x84,0x84,0x84,0x84,0x78,0x88,0x88, - 0x88,0x88,0xf0,0x88,0x88,0xf0,0x70,0x88, - 0x88,0x08,0x70,0x80,0x88,0x70,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0xf8,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x10,0x28, - 0x28,0x44,0x44,0x44,0x82,0x82,0x22,0x00, - 0x22,0x00,0x22,0x00,0x55,0x00,0x49,0x00, - 0x49,0x00,0x88,0x80,0x88,0x80,0x88,0x88, - 0x50,0x50,0x20,0x50,0x88,0x88,0x10,0x10, - 0x10,0x28,0x28,0x44,0x44,0x82,0xf8,0x80, - 0x40,0x20,0x20,0x10,0x08,0xf8,0xc0,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xc0, - 0x20,0x20,0x40,0x40,0x40,0x40,0x80,0x80, - 0xc0,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0xc0,0x88,0x50,0x50,0x20,0x20,0xfc, - 0x80,0x80,0x40,0x68,0x90,0x90,0x70,0x10, - 0xe0,0xb0,0xc8,0x88,0x88,0xc8,0xb0,0x80, - 0x80,0x60,0x90,0x80,0x80,0x90,0x60,0x68, - 0x98,0x88,0x88,0x98,0x68,0x08,0x08,0x60, - 0x90,0x80,0xf0,0x90,0x60,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x40,0x30,0x70,0x08,0x68, - 0x98,0x88,0x88,0x98,0x68,0x88,0x88,0x88, - 0x88,0xc8,0xb0,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x00,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x90,0x90, - 0xa0,0xc0,0xa0,0x90,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x92,0x92, - 0x92,0x92,0x92,0xec,0x88,0x88,0x88,0x88, - 0xc8,0xb0,0x70,0x88,0x88,0x88,0x88,0x70, - 0x80,0x80,0xb0,0xc8,0x88,0x88,0xc8,0xb0, - 0x08,0x08,0x68,0x98,0x88,0x88,0x98,0x68, - 0x80,0x80,0x80,0x80,0xc0,0xa0,0x60,0x90, - 0x10,0x60,0x90,0x60,0x60,0x40,0x40,0x40, - 0x40,0xe0,0x40,0x40,0x70,0x90,0x90,0x90, - 0x90,0x90,0x20,0x20,0x50,0x50,0x88,0x88, - 0x28,0x28,0x54,0x54,0x92,0x92,0x88,0x88, - 0x50,0x20,0x50,0x88,0x80,0x40,0x40,0x60, - 0xa0,0xa0,0x90,0x90,0xf0,0x80,0x40,0x20, - 0x10,0xf0,0x20,0x40,0x40,0x40,0x40,0x80, - 0x40,0x40,0x40,0x20,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x40, - 0x40,0x40,0x40,0x20,0x40,0x40,0x40,0x80, - 0x98,0x64,0x80,0x80,0x80,0x80,0x80,0x80, - 0x00,0x80,0x40,0x70,0xa8,0xa0,0xa0,0xa8, - 0x70,0x10,0xb0,0x48,0x40,0x40,0xe0,0x40, - 0x48,0x30,0x90,0x60,0x90,0x90,0x60,0x90, - 0x20,0xf8,0x20,0xf8,0x50,0x50,0x88,0x88, - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x80,0x70,0x88,0x18,0x70,0xc8,0x98, - 0x70,0xc0,0x88,0x70,0xa0,0x38,0x44,0x9a, - 0xa2,0x9a,0x44,0x38,0xe0,0x00,0xa0,0x20, - 0xe0,0x28,0x50,0xa0,0x50,0x28,0x08,0x08, - 0xf8,0xe0,0x38,0x44,0xaa,0xb2,0xba,0x44, - 0x38,0xe0,0x60,0x90,0x90,0x60,0xf8,0x00, - 0x20,0x20,0xf8,0x20,0x20,0xe0,0x40,0xa0, - 0x60,0xc0,0x20,0x40,0xe0,0x80,0x40,0x80, - 0x80,0xf0,0x90,0x90,0x90,0x90,0x90,0x28, - 0x28,0x28,0x28,0x28,0x68,0xe8,0xe8,0xe8, - 0x7c,0xc0,0xc0,0x40,0x40,0x40,0xc0,0x40, - 0xe0,0x00,0xe0,0xa0,0xe0,0xa0,0x50,0x28, - 0x50,0xa0,0x21,0x00,0x17,0x80,0x13,0x00, - 0x09,0x00,0x48,0x00,0x44,0x00,0xc4,0x00, - 0x42,0x00,0x27,0x12,0x15,0x0b,0x48,0x44, - 0xc4,0x42,0x21,0x00,0x17,0x80,0x13,0x00, - 0x09,0x00,0xc8,0x00,0x24,0x00,0x44,0x00, - 0xe2,0x00,0x60,0x90,0x80,0x40,0x20,0x20, - 0x00,0x20,0x82,0x82,0x7c,0x44,0x28,0x28, - 0x10,0x10,0x00,0x10,0x20,0x82,0x82,0x7c, - 0x44,0x28,0x28,0x10,0x10,0x00,0x10,0x08, - 0x82,0x82,0x7c,0x44,0x28,0x28,0x10,0x10, - 0x00,0x28,0x10,0x82,0x82,0x7c,0x44,0x28, - 0x28,0x10,0x10,0x00,0x28,0x14,0x82,0x82, - 0x7c,0x44,0x28,0x28,0x10,0x10,0x00,0x28, - 0x82,0x82,0x7c,0x44,0x28,0x28,0x10,0x10, - 0x10,0x28,0x10,0x8f,0x80,0x88,0x00,0x78, - 0x00,0x48,0x00,0x2f,0x80,0x28,0x00,0x18, - 0x00,0x1f,0x80,0x30,0x10,0x78,0x84,0x80, - 0x80,0x80,0x80,0x84,0x78,0xf8,0x80,0x80, - 0x80,0xf8,0x80,0x80,0xf8,0x00,0x20,0x40, - 0xf8,0x80,0x80,0x80,0xf8,0x80,0x80,0xf8, - 0x00,0x20,0x10,0xf8,0x80,0x80,0xf8,0x80, - 0x80,0x80,0xf8,0x00,0x50,0x20,0xf8,0x80, - 0x80,0x80,0xf8,0x80,0x80,0xf8,0x00,0x50, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0x40,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x00,0x80,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0xa0, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0x00,0xa0,0x78,0x44,0x42,0x42,0xf2, - 0x42,0x44,0x78,0x8c,0x8c,0x94,0x94,0xa4, - 0xa4,0xc4,0xc4,0x00,0x50,0x28,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x78,0x00,0x10, - 0x20,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x78,0x00,0x10,0x08,0x78,0x84,0x84,0x84, - 0x84,0x84,0x84,0x78,0x00,0x28,0x10,0x78, - 0x84,0x84,0x84,0x84,0x84,0x84,0x78,0x00, - 0x50,0x28,0x78,0x84,0x84,0x84,0x84,0x84, - 0x84,0x78,0x00,0x48,0x88,0x50,0x20,0x50, - 0x88,0x80,0x78,0xc4,0xa4,0xa4,0x94,0x94, - 0x8c,0x78,0x04,0x78,0x84,0x84,0x84,0x84, - 0x84,0x84,0x84,0x00,0x10,0x20,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x20, - 0x10,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x00,0x28,0x10,0x78,0x84,0x84,0x84, - 0x84,0x84,0x84,0x84,0x00,0x48,0x10,0x10, - 0x10,0x28,0x28,0x44,0x44,0x82,0x00,0x10, - 0x08,0x80,0x80,0xf0,0x88,0x88,0xf0,0x80, - 0x80,0xa0,0x90,0x90,0x90,0xa0,0x90,0x90, - 0x60,0x68,0x90,0x90,0x70,0x10,0xe0,0x00, - 0x20,0x40,0x68,0x90,0x90,0x70,0x10,0xe0, - 0x00,0x20,0x10,0x68,0x90,0x90,0x70,0x10, - 0xe0,0x00,0x50,0x20,0x68,0x90,0x90,0x70, - 0x10,0xe0,0x00,0xa0,0x50,0x68,0x90,0x90, - 0x70,0x10,0xe0,0x00,0x50,0x68,0x90,0x90, - 0x70,0x10,0xe0,0x20,0x50,0x20,0x6c,0x92, - 0x90,0x7e,0x12,0xec,0x60,0x20,0x60,0x90, - 0x80,0x80,0x90,0x60,0x60,0x90,0x80,0xf0, - 0x90,0x60,0x00,0x20,0x40,0x60,0x90,0x80, - 0xf0,0x90,0x60,0x00,0x40,0x20,0x60,0x90, - 0x80,0xf0,0x90,0x60,0x00,0x50,0x20,0x60, - 0x90,0x80,0xf0,0x90,0x60,0x00,0x50,0x40, - 0x40,0x40,0x40,0x40,0x40,0x00,0x40,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00, - 0xa0,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0xa0,0x70,0x88,0x88,0x88,0x88,0x78, - 0x90,0x60,0x50,0x90,0x90,0x90,0x90,0x90, - 0xe0,0x00,0xa0,0x50,0x70,0x88,0x88,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x88, - 0x88,0x88,0x70,0x00,0x20,0x10,0x70,0x88, - 0x88,0x88,0x88,0x70,0x00,0x50,0x20,0x70, - 0x88,0x88,0x88,0x88,0x70,0x00,0x50,0x28, - 0x70,0x88,0x88,0x88,0x88,0x70,0x00,0x50, - 0x20,0x00,0xf8,0x00,0x20,0x70,0x88,0xc8, - 0xa8,0x98,0x74,0x70,0x90,0x90,0x90,0x90, - 0x90,0x00,0x20,0x40,0x70,0x90,0x90,0x90, - 0x90,0x90,0x00,0x40,0x20,0x70,0x90,0x90, - 0x90,0x90,0x90,0x00,0x50,0x20,0x70,0x90, - 0x90,0x90,0x90,0x90,0x00,0x50,0x80,0x40, - 0x40,0x60,0xa0,0xa0,0x90,0x90,0x00,0x20, - 0x10,0x80,0x80,0xb0,0xc8,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x80,0x40,0x40,0x60,0xa0, - 0xa0,0x90,0x90,0x00,0x50, -}; - -BMF_FontData BMF_font_helv10 = { - -1, -2, - 10, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 3, -1}, - {1, 8, -1, 0, 3, 0}, - {3, 2, -1, -6, 4, 8}, - {6, 7, 0, 0, 6, 10}, - {5, 9, 0, 1, 6, 17}, - {8, 8, 0, 0, 9, 26}, - {6, 8, -1, 0, 8, 34}, - {2, 3, -1, -5, 3, 42}, - {3, 10, 0, 2, 4, 45}, - {3, 10, -1, 2, 4, 55}, - {3, 3, 0, -5, 4, 65}, - {5, 5, 0, -1, 6, 68}, - {2, 3, 0, 2, 3, 73}, - {5, 1, -1, -3, 7, 76}, - {1, 1, -1, 0, 3, 77}, - {3, 8, 0, 0, 3, 78}, - {5, 8, 0, 0, 6, 86}, - {2, 8, -1, 0, 6, 94}, - {5, 8, 0, 0, 6, 102}, - {5, 8, 0, 0, 6, 110}, - {5, 8, 0, 0, 6, 118}, - {5, 8, 0, 0, 6, 126}, - {5, 8, 0, 0, 6, 134}, - {5, 8, 0, 0, 6, 142}, - {5, 8, 0, 0, 6, 150}, - {5, 8, 0, 0, 6, 158}, - {1, 6, -1, 0, 3, 166}, - {2, 8, 0, 2, 3, 172}, - {3, 5, -1, -1, 6, 180}, - {4, 3, 0, -2, 5, 185}, - {3, 5, -1, -1, 6, 188}, - {4, 8, -1, 0, 6, 193}, - {10, 10, 0, 2, 11, 201}, - {7, 8, 0, 0, 7, 221}, - {5, 8, -1, 0, 7, 229}, - {6, 8, -1, 0, 8, 237}, - {6, 8, -1, 0, 8, 245}, - {5, 8, -1, 0, 7, 253}, - {5, 8, -1, 0, 6, 261}, - {6, 8, -1, 0, 8, 269}, - {6, 8, -1, 0, 8, 277}, - {1, 8, -1, 0, 3, 285}, - {4, 8, 0, 0, 5, 293}, - {5, 8, -1, 0, 7, 301}, - {4, 8, -1, 0, 6, 309}, - {7, 8, -1, 0, 9, 317}, - {6, 8, -1, 0, 8, 325}, - {6, 8, -1, 0, 8, 333}, - {5, 8, -1, 0, 7, 341}, - {7, 9, -1, 1, 8, 349}, - {5, 8, -1, 0, 7, 358}, - {5, 8, -1, 0, 7, 366}, - {5, 8, 0, 0, 5, 374}, - {6, 8, -1, 0, 8, 382}, - {7, 8, 0, 0, 7, 390}, - {9, 8, 0, 0, 9, 398}, - {5, 8, -1, 0, 7, 414}, - {7, 8, 0, 0, 7, 422}, - {5, 8, -1, 0, 7, 430}, - {2, 10, -1, 2, 3, 438}, - {3, 8, 0, 0, 3, 448}, - {2, 10, 0, 2, 3, 456}, - {5, 5, 0, -3, 6, 466}, - {6, 1, 0, 2, 6, 471}, - {2, 3, 0, -5, 3, 472}, - {5, 6, 0, 0, 5, 475}, - {5, 8, 0, 0, 6, 481}, - {4, 6, 0, 0, 5, 489}, - {5, 8, 0, 0, 6, 495}, - {4, 6, 0, 0, 5, 503}, - {4, 8, 0, 0, 4, 509}, - {5, 8, 0, 2, 6, 517}, - {5, 8, 0, 0, 6, 525}, - {1, 8, 0, 0, 2, 533}, - {1, 9, 0, 1, 2, 541}, - {4, 8, 0, 0, 5, 550}, - {1, 8, 0, 0, 2, 558}, - {7, 6, 0, 0, 8, 566}, - {5, 6, 0, 0, 6, 572}, - {5, 6, 0, 0, 6, 578}, - {5, 8, 0, 2, 6, 584}, - {5, 8, 0, 2, 6, 592}, - {3, 6, 0, 0, 4, 600}, - {4, 6, 0, 0, 5, 606}, - {3, 8, 0, 0, 4, 612}, - {4, 6, 0, 0, 5, 620}, - {5, 6, 0, 0, 6, 626}, - {7, 6, 0, 0, 8, 632}, - {5, 6, 0, 0, 6, 638}, - {4, 8, 0, 2, 5, 644}, - {4, 6, 0, 0, 5, 652}, - {3, 10, 0, 2, 3, 658}, - {1, 10, -1, 2, 3, 668}, - {3, 10, 0, 2, 3, 678}, - {6, 2, 0, -3, 7, 688}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 3, -1}, - {1, 8, -1, 2, 3, 690}, - {5, 8, 0, 1, 6, 698}, - {5, 8, 0, 0, 6, 706}, - {4, 6, 0, -1, 5, 714}, - {5, 8, 0, 0, 6, 720}, - {1, 10, -1, 2, 3, 728}, - {5, 10, 0, 2, 6, 738}, - {3, 1, 0, -7, 3, 748}, - {7, 7, -1, 0, 9, 749}, - {3, 5, 0, -3, 4, 756}, - {5, 5, 0, 0, 6, 761}, - {5, 3, -1, -2, 7, 766}, - {3, 1, 0, -3, 4, 769}, - {7, 7, -1, 0, 9, 770}, - {3, 1, 0, -7, 3, 777}, - {4, 4, 0, -3, 4, 778}, - {5, 7, 0, 0, 6, 782}, - {3, 4, 0, -3, 3, 789}, - {3, 4, 0, -3, 3, 793}, - {2, 2, 0, -6, 3, 797}, - {4, 8, 0, 2, 5, 799}, - {6, 10, 0, 2, 6, 807}, - {2, 1, 0, -3, 3, 817}, - {2, 2, 0, 2, 3, 818}, - {2, 4, 0, -3, 3, 820}, - {3, 5, 0, -3, 4, 824}, - {5, 5, 0, 0, 6, 829}, - {9, 8, 0, 0, 9, 834}, - {8, 8, 0, 0, 9, 850}, - {9, 8, 0, 0, 9, 858}, - {4, 8, -1, 2, 6, 874}, - {7, 11, 0, 0, 7, 882}, - {7, 11, 0, 0, 7, 893}, - {7, 11, 0, 0, 7, 904}, - {7, 11, 0, 0, 7, 915}, - {7, 10, 0, 0, 7, 926}, - {7, 11, 0, 0, 7, 936}, - {9, 8, 0, 0, 10, 947}, - {6, 10, -1, 2, 8, 963}, - {5, 11, -1, 0, 7, 973}, - {5, 11, -1, 0, 7, 984}, - {5, 11, -1, 0, 7, 995}, - {5, 10, -1, 0, 7, 1006}, - {2, 11, 0, 0, 3, 1016}, - {2, 11, -1, 0, 3, 1027}, - {3, 11, 0, 0, 3, 1038}, - {3, 10, 0, 0, 3, 1049}, - {7, 8, 0, 0, 8, 1059}, - {6, 11, -1, 0, 8, 1067}, - {6, 11, -1, 0, 8, 1078}, - {6, 11, -1, 0, 8, 1089}, - {6, 11, -1, 0, 8, 1100}, - {6, 11, -1, 0, 8, 1111}, - {6, 10, -1, 0, 8, 1122}, - {5, 5, 0, -1, 6, 1132}, - {6, 10, -1, 1, 8, 1137}, - {6, 11, -1, 0, 8, 1147}, - {6, 11, -1, 0, 8, 1158}, - {6, 11, -1, 0, 8, 1169}, - {6, 10, -1, 0, 8, 1180}, - {7, 11, 0, 0, 7, 1190}, - {5, 8, -1, 0, 7, 1201}, - {4, 8, 0, 0, 5, 1209}, - {5, 9, 0, 0, 5, 1217}, - {5, 9, 0, 0, 5, 1226}, - {5, 9, 0, 0, 5, 1235}, - {5, 9, 0, 0, 5, 1244}, - {5, 8, 0, 0, 5, 1253}, - {5, 9, 0, 0, 5, 1261}, - {7, 6, 0, 0, 8, 1270}, - {4, 8, 0, 2, 5, 1276}, - {4, 9, 0, 0, 5, 1284}, - {4, 9, 0, 0, 5, 1293}, - {4, 9, 0, 0, 5, 1302}, - {4, 8, 0, 0, 5, 1311}, - {2, 9, 1, 0, 2, 1319}, - {2, 9, 0, 0, 2, 1328}, - {3, 9, 1, 0, 2, 1337}, - {3, 8, 0, 0, 2, 1346}, - {5, 9, 0, 0, 6, 1354}, - {4, 9, 0, 0, 5, 1363}, - {5, 9, 0, 0, 6, 1372}, - {5, 9, 0, 0, 6, 1381}, - {5, 9, 0, 0, 6, 1390}, - {5, 9, 0, 0, 6, 1399}, - {5, 8, 0, 0, 6, 1408}, - {5, 5, 0, -1, 6, 1416}, - {6, 6, 0, 0, 6, 1421}, - {4, 9, 0, 0, 5, 1427}, - {4, 9, 0, 0, 5, 1436}, - {4, 9, 0, 0, 5, 1445}, - {4, 8, 0, 0, 5, 1454}, - {4, 11, 0, 2, 5, 1462}, - {5, 10, 0, 2, 6, 1473}, - {4, 10, 0, 2, 5, 1483}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_helv12.cpp b/intern/bmfont/intern/BMF_font_helv12.cpp deleted file mode 100644 index 29b08b659ee..00000000000 --- a/intern/bmfont/intern/BMF_font_helv12.cpp +++ /dev/null @@ -1,525 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_HELV12 - -static unsigned char bitmap_data[]= { - 0x80,0x00,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0xa0,0xa0,0xa0,0x50,0x50,0x50,0xfc, - 0x28,0xfc,0x28,0x28,0x20,0x70,0xa8,0xa8, - 0x28,0x70,0xa0,0xa8,0x70,0x20,0x23,0x00, - 0x14,0x80,0x14,0x80,0x13,0x00,0x08,0x00, - 0x68,0x00,0x94,0x00,0x94,0x00,0x62,0x00, - 0x72,0x8c,0x84,0x8a,0x50,0x30,0x48,0x48, - 0x30,0x80,0x40,0xc0,0x20,0x40,0x40,0x80, - 0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x20, - 0x80,0x40,0x40,0x20,0x20,0x20,0x20,0x20, - 0x20,0x40,0x40,0x80,0xa0,0x40,0xa0,0x20, - 0x20,0xf8,0x20,0x20,0x80,0x40,0x40,0xf8, - 0x80,0x80,0x80,0x40,0x40,0x40,0x20,0x20, - 0x10,0x10,0x70,0x88,0x88,0x88,0x88,0x88, - 0x88,0x88,0x70,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0xe0,0x20,0xf8,0x80,0x80,0x40, - 0x20,0x10,0x08,0x88,0x70,0x70,0x88,0x88, - 0x08,0x08,0x30,0x08,0x88,0x70,0x08,0x08, - 0xfc,0x88,0x48,0x28,0x28,0x18,0x08,0x70, - 0x88,0x88,0x08,0x08,0xf0,0x80,0x80,0xf8, - 0x70,0x88,0x88,0x88,0xc8,0xb0,0x80,0x88, - 0x70,0x40,0x40,0x20,0x20,0x20,0x10,0x10, - 0x08,0xf8,0x70,0x88,0x88,0x88,0x88,0x70, - 0x88,0x88,0x70,0x70,0x88,0x08,0x08,0x78, - 0x88,0x88,0x88,0x70,0x80,0x00,0x00,0x00, - 0x00,0x80,0x80,0x40,0x40,0x00,0x00,0x00, - 0x00,0x40,0x0c,0x30,0xc0,0x30,0x0c,0xf8, - 0x00,0xf8,0xc0,0x30,0x0c,0x30,0xc0,0x20, - 0x00,0x20,0x20,0x10,0x10,0x88,0x88,0x70, - 0x3e,0x00,0x40,0x00,0x9b,0x00,0xa6,0x80, - 0xa2,0x40,0xa2,0x40,0x92,0x40,0x4d,0x40, - 0x60,0x80,0x1f,0x00,0x82,0x82,0x82,0x7c, - 0x44,0x44,0x28,0x28,0x10,0xf8,0x84,0x84, - 0x84,0xf8,0x84,0x84,0x84,0xf8,0x3c,0x42, - 0x80,0x80,0x80,0x80,0x80,0x42,0x3c,0xf8, - 0x84,0x82,0x82,0x82,0x82,0x82,0x84,0xf8, - 0xfc,0x80,0x80,0x80,0xfc,0x80,0x80,0x80, - 0xfc,0x80,0x80,0x80,0x80,0xf8,0x80,0x80, - 0x80,0xfc,0x3a,0x46,0x82,0x82,0x8e,0x80, - 0x80,0x42,0x3c,0x82,0x82,0x82,0x82,0xfe, - 0x82,0x82,0x82,0x82,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x70,0x88,0x88, - 0x08,0x08,0x08,0x08,0x08,0x08,0x82,0x84, - 0x88,0x90,0xe0,0xa0,0x90,0x88,0x84,0xf8, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x88,0x80,0x88,0x80,0x94,0x80,0x94,0x80, - 0xa2,0x80,0xa2,0x80,0xc1,0x80,0xc1,0x80, - 0x80,0x80,0x82,0x86,0x8a,0x8a,0x92,0xa2, - 0xa2,0xc2,0x82,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x80,0x80,0x80,0x80, - 0xf8,0x84,0x84,0x84,0xf8,0x3d,0x42,0x85, - 0x89,0x81,0x81,0x81,0x42,0x3c,0x84,0x84, - 0x84,0x88,0xf8,0x84,0x84,0x84,0xf8,0x78, - 0x84,0x84,0x04,0x18,0x60,0x80,0x84,0x78, - 0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10, - 0xfe,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x84,0x10,0x10,0x28,0x28,0x44,0x44, - 0x44,0x82,0x82,0x22,0x00,0x22,0x00,0x22, - 0x00,0x55,0x00,0x55,0x00,0x49,0x00,0x88, - 0x80,0x88,0x80,0x88,0x80,0x82,0x44,0x44, - 0x28,0x10,0x28,0x44,0x44,0x82,0x10,0x10, - 0x10,0x10,0x28,0x44,0x44,0x82,0x82,0xfe, - 0x80,0x40,0x20,0x10,0x08,0x04,0x02,0xfe, - 0xc0,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0xc0,0x10,0x10,0x20,0x20, - 0x20,0x40,0x40,0x80,0x80,0xc0,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0xc0,0x88,0x50,0x20,0xfe,0xc0,0x80,0x40, - 0x74,0x88,0x88,0x78,0x08,0x88,0x70,0xb0, - 0xc8,0x88,0x88,0x88,0xc8,0xb0,0x80,0x80, - 0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x68, - 0x98,0x88,0x88,0x88,0x98,0x68,0x08,0x08, - 0x70,0x88,0x80,0xf8,0x88,0x88,0x70,0x40, - 0x40,0x40,0x40,0x40,0x40,0xe0,0x40,0x30, - 0x70,0x88,0x08,0x68,0x98,0x88,0x88,0x88, - 0x98,0x68,0x88,0x88,0x88,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x00,0x80,0x80,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x40, - 0x88,0x90,0xa0,0xc0,0xc0,0xa0,0x90,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x92,0x92,0x92,0x92,0x92,0xda, - 0xa4,0x88,0x88,0x88,0x88,0x88,0xc8,0xb0, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x80, - 0x80,0x80,0xb0,0xc8,0x88,0x88,0x88,0xc8, - 0xb0,0x08,0x08,0x08,0x68,0x98,0x88,0x88, - 0x88,0x98,0x68,0x80,0x80,0x80,0x80,0x80, - 0xc0,0xa0,0x60,0x90,0x10,0x60,0x80,0x90, - 0x60,0x60,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x40,0x40,0x68,0x98,0x88,0x88,0x88,0x88, - 0x88,0x20,0x20,0x50,0x50,0x88,0x88,0x88, - 0x22,0x00,0x22,0x00,0x55,0x00,0x49,0x00, - 0x49,0x00,0x88,0x80,0x88,0x80,0x84,0x84, - 0x48,0x30,0x30,0x48,0x84,0x80,0x40,0x20, - 0x20,0x50,0x50,0x90,0x88,0x88,0x88,0xf0, - 0x80,0x40,0x40,0x20,0x10,0xf0,0x30,0x40, - 0x40,0x40,0x40,0x40,0x80,0x40,0x40,0x40, - 0x40,0x30,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0xc0,0x20, - 0x20,0x20,0x20,0x20,0x10,0x20,0x20,0x20, - 0x20,0xc0,0x98,0x64,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x40,0x70, - 0xc8,0xa0,0xa0,0xa0,0xa8,0x70,0x10,0xb0, - 0x48,0x20,0x20,0xf0,0x40,0x40,0x48,0x30, - 0x84,0x78,0x48,0x48,0x78,0x84,0x20,0x20, - 0xf8,0x20,0xf8,0x20,0x50,0x88,0x88,0x80, - 0x80,0x80,0x80,0x00,0x00,0x00,0x80,0x80, - 0x80,0x80,0x70,0x88,0x08,0x30,0x48,0x88, - 0x88,0x90,0x60,0x80,0x88,0x70,0xa0,0x3e, - 0x00,0x41,0x00,0x9c,0x80,0xa2,0x80,0xa0, - 0x80,0xa2,0x80,0x9c,0x80,0x41,0x00,0x3e, - 0x00,0xe0,0x00,0xa0,0x20,0xe0,0x28,0x50, - 0xa0,0x50,0x28,0x04,0x04,0x04,0xfc,0xf0, - 0x3e,0x00,0x41,0x00,0x94,0x80,0x94,0x80, - 0x98,0x80,0x94,0x80,0x9c,0x80,0x41,0x00, - 0x3e,0x00,0xf0,0x60,0x90,0x90,0x60,0xf8, - 0x00,0x20,0x20,0xf8,0x20,0x20,0xf0,0x40, - 0x20,0x90,0x60,0xc0,0x20,0x40,0x20,0xe0, - 0x80,0x40,0x80,0x80,0x80,0xe8,0x98,0x88, - 0x88,0x88,0x88,0x88,0x28,0x28,0x28,0x28, - 0x28,0x28,0x68,0xe8,0xe8,0xe8,0x68,0x3c, - 0x80,0xc0,0x20,0x20,0x40,0x40,0x40,0x40, - 0xc0,0x40,0xe0,0x00,0xe0,0xa0,0xe0,0xa0, - 0x50,0x28,0x50,0xa0,0x41,0x00,0x27,0x80, - 0x15,0x00,0x13,0x00,0x49,0x00,0x44,0x00, - 0x44,0x00,0xc2,0x00,0x41,0x00,0x47,0x80, - 0x22,0x00,0x11,0x00,0x14,0x80,0x4b,0x00, - 0x48,0x00,0x44,0x00,0xc2,0x00,0x41,0x00, - 0x21,0x00,0x17,0x80,0x15,0x00,0x0b,0x00, - 0xc9,0x00,0x24,0x00,0x44,0x00,0x22,0x00, - 0xe1,0x00,0x70,0x88,0x88,0x40,0x40,0x20, - 0x20,0x00,0x20,0x82,0x82,0x82,0x7c,0x44, - 0x44,0x28,0x10,0x10,0x00,0x10,0x20,0x82, - 0x82,0x82,0x7c,0x44,0x44,0x28,0x10,0x10, - 0x00,0x10,0x08,0x82,0x82,0x82,0x7c,0x44, - 0x44,0x28,0x10,0x10,0x00,0x28,0x10,0x82, - 0x82,0x82,0x7c,0x44,0x44,0x28,0x10,0x10, - 0x00,0x28,0x14,0x82,0x82,0x82,0x7c,0x44, - 0x44,0x28,0x10,0x10,0x00,0x28,0x82,0x82, - 0x82,0x7c,0x44,0x44,0x28,0x10,0x10,0x10, - 0x28,0x10,0x8f,0x80,0x88,0x00,0x88,0x00, - 0x78,0x00,0x4f,0x80,0x48,0x00,0x28,0x00, - 0x28,0x00,0x1f,0x80,0x30,0x08,0x08,0x3c, - 0x42,0x80,0x80,0x80,0x80,0x80,0x42,0x3c, - 0xfc,0x80,0x80,0x80,0xfc,0x80,0x80,0x80, - 0xfc,0x00,0x10,0x20,0xfc,0x80,0x80,0x80, - 0xfc,0x80,0x80,0x80,0xfc,0x00,0x10,0x08, - 0xfc,0x80,0x80,0x80,0xfc,0x80,0x80,0x80, - 0xfc,0x00,0x28,0x10,0xfc,0x80,0x80,0x80, - 0xfc,0x80,0x80,0x80,0xfc,0x00,0x28,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0x40,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0xa0,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x00,0xa0,0x7c,0x42, - 0x41,0x41,0xf1,0x41,0x41,0x42,0x7c,0x82, - 0x86,0x8a,0x8a,0x92,0xa2,0xa2,0xc2,0x82, - 0x00,0x28,0x14,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x00,0x08,0x10,0x3c, - 0x42,0x81,0x81,0x81,0x81,0x81,0x42,0x3c, - 0x00,0x08,0x04,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x00,0x14,0x08,0x3c, - 0x42,0x81,0x81,0x81,0x81,0x81,0x42,0x3c, - 0x00,0x28,0x14,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x00,0x24,0x88,0x50, - 0x20,0x50,0x88,0x80,0x00,0x5e,0x00,0x21, - 0x00,0x50,0x80,0x48,0x80,0x44,0x80,0x44, - 0x80,0x42,0x80,0x21,0x00,0x1e,0x80,0x00, - 0x40,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x84,0x00,0x10,0x20,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x10, - 0x08,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x84,0x00,0x28,0x10,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x48, - 0x10,0x10,0x10,0x10,0x28,0x44,0x44,0x82, - 0x82,0x00,0x10,0x08,0x80,0x80,0xf8,0x84, - 0x84,0x84,0xf8,0x80,0x80,0xb0,0x88,0x88, - 0x88,0xb0,0x88,0x88,0x88,0x70,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0x00,0x10,0x20, - 0x74,0x88,0x88,0x78,0x08,0x88,0x70,0x00, - 0x20,0x10,0x74,0x88,0x88,0x78,0x08,0x88, - 0x70,0x00,0x50,0x20,0x74,0x88,0x88,0x78, - 0x08,0x88,0x70,0x00,0x50,0x28,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0x00,0x50,0x74, - 0x88,0x88,0x78,0x08,0x88,0x70,0x30,0x48, - 0x30,0x77,0x00,0x88,0x80,0x88,0x00,0x7f, - 0x80,0x08,0x80,0x88,0x80,0x77,0x00,0x60, - 0x10,0x20,0x70,0x88,0x80,0x80,0x80,0x88, - 0x70,0x70,0x88,0x80,0xf8,0x88,0x88,0x70, - 0x00,0x20,0x40,0x70,0x88,0x80,0xf8,0x88, - 0x88,0x70,0x00,0x20,0x10,0x70,0x88,0x80, - 0xf8,0x88,0x88,0x70,0x00,0x50,0x20,0x70, - 0x88,0x80,0xf8,0x88,0x88,0x70,0x00,0x50, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00, - 0x40,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x00,0x80,0x40,0x40,0x40,0x40,0x40, - 0x40,0x40,0x40,0x00,0xa0,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x00,0xa0,0x70, - 0x88,0x88,0x88,0x88,0x78,0x08,0x50,0x30, - 0x68,0x88,0x88,0x88,0x88,0x88,0xc8,0xb0, - 0x00,0x50,0x28,0x70,0x88,0x88,0x88,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x88, - 0x88,0x88,0x88,0x70,0x00,0x20,0x10,0x70, - 0x88,0x88,0x88,0x88,0x88,0x70,0x00,0x50, - 0x20,0x70,0x88,0x88,0x88,0x88,0x88,0x70, - 0x00,0x50,0x28,0x70,0x88,0x88,0x88,0x88, - 0x88,0x70,0x00,0x50,0x20,0x00,0xf8,0x00, - 0x20,0xb8,0x44,0x64,0x54,0x4c,0x44,0x3a, - 0x68,0x98,0x88,0x88,0x88,0x88,0x88,0x00, - 0x20,0x40,0x68,0x98,0x88,0x88,0x88,0x88, - 0x88,0x00,0x20,0x10,0x68,0x98,0x88,0x88, - 0x88,0x88,0x88,0x00,0x50,0x20,0x68,0x98, - 0x88,0x88,0x88,0x88,0x88,0x00,0x50,0x80, - 0x40,0x20,0x20,0x50,0x50,0x90,0x88,0x88, - 0x88,0x00,0x20,0x10,0x80,0x80,0x80,0xb0, - 0xc8,0x88,0x88,0x88,0xc8,0xb0,0x80,0x80, - 0xc0,0x20,0x20,0x20,0x30,0x50,0x50,0x48, - 0x88,0x88,0x00,0x50, -}; - -BMF_FontData BMF_font_helv12 = { - 0, -3, - 11, 12, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 16, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 4, -1}, - {1, 9, -1, 0, 3, 0}, - {3, 3, -1, -6, 5, 9}, - {6, 8, 0, 0, 7, 12}, - {5, 10, -1, 1, 7, 20}, - {9, 9, -1, 0, 11, 30}, - {7, 9, -1, 0, 9, 48}, - {2, 3, -1, -6, 3, 57}, - {3, 12, -1, 3, 4, 60}, - {3, 12, 0, 3, 4, 72}, - {3, 3, -1, -6, 5, 84}, - {5, 5, -1, -1, 7, 87}, - {2, 3, -1, 2, 4, 92}, - {5, 1, -1, -3, 8, 95}, - {1, 1, -1, 0, 3, 96}, - {4, 9, 0, 0, 4, 97}, - {5, 9, -1, 0, 7, 106}, - {3, 9, -1, 0, 7, 115}, - {5, 9, -1, 0, 7, 124}, - {5, 9, -1, 0, 7, 133}, - {6, 9, 0, 0, 7, 142}, - {5, 9, -1, 0, 7, 151}, - {5, 9, -1, 0, 7, 160}, - {5, 9, -1, 0, 7, 169}, - {5, 9, -1, 0, 7, 178}, - {5, 9, -1, 0, 7, 187}, - {1, 6, -1, 0, 3, 196}, - {2, 8, 0, 2, 3, 202}, - {6, 5, 0, -1, 7, 210}, - {5, 3, -1, -2, 7, 215}, - {6, 5, -1, -1, 7, 218}, - {5, 9, -1, 0, 7, 223}, - {10, 10, -1, 1, 12, 232}, - {7, 9, -1, 0, 9, 252}, - {6, 9, -1, 0, 8, 261}, - {7, 9, -1, 0, 9, 270}, - {7, 9, -1, 0, 9, 279}, - {6, 9, -1, 0, 8, 288}, - {6, 9, -1, 0, 8, 297}, - {7, 9, -1, 0, 9, 306}, - {7, 9, -1, 0, 9, 315}, - {1, 9, -1, 0, 3, 324}, - {5, 9, -1, 0, 7, 333}, - {7, 9, -1, 0, 8, 342}, - {5, 9, -1, 0, 7, 351}, - {9, 9, -1, 0, 11, 360}, - {7, 9, -1, 0, 9, 378}, - {8, 9, -1, 0, 10, 387}, - {6, 9, -1, 0, 8, 396}, - {8, 9, -1, 0, 10, 405}, - {6, 9, -1, 0, 8, 414}, - {6, 9, -1, 0, 8, 423}, - {7, 9, 0, 0, 7, 432}, - {6, 9, -1, 0, 8, 441}, - {7, 9, -1, 0, 9, 450}, - {9, 9, -1, 0, 11, 459}, - {7, 9, -1, 0, 9, 477}, - {7, 9, -1, 0, 9, 486}, - {7, 9, -1, 0, 9, 495}, - {2, 12, -1, 3, 3, 504}, - {4, 9, 0, 0, 4, 516}, - {2, 12, 0, 3, 3, 525}, - {5, 3, 0, -5, 6, 537}, - {7, 1, 0, 2, 7, 540}, - {2, 3, 0, -6, 3, 541}, - {6, 7, -1, 0, 7, 544}, - {5, 9, -1, 0, 7, 551}, - {5, 7, -1, 0, 7, 560}, - {5, 9, -1, 0, 7, 567}, - {5, 7, -1, 0, 7, 576}, - {4, 9, 0, 0, 3, 583}, - {5, 10, -1, 3, 7, 592}, - {5, 9, -1, 0, 7, 602}, - {1, 9, -1, 0, 3, 611}, - {2, 12, 0, 3, 3, 620}, - {5, 9, -1, 0, 6, 632}, - {1, 9, -1, 0, 3, 641}, - {7, 7, -1, 0, 9, 650}, - {5, 7, -1, 0, 7, 657}, - {5, 7, -1, 0, 7, 664}, - {5, 10, -1, 3, 7, 671}, - {5, 10, -1, 3, 7, 681}, - {3, 7, -1, 0, 4, 691}, - {4, 7, -1, 0, 6, 698}, - {3, 9, 0, 0, 3, 705}, - {5, 7, -1, 0, 7, 714}, - {5, 7, -1, 0, 7, 721}, - {9, 7, 0, 0, 9, 728}, - {6, 7, 0, 0, 6, 742}, - {5, 10, -1, 3, 7, 749}, - {4, 7, -1, 0, 6, 759}, - {4, 12, 0, 3, 4, 766}, - {1, 12, -1, 3, 3, 778}, - {4, 12, 0, 3, 4, 790}, - {6, 2, 0, -3, 7, 802}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 4, -1}, - {1, 10, -1, 3, 3, 804}, - {5, 9, -1, 1, 7, 814}, - {5, 9, -1, 0, 7, 823}, - {6, 6, 0, -1, 7, 832}, - {5, 9, -1, 0, 7, 838}, - {1, 11, -1, 2, 3, 847}, - {5, 12, 0, 3, 6, 858}, - {3, 1, 0, -8, 3, 870}, - {9, 9, -1, 0, 11, 871}, - {3, 5, -1, -4, 5, 889}, - {5, 5, -1, -1, 7, 894}, - {6, 4, -1, -2, 8, 899}, - {4, 1, 0, -3, 5, 903}, - {9, 9, -1, 0, 11, 904}, - {4, 1, 0, -8, 4, 922}, - {4, 4, 0, -4, 5, 923}, - {5, 7, -1, 0, 7, 927}, - {4, 5, 0, -3, 4, 934}, - {3, 5, 0, -3, 4, 939}, - {2, 2, 0, -8, 2, 944}, - {5, 10, -1, 3, 7, 946}, - {6, 12, 0, 3, 7, 956}, - {1, 1, -1, -3, 3, 968}, - {3, 4, 0, 3, 3, 969}, - {2, 5, -1, -3, 4, 973}, - {3, 5, -1, -4, 5, 978}, - {5, 5, -1, -1, 7, 983}, - {9, 9, 0, 0, 10, 988}, - {9, 9, 0, 0, 10, 1006}, - {9, 9, 0, 0, 10, 1024}, - {5, 9, -1, 3, 7, 1042}, - {7, 12, -1, 0, 9, 1051}, - {7, 12, -1, 0, 9, 1063}, - {7, 12, -1, 0, 9, 1075}, - {7, 12, -1, 0, 9, 1087}, - {7, 11, -1, 0, 9, 1099}, - {7, 12, -1, 0, 9, 1110}, - {9, 9, -1, 0, 11, 1122}, - {7, 12, -1, 3, 9, 1140}, - {6, 12, -1, 0, 8, 1152}, - {6, 12, -1, 0, 8, 1164}, - {6, 12, -1, 0, 8, 1176}, - {6, 11, -1, 0, 8, 1188}, - {2, 12, 0, 0, 3, 1199}, - {2, 12, -1, 0, 3, 1211}, - {3, 12, 0, 0, 3, 1223}, - {3, 11, 0, 0, 3, 1235}, - {8, 9, 0, 0, 9, 1246}, - {7, 12, -1, 0, 9, 1255}, - {8, 12, -1, 0, 10, 1267}, - {8, 12, -1, 0, 10, 1279}, - {8, 12, -1, 0, 10, 1291}, - {8, 12, -1, 0, 10, 1303}, - {8, 11, -1, 0, 10, 1315}, - {5, 5, -1, -1, 7, 1326}, - {10, 11, 0, 1, 10, 1331}, - {6, 12, -1, 0, 8, 1353}, - {6, 12, -1, 0, 8, 1365}, - {6, 12, -1, 0, 8, 1377}, - {6, 11, -1, 0, 8, 1389}, - {7, 12, -1, 0, 9, 1400}, - {6, 9, -1, 0, 8, 1412}, - {5, 9, -1, 0, 7, 1421}, - {6, 10, -1, 0, 7, 1430}, - {6, 10, -1, 0, 7, 1440}, - {6, 10, -1, 0, 7, 1450}, - {6, 10, -1, 0, 7, 1460}, - {6, 9, -1, 0, 7, 1470}, - {6, 10, -1, 0, 7, 1479}, - {9, 7, -1, 0, 11, 1489}, - {5, 10, -1, 3, 7, 1503}, - {5, 10, -1, 0, 7, 1513}, - {5, 10, -1, 0, 7, 1523}, - {5, 10, -1, 0, 7, 1533}, - {5, 9, -1, 0, 7, 1543}, - {2, 10, 0, 0, 3, 1552}, - {2, 10, -1, 0, 3, 1562}, - {3, 10, 0, 0, 3, 1572}, - {3, 9, 0, 0, 3, 1582}, - {5, 10, -1, 0, 7, 1591}, - {5, 10, -1, 0, 7, 1601}, - {5, 10, -1, 0, 7, 1611}, - {5, 10, -1, 0, 7, 1621}, - {5, 10, -1, 0, 7, 1631}, - {5, 10, -1, 0, 7, 1641}, - {5, 9, -1, 0, 7, 1651}, - {5, 5, -1, -1, 7, 1660}, - {7, 7, 0, 0, 7, 1665}, - {5, 10, -1, 0, 7, 1672}, - {5, 10, -1, 0, 7, 1682}, - {5, 10, -1, 0, 7, 1692}, - {5, 9, -1, 0, 7, 1702}, - {5, 13, -1, 3, 7, 1711}, - {5, 12, -1, 3, 7, 1724}, - {5, 12, -1, 3, 7, 1736}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_helvb10.cpp b/intern/bmfont/intern/BMF_font_helvb10.cpp deleted file mode 100644 index cdd3656c5c0..00000000000 --- a/intern/bmfont/intern/BMF_font_helvb10.cpp +++ /dev/null @@ -1,492 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_HELVB10 - -static unsigned char bitmap_data[]= { - 0x00,0xc0,0x00,0x80,0x80,0xc0,0xc0,0xc0, - 0xc0,0xa0,0xa0,0xa0,0x50,0x50,0xfc,0x28, - 0x7e,0x28,0x28,0x20,0x70,0xa8,0x28,0x38, - 0x70,0xe0,0xa8,0x70,0x20,0x8c,0x56,0x2c, - 0x10,0x10,0x68,0xb4,0x62,0x76,0xdc,0xcc, - 0xde,0x70,0xd8,0xd8,0x70,0x80,0x40,0xc0, - 0xc0,0x20,0x60,0x40,0xc0,0xc0,0xc0,0xc0, - 0x40,0x60,0x20,0x80,0xc0,0x40,0x60,0x60, - 0x60,0x60,0x40,0xc0,0x80,0xa0,0x40,0xa0, - 0x30,0x30,0xfc,0x30,0x30,0x80,0x40,0xc0, - 0xc0,0xf8,0xc0,0xc0,0x80,0x80,0x40,0x40, - 0x20,0x20,0x10,0x10,0x70,0xd8,0xd8,0xd8, - 0xd8,0xd8,0xd8,0x70,0x60,0x60,0x60,0x60, - 0x60,0x60,0xe0,0x60,0xf8,0xc0,0x60,0x30, - 0x18,0x18,0xd8,0x70,0x70,0xd8,0x18,0x18, - 0x30,0x18,0xd8,0x70,0x18,0x18,0xfc,0x98, - 0x58,0x38,0x18,0x08,0x70,0xd8,0x98,0x18, - 0xf0,0xc0,0xc0,0xf8,0x70,0xd8,0xd8,0xd8, - 0xf0,0xc0,0xd8,0x70,0x60,0x60,0x60,0x30, - 0x30,0x18,0x18,0xf8,0x70,0xd8,0xd8,0xd8, - 0x70,0xd8,0xd8,0x70,0x70,0xd8,0x18,0x78, - 0xd8,0xd8,0xd8,0x70,0xc0,0xc0,0x00,0x00, - 0xc0,0xc0,0x80,0x40,0xc0,0xc0,0x00,0x00, - 0xc0,0xc0,0x30,0x60,0xc0,0x60,0x30,0xf8, - 0x00,0xf8,0xc0,0x60,0x30,0x60,0xc0,0x60, - 0x00,0x60,0x60,0x30,0x18,0xd8,0x70,0x3e, - 0x00,0x40,0x00,0x9b,0x00,0xa4,0x80,0xa2, - 0x40,0x92,0x40,0x4d,0x40,0x60,0x80,0x1f, - 0x00,0xc6,0xc6,0xfe,0x6c,0x6c,0x6c,0x38, - 0x38,0xf8,0xcc,0xcc,0xcc,0xf8,0xcc,0xcc, - 0xf8,0x3c,0x66,0xc2,0xc0,0xc0,0xc2,0x66, - 0x3c,0xf0,0xd8,0xcc,0xcc,0xcc,0xcc,0xd8, - 0xf0,0xf8,0xc0,0xc0,0xc0,0xf8,0xc0,0xc0, - 0xf8,0xc0,0xc0,0xc0,0xc0,0xf0,0xc0,0xc0, - 0xf8,0x3a,0x66,0xc6,0xce,0xc0,0xc2,0x66, - 0x3c,0xcc,0xcc,0xcc,0xcc,0xfc,0xcc,0xcc, - 0xcc,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0x70,0xd8,0x18,0x18,0x18,0x18,0x18, - 0x18,0xc6,0xcc,0xd8,0xf0,0xe0,0xf0,0xd8, - 0xcc,0xf8,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc9,0x80,0xc9,0x80,0xdd,0x80,0xd5, - 0x80,0xf7,0x80,0xe3,0x80,0xe3,0x80,0xc1, - 0x80,0xc6,0xce,0xce,0xd6,0xd6,0xe6,0xe6, - 0xc6,0x38,0x6c,0xc6,0xc6,0xc6,0xc6,0x6c, - 0x38,0xc0,0xc0,0xc0,0xf8,0xcc,0xcc,0xcc, - 0xf8,0x02,0x3c,0x6c,0xd6,0xc6,0xc6,0xc6, - 0x6c,0x38,0xcc,0xcc,0xcc,0xf8,0xcc,0xcc, - 0xcc,0xf8,0x78,0xcc,0x8c,0x1c,0x78,0xe0, - 0xcc,0x78,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0xfc,0x78,0xcc,0xcc,0xcc,0xcc,0xcc, - 0xcc,0xcc,0x10,0x38,0x38,0x6c,0x6c,0x6c, - 0xc6,0xc6,0x33,0x00,0x33,0x00,0x7f,0x80, - 0x6d,0x80,0x6d,0x80,0xcc,0xc0,0xcc,0xc0, - 0xcc,0xc0,0xc6,0xc6,0x6c,0x38,0x38,0x6c, - 0xc6,0xc6,0x18,0x18,0x18,0x3c,0x66,0x66, - 0xc3,0xc3,0xfc,0xc0,0x60,0x70,0x30,0x18, - 0x0c,0xfc,0xe0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xe0,0x10,0x10,0x20,0x20, - 0x40,0x40,0x80,0x80,0xe0,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0xe0,0x90,0x90, - 0xf0,0x60,0xfc,0xc0,0xc0,0x80,0x40,0x6c, - 0xd8,0xd8,0x78,0x98,0x70,0xf0,0xd8,0xd8, - 0xd8,0xd8,0xf0,0xc0,0xc0,0x70,0xd0,0xc0, - 0xc0,0xd0,0x70,0x78,0xd8,0xd8,0xd8,0xd8, - 0x78,0x18,0x18,0x70,0xd8,0xc0,0xf8,0xd8, - 0x70,0x60,0x60,0x60,0x60,0x60,0xf0,0x60, - 0x38,0x70,0x18,0x78,0xd8,0xd8,0xd8,0xd8, - 0x68,0xd8,0xd8,0xd8,0xd8,0xd8,0xf0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00, - 0xc0,0xc0,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0x60,0xcc,0xd8,0xf0,0xe0,0xf0, - 0xd8,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xdb,0xdb,0xdb,0xdb,0xdb, - 0xb6,0xd8,0xd8,0xd8,0xd8,0xd8,0xb0,0x70, - 0xd8,0xd8,0xd8,0xd8,0x70,0xc0,0xc0,0xf0, - 0xd8,0xd8,0xd8,0xd8,0xb0,0x18,0x18,0x78, - 0xd8,0xd8,0xd8,0xd8,0x68,0xc0,0xc0,0xc0, - 0xc0,0xe0,0xb0,0x70,0xd8,0x18,0x70,0xd8, - 0x70,0x30,0x60,0x60,0x60,0x60,0xf0,0x60, - 0x60,0x68,0xd8,0xd8,0xd8,0xd8,0xd8,0x20, - 0x70,0x50,0xd8,0xd8,0xd8,0x6c,0x6c,0x6c, - 0xd6,0xd6,0xd6,0xcc,0xcc,0x78,0x30,0x78, - 0xcc,0x60,0x30,0x30,0x78,0xd8,0xd8,0xd8, - 0xd8,0xf8,0xc0,0x60,0x30,0x18,0xf8,0x30, - 0x60,0x60,0x60,0x60,0xc0,0x60,0x60,0x60, - 0x30,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0xc0,0x60,0x60,0x60,0x60, - 0x30,0x60,0x60,0x60,0xc0,0xb0,0x68,0x00, - 0xc0,0xc0,0xc0,0xc0,0x40,0x40,0x00,0xc0, - 0x40,0x70,0xd8,0xa0,0xa0,0xd8,0x70,0x10, - 0xd8,0x68,0x60,0x60,0xf0,0x60,0x68,0x38, - 0x84,0x78,0x48,0x48,0x78,0x84,0x30,0xfc, - 0x30,0xfc,0x48,0xcc,0x84,0x84,0x80,0x80, - 0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x80, - 0x70,0x98,0x38,0x70,0xc8,0x98,0x70,0xe0, - 0xc8,0x70,0xa0,0x3c,0x42,0x9d,0xa1,0xa5, - 0x99,0x42,0x3c,0xe0,0x00,0xa0,0x20,0xe0, - 0x6c,0xd8,0x6c,0x08,0x08,0xf8,0xf0,0x3c, - 0x42,0xa5,0xb9,0xa5,0xbd,0x42,0x3c,0xe0, - 0xc0,0xa0,0x60,0xfc,0x00,0x30,0x30,0xfc, - 0x30,0x30,0xe0,0x40,0xa0,0x60,0xc0,0x20, - 0x40,0xe0,0x80,0x40,0xc0,0xc0,0xe8,0xd8, - 0xd8,0xd8,0xd8,0xd8,0x28,0x28,0x28,0x28, - 0x28,0x68,0xe8,0xe8,0xe8,0x7c,0xc0,0xc0, - 0x40,0x40,0x40,0xc0,0x40,0xe0,0x00,0xe0, - 0xa0,0xe0,0xd8,0x6c,0xd8,0x42,0x2f,0x26, - 0x12,0x48,0x48,0xc4,0x44,0x4e,0x24,0x2a, - 0x16,0x48,0x48,0xc4,0x44,0x42,0x2f,0x26, - 0x12,0xc8,0x28,0x44,0xe4,0x70,0xd8,0xc0, - 0x60,0x30,0x30,0x00,0x30,0xc6,0xc6,0xfe, - 0x6c,0x6c,0x6c,0x38,0x38,0x00,0x10,0x20, - 0xc6,0xc6,0xfe,0x6c,0x6c,0x6c,0x38,0x38, - 0x00,0x10,0x08,0xc6,0xc6,0xfe,0x6c,0x6c, - 0x6c,0x38,0x38,0x00,0x28,0x10,0xc6,0xc6, - 0xfe,0x6c,0x6c,0x6c,0x38,0x38,0x00,0x28, - 0x14,0xc6,0xc6,0xfe,0x6c,0x6c,0x6c,0x38, - 0x38,0x00,0x28,0xc6,0xc6,0xfe,0x6c,0x6c, - 0x6c,0x38,0x38,0x10,0x28,0x10,0xcf,0x80, - 0xcc,0x00,0xfc,0x00,0x6c,0x00,0x6f,0x80, - 0x6c,0x00,0x3c,0x00,0x3f,0x80,0x30,0x10, - 0x3c,0x66,0xc2,0xc0,0xc0,0xc2,0x66,0x3c, - 0xf8,0xc0,0xc0,0xc0,0xf8,0xc0,0xc0,0xf8, - 0x00,0x20,0x40,0xf8,0xc0,0xc0,0xc0,0xf8, - 0xc0,0xc0,0xf8,0x00,0x20,0x10,0xf8,0xc0, - 0xc0,0xc0,0xf8,0xc0,0xc0,0xf8,0x00,0x50, - 0x20,0xf8,0xc0,0xc0,0xc0,0xf8,0xc0,0xc0, - 0xf8,0x00,0x50,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0x00,0x40,0x80,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x80, - 0x40,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0xa0,0x40,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x00,0x90,0x78,0x6c, - 0x66,0x66,0xf6,0x66,0x6c,0x78,0xc6,0xce, - 0xce,0xd6,0xd6,0xe6,0xe6,0xc6,0x00,0x28, - 0x14,0x38,0x6c,0xc6,0xc6,0xc6,0xc6,0x6c, - 0x38,0x00,0x08,0x10,0x38,0x6c,0xc6,0xc6, - 0xc6,0xc6,0x6c,0x38,0x00,0x10,0x08,0x38, - 0x6c,0xc6,0xc6,0xc6,0xc6,0x6c,0x38,0x00, - 0x28,0x10,0x38,0x6c,0xc6,0xc6,0xc6,0xc6, - 0x6c,0x38,0x00,0x28,0x14,0x38,0x6c,0xc6, - 0xc6,0xc6,0xc6,0x6c,0x38,0x00,0x28,0xcc, - 0x78,0x30,0x78,0xcc,0xb8,0x6c,0xe6,0xd6, - 0xd6,0xce,0x6c,0x3a,0x78,0xcc,0xcc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0x00,0x10,0x20,0x78, - 0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x00, - 0x10,0x08,0x78,0xcc,0xcc,0xcc,0xcc,0xcc, - 0xcc,0xcc,0x00,0x50,0x20,0x78,0xcc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0x48,0x18, - 0x18,0x18,0x3c,0x66,0x66,0xc3,0xc3,0x00, - 0x08,0x04,0xc0,0xc0,0xf8,0xcc,0xcc,0xcc, - 0xf8,0xc0,0xd0,0xc8,0xc8,0xc8,0xd0,0xc8, - 0xc8,0x70,0x6c,0xd8,0xd8,0x78,0x98,0x70, - 0x00,0x10,0x20,0x6c,0xd8,0xd8,0x78,0x98, - 0x70,0x00,0x20,0x10,0x6c,0xd8,0xd8,0x78, - 0x98,0x70,0x00,0x50,0x20,0x6c,0xd8,0xd8, - 0x78,0x98,0x70,0x00,0x50,0x28,0x6c,0xd8, - 0xd8,0x78,0x98,0x70,0x00,0x50,0x6c,0xd8, - 0xd8,0x78,0x98,0x70,0x20,0x50,0x20,0x6e, - 0xdb,0xd8,0x7f,0x9b,0x7e,0x60,0x20,0x70, - 0xd0,0xc0,0xc0,0xd0,0x70,0x70,0xd8,0xc0, - 0xf8,0xd8,0x70,0x00,0x20,0x40,0x70,0xd8, - 0xc0,0xf8,0xd8,0x70,0x00,0x20,0x10,0x70, - 0xd8,0xc0,0xf8,0xd8,0x70,0x00,0x50,0x20, - 0x70,0xd8,0xc0,0xf8,0xd8,0x70,0x00,0x50, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x40, - 0x80,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00, - 0x80,0x40,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0x00,0xa0,0x40,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0x00,0xa0,0x70,0xd8,0xd8,0xd8,0xd8, - 0x70,0xa0,0x60,0x50,0xd8,0xd8,0xd8,0xd8, - 0xd8,0xb0,0x00,0xa0,0x50,0x70,0xd8,0xd8, - 0xd8,0xd8,0x70,0x00,0x20,0x40,0x70,0xd8, - 0xd8,0xd8,0xd8,0x70,0x00,0x20,0x10,0x70, - 0xd8,0xd8,0xd8,0xd8,0x70,0x00,0x50,0x20, - 0x70,0xd8,0xd8,0xd8,0xd8,0x70,0x00,0xa0, - 0x50,0x70,0xd8,0xd8,0xd8,0xd8,0x70,0x00, - 0x50,0x30,0x00,0xfc,0x00,0x30,0xb8,0x6c, - 0x6c,0x7c,0x6c,0x3a,0x68,0xd8,0xd8,0xd8, - 0xd8,0xd8,0x00,0x20,0x40,0x68,0xd8,0xd8, - 0xd8,0xd8,0xd8,0x00,0x20,0x10,0x68,0xd8, - 0xd8,0xd8,0xd8,0xd8,0x00,0x50,0x20,0x68, - 0xd8,0xd8,0xd8,0xd8,0xd8,0x00,0x50,0x60, - 0x30,0x30,0x78,0xd8,0xd8,0xd8,0xd8,0x00, - 0x20,0x10,0xc0,0xc0,0xf0,0xd8,0xc8,0xc8, - 0xd8,0xf0,0xc0,0xc0,0x60,0x30,0x30,0x78, - 0xd8,0xd8,0xd8,0xd8,0x00,0x50, -}; - -BMF_FontData BMF_font_helvb10 = { - -1, -2, - 10, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 0}, - {2, 8, -1, 0, 4, 1}, - {3, 3, -1, -5, 5, 9}, - {7, 7, 1, 0, 6, 12}, - {5, 10, 0, 1, 6, 19}, - {7, 8, 0, 0, 8, 29}, - {7, 8, 0, 0, 8, 37}, - {2, 4, 0, -4, 3, 45}, - {3, 10, 0, 2, 4, 49}, - {3, 10, 0, 2, 4, 59}, - {3, 3, 0, -5, 4, 69}, - {6, 5, 0, -1, 6, 72}, - {2, 4, 0, 2, 3, 77}, - {5, 1, -1, -3, 7, 81}, - {2, 2, 0, 0, 3, 82}, - {4, 8, 0, 0, 4, 84}, - {5, 8, 0, 0, 6, 92}, - {3, 8, -1, 0, 6, 100}, - {5, 8, 0, 0, 6, 108}, - {5, 8, 0, 0, 6, 116}, - {6, 8, 0, 0, 6, 124}, - {5, 8, 0, 0, 6, 132}, - {5, 8, 0, 0, 6, 140}, - {5, 8, 0, 0, 6, 148}, - {5, 8, 0, 0, 6, 156}, - {5, 8, 0, 0, 6, 164}, - {2, 6, 0, 0, 3, 172}, - {2, 8, 0, 2, 3, 178}, - {4, 5, 0, -1, 5, 186}, - {5, 3, 0, -2, 6, 191}, - {4, 5, 0, -1, 5, 194}, - {5, 8, 0, 0, 6, 199}, - {10, 9, 0, 1, 11, 207}, - {7, 8, 0, 0, 8, 225}, - {6, 8, 0, 0, 7, 233}, - {7, 8, 0, 0, 8, 241}, - {6, 8, 0, 0, 7, 249}, - {5, 8, 0, 0, 6, 257}, - {5, 8, 0, 0, 6, 265}, - {7, 8, 0, 0, 8, 273}, - {6, 8, 0, 0, 7, 281}, - {2, 8, 0, 0, 3, 289}, - {5, 8, 0, 0, 6, 297}, - {7, 8, 0, 0, 7, 305}, - {5, 8, 0, 0, 6, 313}, - {9, 8, 0, 0, 10, 321}, - {7, 8, 0, 0, 8, 337}, - {7, 8, 0, 0, 8, 345}, - {6, 8, 0, 0, 7, 353}, - {7, 9, 0, 1, 8, 361}, - {6, 8, 0, 0, 7, 370}, - {6, 8, 0, 0, 7, 378}, - {6, 8, 0, 0, 7, 386}, - {6, 8, 0, 0, 7, 394}, - {7, 8, 0, 0, 8, 402}, - {10, 8, 0, 0, 11, 410}, - {7, 8, 0, 0, 8, 426}, - {8, 8, 0, 0, 9, 434}, - {6, 8, 0, 0, 7, 442}, - {3, 10, 0, 2, 4, 450}, - {4, 8, 0, 0, 4, 460}, - {3, 10, 0, 2, 4, 468}, - {4, 4, 0, -4, 5, 478}, - {6, 1, 0, 2, 6, 482}, - {2, 4, 0, -4, 3, 483}, - {6, 6, 0, 0, 6, 487}, - {5, 8, 0, 0, 6, 493}, - {4, 6, 0, 0, 5, 501}, - {5, 8, 0, 0, 6, 507}, - {5, 6, 0, 0, 6, 515}, - {5, 8, 1, 0, 4, 521}, - {5, 8, 0, 2, 6, 529}, - {5, 8, 0, 0, 6, 537}, - {2, 8, 0, 0, 3, 545}, - {3, 10, 1, 2, 3, 553}, - {6, 8, 0, 0, 6, 563}, - {2, 8, 0, 0, 3, 571}, - {8, 6, 0, 0, 9, 579}, - {5, 6, 0, 0, 6, 585}, - {5, 6, 0, 0, 6, 591}, - {5, 8, 0, 2, 6, 597}, - {5, 8, 0, 2, 6, 605}, - {4, 6, 0, 0, 4, 613}, - {5, 6, 0, 0, 6, 619}, - {4, 8, 1, 0, 4, 625}, - {5, 6, 0, 0, 6, 633}, - {5, 6, 0, 0, 6, 639}, - {7, 6, 0, 0, 8, 645}, - {6, 6, 0, 0, 7, 651}, - {5, 8, 0, 2, 6, 657}, - {5, 6, 0, 0, 6, 665}, - {4, 10, 0, 2, 5, 671}, - {1, 10, -1, 2, 3, 681}, - {4, 10, 0, 2, 5, 691}, - {5, 2, 0, -3, 6, 701}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 703}, - {2, 8, -1, 2, 4, 704}, - {5, 8, 0, 1, 6, 712}, - {5, 8, 0, 0, 6, 720}, - {6, 6, 0, -1, 6, 728}, - {6, 8, 0, 0, 7, 734}, - {1, 10, -1, 2, 3, 742}, - {5, 10, 0, 2, 6, 752}, - {3, 1, 0, -7, 3, 762}, - {8, 8, -1, 0, 10, 763}, - {3, 5, -1, -3, 5, 771}, - {6, 3, 0, -1, 7, 776}, - {5, 3, -1, -2, 7, 779}, - {4, 1, 0, -3, 5, 782}, - {8, 8, -1, 0, 10, 783}, - {3, 1, 0, -7, 3, 791}, - {3, 3, 0, -5, 4, 792}, - {6, 7, 0, 0, 6, 795}, - {3, 4, 0, -4, 3, 802}, - {3, 4, 0, -4, 3, 806}, - {2, 2, 0, -7, 3, 810}, - {5, 8, 0, 2, 6, 812}, - {6, 10, 0, 2, 6, 820}, - {2, 1, 0, -3, 3, 830}, - {2, 2, 0, 2, 3, 831}, - {2, 4, 0, -4, 3, 833}, - {3, 5, -1, -3, 5, 837}, - {6, 3, 0, -1, 7, 842}, - {8, 8, 0, 0, 9, 845}, - {7, 8, 0, 0, 9, 853}, - {8, 8, 0, 0, 9, 861}, - {5, 8, 0, 2, 6, 869}, - {7, 11, 0, 0, 8, 877}, - {7, 11, 0, 0, 8, 888}, - {7, 11, 0, 0, 8, 899}, - {7, 11, 0, 0, 8, 910}, - {7, 10, 0, 0, 8, 921}, - {7, 11, 0, 0, 8, 931}, - {9, 8, 0, 0, 10, 942}, - {7, 10, 0, 2, 8, 958}, - {5, 11, 0, 0, 6, 968}, - {5, 11, 0, 0, 6, 979}, - {5, 11, 0, 0, 6, 990}, - {5, 10, 0, 0, 6, 1001}, - {2, 11, 0, 0, 3, 1011}, - {2, 11, 0, 0, 3, 1022}, - {3, 11, 1, 0, 3, 1033}, - {4, 10, 1, 0, 3, 1044}, - {7, 8, 1, 0, 7, 1054}, - {7, 11, 0, 0, 8, 1062}, - {7, 11, 0, 0, 8, 1073}, - {7, 11, 0, 0, 8, 1084}, - {7, 11, 0, 0, 8, 1095}, - {7, 11, 0, 0, 8, 1106}, - {7, 10, 0, 0, 8, 1117}, - {6, 5, 0, -1, 6, 1127}, - {7, 8, 0, 0, 8, 1132}, - {6, 11, 0, 0, 7, 1140}, - {6, 11, 0, 0, 7, 1151}, - {6, 11, 0, 0, 7, 1162}, - {6, 10, 0, 0, 7, 1173}, - {8, 11, 0, 0, 9, 1183}, - {6, 8, 0, 0, 7, 1194}, - {5, 8, 0, 0, 6, 1202}, - {6, 9, 0, 0, 6, 1210}, - {6, 9, 0, 0, 6, 1219}, - {6, 9, 0, 0, 6, 1228}, - {6, 9, 0, 0, 6, 1237}, - {6, 8, 0, 0, 6, 1246}, - {6, 9, 0, 0, 6, 1254}, - {8, 6, 0, 0, 9, 1263}, - {4, 8, 0, 2, 5, 1269}, - {5, 9, 0, 0, 6, 1277}, - {5, 9, 0, 0, 6, 1286}, - {5, 9, 0, 0, 6, 1295}, - {5, 8, 0, 0, 6, 1304}, - {2, 9, 0, 0, 3, 1312}, - {2, 9, 0, 0, 3, 1321}, - {3, 9, 0, 0, 3, 1330}, - {3, 8, 0, 0, 3, 1339}, - {5, 9, 0, 0, 6, 1347}, - {5, 9, 0, 0, 6, 1356}, - {5, 9, 0, 0, 6, 1365}, - {5, 9, 0, 0, 6, 1374}, - {5, 9, 0, 0, 6, 1383}, - {5, 9, 0, 0, 6, 1392}, - {5, 8, 0, 0, 6, 1401}, - {6, 5, 0, -1, 6, 1409}, - {7, 6, 1, 0, 6, 1414}, - {5, 9, 0, 0, 6, 1420}, - {5, 9, 0, 0, 6, 1429}, - {5, 9, 0, 0, 6, 1438}, - {5, 8, 0, 0, 6, 1447}, - {5, 11, 0, 2, 6, 1455}, - {5, 10, 0, 2, 6, 1466}, - {5, 10, 0, 2, 6, 1476}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_helvb12.cpp b/intern/bmfont/intern/BMF_font_helvb12.cpp deleted file mode 100644 index 8b56bdceee7..00000000000 --- a/intern/bmfont/intern/BMF_font_helvb12.cpp +++ /dev/null @@ -1,565 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_HELVB12 - -static unsigned char bitmap_data[]= { - 0x00,0xc0,0xc0,0x00,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xa0,0xa0,0xa0,0x6c, - 0x00,0x6c,0x00,0x6c,0x00,0xff,0x00,0x36, - 0x00,0x36,0x00,0x36,0x00,0x7f,0x80,0x1b, - 0x00,0x1b,0x00,0x1b,0x00,0x30,0x30,0x78, - 0xec,0xac,0x3c,0x38,0x70,0xf0,0xd4,0xdc, - 0x78,0x30,0x63,0x80,0x37,0xc0,0x36,0xc0, - 0x1f,0xc0,0x1b,0x80,0x0c,0x00,0x76,0x00, - 0xfe,0x00,0xdb,0x00,0xfb,0x00,0x71,0x80, - 0x73,0x80,0xff,0x00,0xce,0x00,0xcf,0x00, - 0xdd,0x80,0x79,0x80,0x38,0x00,0x6c,0x00, - 0x6c,0x00,0x7c,0x00,0x38,0x00,0x80,0x40, - 0xc0,0xc0,0x30,0x60,0x60,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x60,0x60,0x30, - 0xc0,0x60,0x60,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x30,0x60,0x60,0xc0,0xd8,0x70, - 0x70,0xf8,0x20,0x30,0x30,0xfc,0xfc,0x30, - 0x30,0x80,0x40,0xc0,0xc0,0xfc,0xfc,0xc0, - 0xc0,0xc0,0xc0,0xc0,0x60,0x60,0x60,0x20, - 0x30,0x30,0x30,0x18,0x18,0x18,0x78,0xfc, - 0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xfc, - 0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0xf0,0xf0,0x30,0xfc,0xfc,0xc0,0x60, - 0x70,0x38,0x18,0xcc,0xcc,0xfc,0x78,0x78, - 0xfc,0xcc,0xcc,0x0c,0x38,0x38,0x0c,0xcc, - 0xfc,0x78,0x0c,0x0c,0xfe,0xfe,0xcc,0x6c, - 0x6c,0x3c,0x3c,0x1c,0x1c,0x78,0xfc,0xcc, - 0xcc,0x0c,0xfc,0xf8,0xc0,0xc0,0xfc,0xfc, - 0x78,0xfc,0xcc,0xcc,0xcc,0xfc,0xf8,0xc0, - 0xcc,0xfc,0x78,0x60,0x60,0x60,0x30,0x30, - 0x30,0x18,0x18,0x0c,0xfc,0xfc,0x78,0xfc, - 0xcc,0xcc,0xcc,0x78,0x78,0xcc,0xcc,0xfc, - 0x78,0x78,0xfc,0xcc,0x0c,0x7c,0xfc,0xcc, - 0xcc,0xcc,0xfc,0x78,0xc0,0xc0,0x00,0x00, - 0x00,0x00,0xc0,0xc0,0x80,0x40,0xc0,0xc0, - 0x00,0x00,0x00,0x00,0xc0,0xc0,0x0c,0x38, - 0xe0,0xe0,0x38,0x0c,0xfc,0xfc,0x00,0xfc, - 0xfc,0xc0,0x70,0x1c,0x1c,0x70,0xc0,0x30, - 0x30,0x00,0x30,0x30,0x38,0x1c,0xcc,0xcc, - 0xfc,0x78,0x1f,0x00,0x71,0x80,0x40,0x00, - 0xdd,0x80,0xb6,0xc0,0xb2,0x40,0xb3,0x60, - 0xdb,0x20,0x4d,0xa0,0x60,0x40,0x39,0xc0, - 0x0f,0x00,0xc3,0xc3,0xff,0x7e,0x66,0x66, - 0x3c,0x3c,0x3c,0x18,0x18,0xf8,0xfc,0xcc, - 0xcc,0xcc,0xf8,0xf8,0xcc,0xcc,0xfc,0xf8, - 0x78,0xfc,0xcc,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xcc,0xfc,0x78,0xf8,0xfc,0xce,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xce,0xfc,0xf8,0xfc,0xfc, - 0xc0,0xc0,0xc0,0xf8,0xf8,0xc0,0xc0,0xfc, - 0xfc,0xc0,0xc0,0xc0,0xc0,0xc0,0xf8,0xf8, - 0xc0,0xc0,0xfc,0xfc,0x76,0xfe,0xc6,0xc6, - 0xde,0xde,0xc0,0xc0,0xc6,0xfe,0x7c,0xc6, - 0xc6,0xc6,0xc6,0xc6,0xfe,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x70,0xf8,0xd8, - 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, - 0xc6,0xce,0xcc,0xd8,0xf8,0xf0,0xf0,0xd8, - 0xcc,0xcc,0xc6,0xfc,0xfc,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc9,0x80, - 0xc9,0x80,0xdd,0x80,0xdd,0x80,0xf7,0x80, - 0xf7,0x80,0xe3,0x80,0xe3,0x80,0xe3,0x80, - 0xc1,0x80,0xc1,0x80,0xc6,0xc6,0xce,0xce, - 0xde,0xd6,0xf6,0xe6,0xe6,0xc6,0xc6,0x7c, - 0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6, - 0xfe,0x7c,0xc0,0xc0,0xc0,0xc0,0xfc,0xfe, - 0xc6,0xc6,0xc6,0xfe,0xfc,0x06,0x7e,0xfc, - 0xce,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xfe, - 0x7c,0xc6,0xc6,0xc6,0xce,0xfc,0xfc,0xc6, - 0xc6,0xc6,0xfe,0xfc,0x78,0xfc,0xcc,0x0c, - 0x1c,0x78,0xe0,0xc0,0xcc,0xfc,0x78,0x30, - 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0xfc,0xfc,0x7c,0xfe,0xc6,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xc6,0xc6,0x18,0x18,0x18, - 0x3c,0x3c,0x3c,0x66,0x66,0x66,0xc3,0xc3, - 0x33,0x00,0x33,0x00,0x33,0x00,0x3b,0x00, - 0x7f,0x80,0x6d,0x80,0x6d,0x80,0x6d,0x80, - 0xcc,0xc0,0xcc,0xc0,0xcc,0xc0,0xc3,0xc3, - 0x66,0x7e,0x3c,0x18,0x3c,0x7e,0x66,0xc3, - 0xc3,0x18,0x18,0x18,0x18,0x18,0x3c,0x3c, - 0x66,0x66,0xc3,0xc3,0xfe,0xfe,0xc0,0x60, - 0x60,0x30,0x18,0x18,0x0c,0xfe,0xfe,0xe0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xe0,0x30,0x30,0x30, - 0x70,0x60,0x60,0x60,0xe0,0xc0,0xc0,0xc0, - 0xe0,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0xe0,0x88,0xd8, - 0x70,0x70,0x20,0xfe,0xc0,0xc0,0x80,0x40, - 0x76,0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78, - 0xd8,0xfc,0xcc,0xcc,0xcc,0xcc,0xfc,0xd8, - 0xc0,0xc0,0xc0,0x78,0xfc,0xcc,0xc0,0xc0, - 0xcc,0xfc,0x78,0x6c,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x6c,0x0c,0x0c,0x0c,0x78,0xfc, - 0xc0,0xfc,0xfc,0xcc,0xfc,0x78,0x60,0x60, - 0x60,0x60,0x60,0x60,0xf0,0xf0,0x60,0x70, - 0x30,0x78,0xfc,0x0c,0x6c,0xfc,0xcc,0xcc, - 0xcc,0xcc,0xfc,0x6c,0xcc,0xcc,0xcc,0xcc, - 0xcc,0xec,0xfc,0xd8,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00, - 0xc0,0xc0,0xc0,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x00,0x60,0x60, - 0xcc,0xd8,0xd8,0xf0,0xe0,0xf0,0xd8,0xcc, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xcc,0xc0, - 0xcc,0xc0,0xcc,0xc0,0xcc,0xc0,0xcc,0xc0, - 0xee,0xc0,0xff,0xc0,0xbb,0x80,0xcc,0xcc, - 0xcc,0xcc,0xcc,0xec,0xfc,0xd8,0x78,0xfc, - 0xcc,0xcc,0xcc,0xcc,0xfc,0x78,0xc0,0xc0, - 0xc0,0xd8,0xfc,0xcc,0xcc,0xcc,0xcc,0xfc, - 0xd8,0x0c,0x0c,0x0c,0x6c,0xfc,0xcc,0xcc, - 0xcc,0xcc,0xfc,0x6c,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xe0,0xb0,0x78,0xfc,0xcc,0x1c, - 0x78,0xe0,0xfc,0x78,0x30,0x70,0x60,0x60, - 0x60,0x60,0xf0,0xf0,0x60,0x60,0x6c,0xfc, - 0xdc,0xcc,0xcc,0xcc,0xcc,0xcc,0x30,0x30, - 0x78,0x78,0x78,0xcc,0xcc,0xcc,0x24,0x24, - 0x76,0x76,0x7e,0xdb,0xdb,0xdb,0xcc,0xcc, - 0x78,0x38,0x70,0x78,0xcc,0xcc,0xe0,0xf0, - 0x30,0x30,0x38,0x78,0x78,0x48,0xcc,0xcc, - 0xcc,0xfc,0xfc,0x60,0x30,0x30,0x18,0xfc, - 0xfc,0x30,0x60,0x60,0x60,0x60,0x60,0x40, - 0x80,0x40,0x60,0x60,0x60,0x60,0x30,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0xc0,0x60,0x60,0x60, - 0x60,0x60,0x20,0x10,0x20,0x60,0x60,0x60, - 0x60,0xc0,0x98,0xfc,0x64,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0xc0,0xc0, - 0xc0,0x78,0xfc,0xec,0xe0,0xd0,0xd4,0xfc, - 0x78,0x0c,0xdc,0xfe,0x60,0x30,0x30,0xfc, - 0x30,0x60,0x64,0x7c,0x38,0xcc,0x78,0xcc, - 0xcc,0x78,0xcc,0x18,0x18,0x18,0x7e,0x18, - 0x7e,0x3c,0x66,0x66,0xc3,0xc3,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x80,0x80,0x78,0xfc,0xcc,0x1c,0x38, - 0x6c,0xcc,0xcc,0xd8,0x70,0xe0,0xcc,0xfc, - 0x78,0xd8,0xd8,0x1f,0x00,0x71,0xc0,0x6e, - 0xc0,0xdb,0x60,0xdb,0x60,0xd8,0x60,0xdb, - 0x60,0xdb,0x60,0x6e,0xc0,0x71,0xc0,0x1f, - 0x00,0xf0,0x00,0xd0,0xb0,0x70,0xb0,0x60, - 0x36,0x6c,0xd8,0x6c,0x36,0x0c,0x0c,0xfc, - 0xfc,0xe0,0xe0,0x1f,0x00,0x71,0xc0,0x7b, - 0xc0,0xdb,0x60,0xdf,0x60,0xde,0x60,0xdb, - 0x60,0xdb,0x60,0x7e,0xc0,0x71,0xc0,0x1f, - 0x00,0xf0,0xf0,0x60,0x90,0x90,0x60,0xfc, - 0xfc,0x00,0x30,0x30,0xfc,0xfc,0x30,0x30, - 0xf0,0x40,0x20,0x10,0x90,0x60,0x60,0x90, - 0x10,0x20,0x90,0x60,0xc0,0x70,0x30,0xc0, - 0xc0,0xc0,0xec,0xfc,0xdc,0xcc,0xcc,0xcc, - 0xcc,0xcc,0x36,0x36,0x36,0x36,0x36,0x36, - 0x36,0x36,0x76,0xf6,0xf6,0xf6,0xfe,0x7e, - 0xc0,0xc0,0xc0,0x60,0x40,0x40,0x40,0x40, - 0x40,0xc0,0x40,0xf8,0x00,0x70,0xd8,0xd8, - 0xd8,0x70,0xd8,0x6c,0x36,0x6c,0xd8,0x20, - 0x80,0x27,0xc0,0x12,0x80,0x12,0x80,0x09, - 0x80,0x4c,0x80,0x44,0x00,0x42,0x00,0x42, - 0x00,0xc1,0x00,0x41,0x00,0x23,0xc0,0x21, - 0x00,0x10,0x80,0x10,0x40,0x0a,0x40,0x4d, - 0x80,0x44,0x00,0x42,0x00,0x42,0x00,0xc1, - 0x00,0x41,0x00,0x20,0x80,0x27,0xc0,0x12, - 0x80,0x12,0x80,0x09,0x80,0x6c,0x80,0x94, - 0x00,0x12,0x00,0x22,0x00,0x91,0x00,0x61, - 0x00,0x78,0xfc,0xcc,0xcc,0xe0,0x70,0x30, - 0x30,0x00,0x30,0x30,0xc3,0xc3,0x7e,0x7e, - 0x24,0x3c,0x18,0x18,0x00,0x0c,0x38,0x30, - 0xc3,0xc3,0x7e,0x7e,0x24,0x3c,0x18,0x18, - 0x00,0x30,0x1c,0x0c,0xc3,0xc3,0x7e,0x7e, - 0x24,0x3c,0x18,0x18,0x00,0x66,0x3c,0x18, - 0xc3,0xc3,0x7e,0x7e,0x24,0x3c,0x18,0x18, - 0x00,0x2c,0x3e,0x1a,0xc3,0xc3,0x7e,0x7e, - 0x24,0x3c,0x18,0x18,0x00,0x6c,0x6c,0xc3, - 0xc3,0x7e,0x7e,0x24,0x3c,0x18,0x18,0x00, - 0x18,0x34,0x18,0xc7,0xe0,0xc7,0xe0,0xfe, - 0x00,0x7e,0x00,0x66,0x00,0x67,0xc0,0x37, - 0xc0,0x36,0x00,0x3e,0x00,0x1f,0xe0,0x1f, - 0xe0,0x60,0x30,0x20,0x78,0xfc,0xcc,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xcc,0xfc,0x78,0xfc, - 0xfc,0xc0,0xf8,0xf8,0xc0,0xfc,0xfc,0x00, - 0x18,0x70,0x60,0xfc,0xfc,0xc0,0xf8,0xf8, - 0xc0,0xfc,0xfc,0x00,0x60,0x38,0x18,0xfc, - 0xfc,0xc0,0xf8,0xf8,0xc0,0xfc,0xfc,0x00, - 0xcc,0x78,0x30,0xfc,0xfc,0xc0,0xf8,0xf8, - 0xc0,0xfc,0xfc,0x00,0xd8,0xd8,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x30, - 0xe0,0xc0,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x00,0xc0,0x70,0x30,0x30,0x30, - 0x30,0x30,0x30,0x30,0x30,0x30,0x00,0xcc, - 0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x00,0xd8,0xd8,0x7c,0x7e,0x67, - 0x63,0x63,0xfb,0xfb,0x63,0x67,0x7e,0x7c, - 0xc6,0xce,0xce,0xde,0xf6,0xe6,0xe6,0xc6, - 0x00,0x58,0x7c,0x34,0x7c,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xfe,0x7c,0x00,0x18,0x70,0x60, - 0x7c,0xfe,0xc6,0xc6,0xc6,0xc6,0xfe,0x7c, - 0x00,0x30,0x1c,0x0c,0x7c,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xfe,0x7c,0x00,0xcc,0x78,0x30, - 0x7c,0xfe,0xc6,0xc6,0xc6,0xc6,0xfe,0x7c, - 0x00,0x58,0x7c,0x34,0x7c,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xfe,0x7c,0x00,0x6c,0x6c,0xcc, - 0x78,0x30,0x30,0x78,0xcc,0xde,0x00,0x7f, - 0x00,0x63,0x00,0x73,0x00,0x7b,0x00,0x6b, - 0x00,0x6f,0x00,0x67,0x00,0x63,0x00,0x7f, - 0x00,0x3d,0x80,0x7c,0xfe,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0x00,0x18,0x70,0x60,0x7c, - 0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00, - 0x30,0x1c,0x0c,0x7c,0xfe,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0x00,0xcc,0x78,0x30,0x7c, - 0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00, - 0x6c,0x6c,0x18,0x18,0x18,0x18,0x3c,0x7e, - 0xe7,0xc3,0x00,0x30,0x1c,0x0c,0xc0,0xc0, - 0xfc,0xfe,0xc6,0xc6,0xc6,0xfe,0xfc,0xc0, - 0xc0,0xd8,0xdc,0xcc,0xcc,0xcc,0xd8,0xd8, - 0xcc,0xcc,0xfc,0x78,0x76,0xfc,0xcc,0xfc, - 0x7c,0x8c,0xfc,0x78,0x00,0x18,0x70,0x60, - 0x76,0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78, - 0x00,0x60,0x38,0x18,0x76,0xfc,0xcc,0xfc, - 0x7c,0x8c,0xfc,0x78,0x00,0xcc,0x78,0x30, - 0x76,0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78, - 0x00,0x58,0x7c,0x34,0x76,0xfc,0xcc,0xfc, - 0x7c,0x8c,0xfc,0x78,0x00,0xd8,0xd8,0x76, - 0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78,0x00, - 0x30,0x68,0x30,0x77,0x80,0xff,0xc0,0xcc, - 0x00,0xff,0xc0,0x7f,0xc0,0x8c,0xc0,0xff, - 0xc0,0x7b,0x80,0x60,0x30,0x20,0x78,0xfc, - 0xcc,0xc0,0xc0,0xcc,0xfc,0x78,0x78,0xfc, - 0xc0,0xfc,0xfc,0xcc,0xfc,0x78,0x00,0x18, - 0x70,0x60,0x78,0xfc,0xc0,0xfc,0xfc,0xcc, - 0xfc,0x78,0x00,0x60,0x38,0x18,0x78,0xfc, - 0xc0,0xfc,0xfc,0xcc,0xfc,0x78,0x00,0xcc, - 0x78,0x30,0x78,0xfc,0xc0,0xfc,0xfc,0xcc, - 0xfc,0x78,0x00,0xd8,0xd8,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x00,0x30,0xe0, - 0xc0,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0xc0,0x70,0x30,0x30,0x30,0x30, - 0x30,0x30,0x30,0x30,0x30,0x00,0xcc,0x78, - 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x00,0xd8,0xd8,0x78,0xfc,0xcc,0xcc, - 0xcc,0xcc,0xfc,0x78,0xb0,0x60,0xd0,0xcc, - 0xcc,0xcc,0xcc,0xcc,0xec,0xfc,0xd8,0x00, - 0xb0,0xf8,0x68,0x78,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x78,0x00,0x18,0x70,0x60,0x78, - 0xfc,0xcc,0xcc,0xcc,0xcc,0xfc,0x78,0x00, - 0x60,0x38,0x18,0x78,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x78,0x00,0xcc,0x78,0x30,0x78, - 0xfc,0xcc,0xcc,0xcc,0xcc,0xfc,0x78,0x00, - 0xb0,0xf8,0x68,0x78,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x78,0x00,0xd8,0xd8,0x30,0x30, - 0x00,0xfc,0xfc,0x00,0x30,0x30,0xc0,0x78, - 0xfc,0xcc,0xec,0xdc,0xcc,0xfc,0x78,0x0c, - 0x6c,0xfc,0xdc,0xcc,0xcc,0xcc,0xcc,0xcc, - 0x00,0x18,0x70,0x60,0x6c,0xfc,0xdc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0x00,0x60,0x38,0x18, - 0x6c,0xfc,0xdc,0xcc,0xcc,0xcc,0xcc,0xcc, - 0x00,0xcc,0x78,0x30,0x6c,0xfc,0xdc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0x00,0xd8,0xd8,0xe0, - 0xf0,0x30,0x30,0x38,0x78,0x78,0x48,0xcc, - 0xcc,0xcc,0x00,0x60,0x38,0x18,0xc0,0xc0, - 0xc0,0xd8,0xfc,0xcc,0xcc,0xcc,0xcc,0xfc, - 0xd8,0xc0,0xc0,0xc0,0xe0,0xf0,0x30,0x30, - 0x38,0x78,0x78,0x48,0xcc,0xcc,0xcc,0x00, - 0xd8,0xd8, -}; - -BMF_FontData BMF_font_helvb12 = { - -1, -3, - 11, 12, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 0}, - {2, 11, -1, 0, 4, 1}, - {3, 3, 0, -8, 4, 12}, - {9, 11, 1, 0, 7, 15}, - {6, 13, 0, 2, 7, 37}, - {10, 11, 0, 0, 11, 50}, - {9, 11, 0, 0, 9, 72}, - {2, 4, 0, -7, 3, 94}, - {4, 14, 0, 3, 4, 98}, - {4, 14, 1, 3, 4, 112}, - {5, 5, 0, -6, 6, 126}, - {6, 6, 0, -1, 7, 131}, - {2, 4, 0, 2, 3, 137}, - {6, 2, -1, -3, 9, 141}, - {2, 2, 0, 0, 3, 143}, - {5, 13, 1, 2, 4, 145}, - {6, 11, 0, 0, 7, 158}, - {4, 11, 0, 0, 6, 169}, - {6, 11, 0, 0, 7, 180}, - {6, 11, 0, 0, 7, 191}, - {7, 11, 0, 0, 7, 202}, - {6, 11, 0, 0, 7, 213}, - {6, 11, 0, 0, 7, 224}, - {6, 11, 0, 0, 7, 235}, - {6, 11, 0, 0, 7, 246}, - {6, 11, 0, 0, 7, 257}, - {2, 8, -1, 0, 4, 268}, - {2, 10, -1, 2, 4, 276}, - {6, 6, 0, -1, 7, 286}, - {6, 5, 0, -2, 7, 292}, - {6, 6, 0, -1, 7, 297}, - {6, 11, 0, 0, 7, 303}, - {11, 12, 0, 1, 12, 314}, - {8, 11, 0, 0, 8, 338}, - {6, 11, -1, 0, 8, 349}, - {6, 11, -1, 0, 8, 360}, - {7, 11, -1, 0, 9, 371}, - {6, 11, -1, 0, 8, 382}, - {6, 11, -1, 0, 7, 393}, - {7, 11, -1, 0, 9, 404}, - {7, 11, -1, 0, 9, 415}, - {2, 11, -2, 0, 6, 426}, - {5, 11, 0, 0, 6, 437}, - {7, 11, -1, 0, 8, 448}, - {6, 11, -1, 0, 7, 459}, - {9, 11, -1, 0, 11, 470}, - {7, 11, -1, 0, 9, 492}, - {7, 11, -1, 0, 9, 503}, - {7, 11, -1, 0, 9, 514}, - {7, 12, -1, 1, 9, 525}, - {7, 11, -1, 0, 9, 537}, - {6, 11, -1, 0, 8, 548}, - {6, 11, 0, 0, 6, 559}, - {7, 11, -1, 0, 9, 570}, - {8, 11, 0, 0, 8, 581}, - {10, 11, 0, 0, 10, 592}, - {8, 11, 0, 0, 8, 614}, - {8, 11, 0, 0, 8, 625}, - {7, 11, 0, 0, 7, 636}, - {3, 14, 0, 3, 4, 647}, - {4, 11, 0, 0, 5, 661}, - {3, 14, 0, 3, 4, 672}, - {5, 5, 0, -6, 7, 686}, - {7, 1, 0, 2, 7, 691}, - {2, 4, 0, -7, 3, 692}, - {7, 8, 0, 0, 7, 696}, - {6, 11, 0, 0, 7, 704}, - {6, 8, 0, 0, 7, 715}, - {6, 11, 0, 0, 7, 723}, - {6, 8, 0, 0, 7, 734}, - {4, 11, 0, 0, 5, 742}, - {6, 11, 0, 3, 7, 753}, - {6, 11, 0, 0, 7, 764}, - {2, 11, -1, 0, 5, 775}, - {3, 14, 0, 3, 5, 786}, - {6, 11, 0, 0, 6, 800}, - {2, 11, -1, 0, 5, 811}, - {10, 8, 0, 0, 11, 822}, - {6, 8, 0, 0, 7, 838}, - {6, 8, 0, 0, 7, 846}, - {6, 11, 0, 3, 7, 854}, - {6, 11, 0, 3, 7, 865}, - {4, 8, 0, 0, 4, 876}, - {6, 8, 0, 0, 7, 884}, - {4, 10, 0, 0, 5, 892}, - {6, 8, 0, 0, 7, 902}, - {6, 8, 0, 0, 7, 910}, - {8, 8, 0, 0, 9, 918}, - {6, 8, 0, 0, 7, 926}, - {6, 11, 0, 3, 7, 934}, - {6, 8, 0, 0, 7, 945}, - {4, 14, 0, 3, 4, 953}, - {1, 13, -1, 2, 3, 967}, - {4, 14, 0, 3, 4, 980}, - {6, 3, 0, -3, 7, 994}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {2, 11, 0, 3, 3, 997}, - {6, 10, 0, 1, 7, 1008}, - {7, 11, 0, 0, 7, 1018}, - {6, 6, 0, -3, 7, 1029}, - {8, 11, 1, 0, 7, 1035}, - {1, 13, -1, 2, 3, 1046}, - {6, 14, 0, 3, 7, 1059}, - {5, 2, 0, -9, 5, 1073}, - {11, 11, 0, 0, 12, 1075}, - {4, 7, 0, -4, 5, 1097}, - {7, 5, 0, -2, 8, 1104}, - {6, 4, -1, -3, 9, 1109}, - {3, 2, 0, -3, 4, 1113}, - {11, 11, 0, 0, 12, 1115}, - {4, 2, 0, -9, 4, 1137}, - {4, 4, -1, -7, 6, 1139}, - {6, 9, 0, -1, 7, 1143}, - {4, 6, 0, -5, 4, 1152}, - {4, 6, 0, -5, 4, 1158}, - {4, 3, -1, -9, 4, 1164}, - {6, 11, 0, 3, 7, 1167}, - {7, 14, -1, 3, 10, 1178}, - {2, 2, 0, -5, 3, 1192}, - {3, 3, -1, 3, 5, 1194}, - {2, 6, 0, -5, 4, 1197}, - {5, 7, 0, -4, 6, 1203}, - {7, 5, 0, -2, 8, 1210}, - {10, 11, 0, 0, 11, 1215}, - {10, 11, 0, 0, 11, 1237}, - {10, 11, 0, 0, 11, 1259}, - {6, 11, 0, 3, 7, 1281}, - {8, 12, 0, 0, 8, 1292}, - {8, 12, 0, 0, 8, 1304}, - {8, 12, 0, 0, 8, 1316}, - {8, 12, 0, 0, 8, 1328}, - {8, 11, 0, 0, 8, 1340}, - {8, 12, 0, 0, 8, 1351}, - {11, 11, 0, 0, 12, 1363}, - {6, 14, -1, 3, 8, 1385}, - {6, 12, -1, 0, 8, 1399}, - {6, 12, -1, 0, 8, 1411}, - {6, 12, -1, 0, 8, 1423}, - {6, 11, -1, 0, 8, 1435}, - {4, 12, -1, 0, 6, 1446}, - {4, 12, -1, 0, 6, 1458}, - {6, 12, 0, 0, 6, 1470}, - {5, 11, 0, 0, 6, 1482}, - {8, 11, 0, 0, 9, 1493}, - {7, 12, -1, 0, 9, 1504}, - {7, 12, -1, 0, 9, 1516}, - {7, 12, -1, 0, 9, 1528}, - {7, 12, -1, 0, 9, 1540}, - {7, 12, -1, 0, 9, 1552}, - {7, 11, -1, 0, 9, 1564}, - {6, 6, 0, -1, 7, 1575}, - {9, 11, 0, 0, 9, 1581}, - {7, 12, -1, 0, 9, 1603}, - {7, 12, -1, 0, 9, 1615}, - {7, 12, -1, 0, 9, 1627}, - {7, 11, -1, 0, 9, 1639}, - {8, 12, 0, 0, 8, 1650}, - {7, 11, -1, 0, 9, 1662}, - {6, 11, 0, 0, 7, 1673}, - {7, 12, 0, 0, 7, 1684}, - {7, 12, 0, 0, 7, 1696}, - {7, 12, 0, 0, 7, 1708}, - {7, 12, 0, 0, 7, 1720}, - {7, 11, 0, 0, 7, 1732}, - {7, 12, 0, 0, 7, 1743}, - {10, 8, 0, 0, 11, 1755}, - {6, 11, 0, 3, 7, 1771}, - {6, 12, 0, 0, 7, 1782}, - {6, 12, 0, 0, 7, 1794}, - {6, 12, 0, 0, 7, 1806}, - {6, 11, 0, 0, 7, 1818}, - {4, 12, 0, 0, 5, 1829}, - {4, 12, 0, 0, 5, 1841}, - {6, 12, 1, 0, 5, 1853}, - {5, 11, 1, 0, 5, 1865}, - {6, 11, 0, 0, 7, 1876}, - {6, 12, 0, 0, 7, 1887}, - {6, 12, 0, 0, 7, 1899}, - {6, 12, 0, 0, 7, 1911}, - {6, 12, 0, 0, 7, 1923}, - {6, 12, 0, 0, 7, 1935}, - {6, 11, 0, 0, 7, 1947}, - {6, 8, 0, 0, 7, 1958}, - {6, 10, 0, 1, 7, 1966}, - {6, 12, 0, 0, 7, 1976}, - {6, 12, 0, 0, 7, 1988}, - {6, 12, 0, 0, 7, 2000}, - {6, 11, 0, 0, 7, 2012}, - {6, 15, 0, 3, 7, 2023}, - {6, 14, 0, 3, 7, 2038}, - {6, 14, 0, 3, 7, 2052}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_helvb14.cpp b/intern/bmfont/intern/BMF_font_helvb14.cpp deleted file mode 100644 index c6d3e0ec701..00000000000 --- a/intern/bmfont/intern/BMF_font_helvb14.cpp +++ /dev/null @@ -1,623 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_HELVB14 - -static unsigned char bitmap_data[]= { - 0x00,0xc0,0xc0,0x00,0x00,0x80,0x80,0x80, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x90,0xd8,0xd8, - 0xd8,0x48,0x48,0x48,0xfe,0xfe,0x24,0x24, - 0x7f,0x7f,0x12,0x12,0x12,0x10,0x10,0x38, - 0x7c,0xd6,0xd6,0x16,0x3c,0x78,0xd0,0xd6, - 0xd6,0x7c,0x38,0x10,0x30,0xc0,0x11,0xe0, - 0x19,0x20,0x09,0x20,0x0d,0xe0,0x64,0xc0, - 0xf6,0x00,0x92,0x00,0x93,0x00,0xf1,0x00, - 0x61,0x80,0x71,0x80,0xff,0x00,0xce,0x00, - 0xc6,0x00,0xcf,0x00,0x79,0x00,0x30,0x00, - 0x38,0x00,0x6c,0x00,0x6c,0x00,0x7c,0x00, - 0x38,0x00,0x80,0x40,0xc0,0xc0,0x30,0x20, - 0x60,0x40,0x40,0xc0,0xc0,0xc0,0xc0,0xc0, - 0x40,0x40,0x60,0x20,0x30,0xc0,0x40,0x60, - 0x20,0x20,0x30,0x30,0x30,0x30,0x30,0x20, - 0x20,0x60,0x40,0xc0,0xd8,0x50,0x20,0xf8, - 0x20,0x20,0x30,0x30,0x30,0xfc,0xfc,0x30, - 0x30,0x30,0x80,0x40,0x40,0xc0,0xc0,0xfe, - 0xfe,0xc0,0xc0,0x80,0x80,0xc0,0x40,0x40, - 0x60,0x20,0x20,0x30,0x10,0x10,0x30,0x78, - 0x48,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x48, - 0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x30,0xf0,0x30,0x10,0xfc,0xfc, - 0x60,0x60,0x30,0x18,0x18,0x0c,0xcc,0xcc, - 0x78,0x30,0x30,0x78,0xcc,0xcc,0x0c,0x38, - 0x38,0x0c,0xcc,0xcc,0x78,0x30,0x18,0x18, - 0xfc,0xfc,0x98,0x58,0x58,0x38,0x38,0x38, - 0x18,0x18,0x70,0xf8,0xcc,0x0c,0x0c,0xcc, - 0xfc,0xd8,0x60,0x60,0x7c,0x7c,0x30,0x78, - 0xcc,0xcc,0xcc,0xcc,0xfc,0xd8,0xc0,0x4c, - 0x7c,0x38,0x60,0x60,0x60,0x20,0x30,0x30, - 0x10,0x18,0x08,0x0c,0xfc,0xfc,0x70,0xf8, - 0xcc,0xcc,0xcc,0x78,0x30,0x78,0xcc,0xcc, - 0x7c,0x38,0x70,0xf8,0xc8,0x0c,0x6c,0xfc, - 0xcc,0xcc,0xcc,0xcc,0x78,0x30,0xc0,0xc0, - 0x00,0x00,0x00,0x00,0xc0,0xc0,0x80,0x40, - 0x40,0xc0,0xc0,0x00,0x00,0x00,0x00,0xc0, - 0xc0,0x02,0x0e,0x3c,0xf0,0xf0,0x3c,0x0e, - 0x02,0xfc,0xfc,0x00,0x00,0xfc,0xfc,0x80, - 0xe0,0x78,0x1e,0x1e,0x78,0xe0,0x80,0x30, - 0x30,0x00,0x30,0x30,0x18,0x18,0x0c,0xcc, - 0xcc,0x7c,0x38,0x0f,0x80,0x38,0x60,0x60, - 0x00,0x4d,0xc0,0xd3,0x20,0x93,0x30,0x91, - 0x10,0x91,0x90,0xc9,0x90,0x46,0x90,0x60, - 0x30,0x30,0x20,0x1c,0xc0,0x07,0x80,0xe1, - 0xc0,0x61,0x80,0x7f,0x80,0x7f,0x80,0x33, - 0x00,0x33,0x00,0x33,0x00,0x1e,0x00,0x1e, - 0x00,0x1e,0x00,0x0c,0x00,0x0c,0x00,0xfc, - 0xfe,0xc7,0xc3,0xc7,0xfe,0xfc,0xc6,0xc3, - 0xc7,0xfe,0xfc,0x3c,0x7e,0x63,0xc3,0xc0, - 0xc0,0xc0,0xc0,0xc3,0x63,0x7e,0x3c,0xfc, - 0xfe,0xc6,0xc3,0xc3,0xc3,0xc3,0xc3,0xc3, - 0xc6,0xfe,0xfc,0xfe,0xfe,0xc0,0xc0,0xc0, - 0xfe,0xfe,0xc0,0xc0,0xc0,0xfe,0xfe,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xfc,0xfc,0xc0,0xc0, - 0xc0,0xfe,0xfe,0x3e,0x80,0x7f,0x80,0x63, - 0x80,0xc1,0x80,0xc7,0x80,0xc7,0x80,0xc0, - 0x00,0xc0,0x00,0xc1,0x80,0x63,0x80,0x7f, - 0x00,0x3e,0x00,0xc3,0xc3,0xc3,0xc3,0xc3, - 0xff,0xff,0xc3,0xc3,0xc3,0xc3,0xc3,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0x78,0xfc,0xcc,0xcc,0xcc, - 0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0xc3, - 0x80,0xc7,0x00,0xc6,0x00,0xcc,0x00,0xdc, - 0x00,0xf8,0x00,0xf0,0x00,0xd8,0x00,0xcc, - 0x00,0xce,0x00,0xc7,0x00,0xc3,0x00,0xfe, - 0xfe,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xcc,0xc0,0xcc,0xc0,0xcc, - 0xc0,0xde,0xc0,0xde,0xc0,0xd2,0xc0,0xd2, - 0xc0,0xf3,0xc0,0xf3,0xc0,0xe1,0xc0,0xe1, - 0xc0,0xe1,0xc0,0xc3,0xc7,0xc7,0xcf,0xcf, - 0xdb,0xdb,0xf3,0xf3,0xe3,0xe3,0xc3,0x3e, - 0x00,0x7f,0x00,0x63,0x00,0xc1,0x80,0xc1, - 0x80,0xc1,0x80,0xc1,0x80,0xc1,0x80,0xc1, - 0x80,0x63,0x00,0x7f,0x00,0x3e,0x00,0xc0, - 0xc0,0xc0,0xc0,0xf8,0xfc,0xce,0xc6,0xc6, - 0xce,0xfc,0xf8,0x01,0x80,0x3d,0x80,0x7f, - 0x00,0x67,0x00,0xcd,0x80,0xcd,0x80,0xc1, - 0x80,0xc1,0x80,0xc1,0x80,0xc1,0x80,0x63, - 0x00,0x7f,0x00,0x3e,0x00,0xc3,0xc3,0xc3, - 0xc3,0xc7,0xfe,0xfe,0xc7,0xc3,0xc7,0xfe, - 0xfc,0x3c,0x7e,0xe7,0xc3,0x07,0x1e,0x78, - 0xe0,0xc3,0xe7,0x7e,0x3c,0x18,0x18,0x18, - 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xff, - 0xff,0x3c,0x7e,0xe7,0xc3,0xc3,0xc3,0xc3, - 0xc3,0xc3,0xc3,0xc3,0xc3,0x18,0x18,0x18, - 0x3c,0x3c,0x24,0x66,0x66,0x66,0xc3,0xc3, - 0xc3,0x30,0xc0,0x30,0xc0,0x30,0xc0,0x39, - 0xc0,0x79,0xe0,0x69,0x60,0x6f,0x60,0x6f, - 0x60,0xc6,0x30,0xc6,0x30,0xc6,0x30,0xc6, - 0x30,0xe3,0x80,0x63,0x00,0x63,0x00,0x36, - 0x00,0x36,0x00,0x1c,0x00,0x1c,0x00,0x36, - 0x00,0x36,0x00,0x63,0x00,0x63,0x00,0xe3, - 0x80,0x0c,0x00,0x0c,0x00,0x0c,0x00,0x0c, - 0x00,0x0c,0x00,0x1e,0x00,0x1e,0x00,0x33, - 0x00,0x33,0x00,0x61,0x80,0x61,0x80,0xe1, - 0xc0,0xff,0xff,0x60,0x70,0x30,0x18,0x18, - 0x0c,0x0e,0x06,0xff,0xff,0xe0,0xe0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xe0,0xe0,0x10,0x10,0x30,0x20, - 0x20,0x60,0x40,0x40,0xc0,0x80,0x80,0xe0, - 0xe0,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0xe0,0xe0,0xcc,0xcc, - 0x48,0x78,0x78,0x30,0x30,0xfe,0xc0,0xc0, - 0x80,0x40,0x6c,0xfc,0xcc,0xcc,0x7c,0x1c, - 0xcc,0xfc,0x78,0xd8,0xfc,0xee,0xc6,0xc6, - 0xc6,0xee,0xfc,0xd8,0xc0,0xc0,0xc0,0x38, - 0x7c,0xec,0xc0,0xc0,0xc0,0xec,0x7c,0x38, - 0x36,0x7e,0xee,0xc6,0xc6,0xc6,0xee,0x7e, - 0x36,0x06,0x06,0x06,0x38,0x7c,0xcc,0xc0, - 0xfc,0xcc,0xcc,0x78,0x30,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0xf0,0xf0,0x60,0x70, - 0x30,0x78,0xfc,0xc6,0x36,0x7e,0xee,0xc6, - 0xc6,0xc6,0xee,0x7e,0x36,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xe6,0xfe,0xdc,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0x00,0xc0,0xc0,0xc0,0xe0,0x60, - 0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0x60,0x60,0xce,0xcc,0xd8,0xd8, - 0xf0,0xf0,0xd8,0xd8,0xcc,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xcc,0xc0,0xcc,0xc0, - 0xcc,0xc0,0xcc,0xc0,0xcc,0xc0,0xcc,0xc0, - 0xcc,0xc0,0xff,0xc0,0xdb,0x80,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xc6,0xe6,0xfe,0xdc,0x38, - 0x7c,0xee,0xc6,0xc6,0xc6,0xee,0x7c,0x38, - 0xc0,0xc0,0xc0,0xd8,0xfc,0xee,0xc6,0xc6, - 0xc6,0xee,0xfc,0xd8,0x06,0x06,0x06,0x36, - 0x7e,0xee,0xc6,0xc6,0xc6,0xee,0x7e,0x36, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xe0,0xf8, - 0xd0,0x78,0xfc,0xcc,0x1c,0x78,0xe0,0xcc, - 0xfc,0x78,0x30,0x70,0x60,0x60,0x60,0x60, - 0x60,0xf0,0xf0,0x60,0x60,0x76,0xfe,0xce, - 0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x30,0x30, - 0x30,0x78,0x78,0x48,0xcc,0xcc,0xcc,0x33, - 0x00,0x33,0x00,0x33,0x00,0x73,0x80,0x7f, - 0x80,0x4c,0x80,0x4c,0x80,0xcc,0xc0,0xcc, - 0xc0,0xc6,0xee,0x6c,0x38,0x38,0x38,0x6c, - 0xee,0xc6,0x60,0x70,0x10,0x18,0x38,0x38, - 0x2c,0x6c,0x6c,0xc6,0xc6,0xc6,0xfc,0xfc, - 0x60,0x60,0x30,0x18,0x18,0xfc,0xfc,0x30, - 0x70,0x60,0x60,0x60,0x60,0x60,0xc0,0x60, - 0x60,0x60,0x60,0x60,0x70,0x30,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xc0,0xe0,0x60, - 0x60,0x60,0x60,0x60,0x30,0x60,0x60,0x60, - 0x60,0x60,0xe0,0xc0,0x98,0xfc,0x64,0xc0, - 0xc0,0xc0,0xc0,0xc0,0x80,0x80,0x80,0x00, - 0x00,0xc0,0xc0,0x20,0x20,0x38,0x7c,0xec, - 0xe0,0xd0,0xd0,0xdc,0x7c,0x38,0x08,0x08, - 0xcc,0xfe,0x70,0x30,0x30,0xf8,0x60,0xc0, - 0xcc,0xcc,0x7c,0x38,0xcc,0x78,0xcc,0xcc, - 0xcc,0xcc,0x78,0xcc,0x18,0x18,0x18,0x7e, - 0x18,0x7e,0x18,0x3c,0x24,0x66,0x42,0xc3, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00, - 0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x38, - 0x7c,0x6c,0x0c,0x18,0x7c,0xe6,0xc6,0xce, - 0x7c,0x30,0x60,0x6c,0x7c,0x38,0xd8,0xd8, - 0x1e,0x00,0x33,0x00,0x40,0x80,0xde,0xc0, - 0xb3,0x40,0xa0,0x40,0xa0,0x40,0xb3,0x40, - 0xde,0xc0,0x40,0x80,0x33,0x00,0x1e,0x00, - 0xf0,0x00,0xd0,0xb0,0x70,0xb0,0x60,0x24, - 0x6c,0xd8,0xd8,0x6c,0x24,0x06,0x06,0x06, - 0xfe,0xfe,0xe0,0xe0,0x1e,0x00,0x33,0x00, - 0x40,0x80,0xd2,0xc0,0x96,0x40,0x9c,0x40, - 0x92,0x40,0x92,0x40,0xdc,0xc0,0x40,0x80, - 0x33,0x00,0x1e,0x00,0xf0,0x60,0x90,0x90, - 0x90,0x60,0xfc,0xfc,0x00,0x30,0x30,0x30, - 0xfc,0xfc,0x30,0x30,0x30,0xf0,0x80,0x40, - 0x20,0x90,0xb0,0x60,0x60,0xb0,0x10,0x60, - 0x30,0x90,0x60,0xc0,0x60,0xc0,0xc0,0xc0, - 0xf6,0xfe,0xce,0xc6,0xc6,0xc6,0xc6,0xc6, - 0xc6,0x14,0x14,0x14,0x14,0x14,0x14,0x14, - 0x14,0x74,0xf4,0xf4,0xf4,0xf4,0x74,0x3e, - 0xc0,0xc0,0xc0,0x60,0x40,0x20,0x20,0x20, - 0x20,0x20,0xe0,0x20,0xf0,0x00,0x60,0x90, - 0x90,0x90,0x60,0x90,0xd8,0x6c,0x6c,0xd8, - 0x90,0x20,0x40,0x10,0x40,0x13,0xe0,0x0a, - 0x40,0x09,0x40,0x24,0xc0,0x24,0x40,0x22, - 0x00,0x22,0x00,0x21,0x00,0xe1,0x00,0x20, - 0x80,0x21,0xe0,0x11,0x00,0x10,0x80,0x08, - 0x40,0x09,0x20,0x25,0x60,0x24,0xc0,0x22, - 0x00,0x22,0x00,0x21,0x00,0xe1,0x00,0x20, - 0x80,0x20,0x40,0x10,0x40,0x13,0xe0,0x0a, - 0x40,0x09,0x40,0x64,0xc0,0xb4,0x40,0x12, - 0x00,0x62,0x00,0x31,0x00,0x91,0x00,0x60, - 0x80,0x70,0xf8,0xcc,0xcc,0xc0,0x60,0x60, - 0x30,0x30,0x00,0x30,0x30,0xe1,0xc0,0x61, - 0x80,0x7f,0x80,0x3f,0x00,0x33,0x00,0x33, - 0x00,0x12,0x00,0x1e,0x00,0x1e,0x00,0x0c, - 0x00,0x0c,0x00,0x00,0x00,0x0c,0x00,0x18, - 0x00,0xe1,0xc0,0x61,0x80,0x7f,0x80,0x3f, - 0x00,0x33,0x00,0x33,0x00,0x12,0x00,0x1e, - 0x00,0x1e,0x00,0x0c,0x00,0x0c,0x00,0x00, - 0x00,0x0c,0x00,0x06,0x00,0xe1,0xc0,0x61, - 0x80,0x7f,0x80,0x3f,0x00,0x33,0x00,0x33, - 0x00,0x12,0x00,0x1e,0x00,0x1e,0x00,0x0c, - 0x00,0x0c,0x00,0x00,0x00,0x36,0x00,0x1c, - 0x00,0xe1,0xc0,0x61,0x80,0x7f,0x80,0x3f, - 0x00,0x33,0x00,0x33,0x00,0x12,0x00,0x1e, - 0x00,0x1e,0x00,0x0c,0x00,0x0c,0x00,0x00, - 0x00,0x16,0x00,0x0d,0x00,0xe1,0xc0,0x61, - 0x80,0x7f,0x80,0x3f,0x00,0x33,0x00,0x33, - 0x00,0x12,0x00,0x1e,0x00,0x1e,0x00,0x0c, - 0x00,0x0c,0x00,0x00,0x00,0x36,0x00,0x36, - 0x00,0xe1,0xc0,0x61,0x80,0x7f,0x80,0x3f, - 0x00,0x33,0x00,0x33,0x00,0x12,0x00,0x1e, - 0x00,0x1e,0x00,0x0c,0x00,0x0c,0x00,0x0c, - 0x00,0x0a,0x00,0x06,0x00,0xe3,0xf8,0x63, - 0xf8,0x7f,0x00,0x7f,0x00,0x33,0x00,0x33, - 0xf8,0x3b,0xf8,0x1b,0x00,0x1b,0x00,0x1f, - 0x00,0x0f,0xf8,0x0f,0xf8,0x18,0x0c,0x08, - 0x3c,0x7e,0x63,0xc3,0xc0,0xc0,0xc0,0xc0, - 0xc3,0x63,0x7e,0x3c,0xfe,0xfe,0xc0,0xc0, - 0xc0,0xfe,0xfe,0xc0,0xc0,0xfe,0xfe,0x00, - 0x18,0x30,0xfe,0xfe,0xc0,0xc0,0xc0,0xfe, - 0xfe,0xc0,0xc0,0xfe,0xfe,0x00,0x18,0x0c, - 0xfe,0xfe,0xc0,0xc0,0xc0,0xfe,0xfe,0xc0, - 0xc0,0xfe,0xfe,0x00,0x6c,0x38,0xfe,0xfe, - 0xc0,0xc0,0xc0,0xfe,0xfe,0xc0,0xc0,0xfe, - 0xfe,0x00,0x6c,0x6c,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00, - 0x60,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0xc0,0x60, - 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x30,0x00,0xd8,0x70,0x30,0x30, - 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x00,0xd8,0xd8,0x7e,0x00,0x7f,0x00, - 0x63,0x00,0x61,0x80,0x61,0x80,0xf9,0x80, - 0xf9,0x80,0x61,0x80,0x61,0x80,0x63,0x00, - 0x7f,0x00,0x7e,0x00,0xc3,0xc7,0xc7,0xcf, - 0xcb,0xdb,0xd3,0xf3,0xe3,0xe3,0xc3,0x00, - 0x2c,0x1a,0x3e,0x00,0x7f,0x00,0x63,0x00, - 0xc1,0x80,0xc1,0x80,0xc1,0x80,0xc1,0x80, - 0xc1,0x80,0x63,0x00,0x7f,0x00,0x3e,0x00, - 0x00,0x00,0x0c,0x00,0x18,0x00,0x3e,0x00, - 0x7f,0x00,0x63,0x00,0xc1,0x80,0xc1,0x80, - 0xc1,0x80,0xc1,0x80,0xc1,0x80,0x63,0x00, - 0x7f,0x00,0x3e,0x00,0x00,0x00,0x18,0x00, - 0x0c,0x00,0x3e,0x00,0x7f,0x00,0x63,0x00, - 0xc1,0x80,0xc1,0x80,0xc1,0x80,0xc1,0x80, - 0xc1,0x80,0x63,0x00,0x7f,0x00,0x3e,0x00, - 0x00,0x00,0x36,0x00,0x1c,0x00,0x3e,0x00, - 0x7f,0x00,0x63,0x00,0xc1,0x80,0xc1,0x80, - 0xc1,0x80,0xc1,0x80,0xc1,0x80,0x63,0x00, - 0x7f,0x00,0x3e,0x00,0x00,0x00,0x2c,0x00, - 0x1a,0x00,0x3e,0x00,0x7f,0x00,0x63,0x00, - 0xc1,0x80,0xc1,0x80,0xc1,0x80,0xc1,0x80, - 0xc1,0x80,0x63,0x00,0x7f,0x00,0x3e,0x00, - 0x00,0x00,0x36,0x00,0x36,0x00,0x84,0xcc, - 0x78,0x30,0x30,0x78,0xcc,0x84,0xbe,0x00, - 0xff,0x00,0x63,0x00,0xf1,0x80,0xd1,0x80, - 0xc9,0x80,0xc9,0x80,0xc5,0x80,0xc7,0x80, - 0x63,0x00,0x7f,0x80,0x3e,0x80,0x3c,0x7e, - 0xe7,0xc3,0xc3,0xc3,0xc3,0xc3,0xc3,0xc3, - 0xc3,0x00,0x18,0x30,0x3c,0x7e,0xe7,0xc3, - 0xc3,0xc3,0xc3,0xc3,0xc3,0xc3,0xc3,0x00, - 0x18,0x0c,0x3c,0x7e,0xe7,0xc3,0xc3,0xc3, - 0xc3,0xc3,0xc3,0xc3,0xc3,0x00,0x6c,0x38, - 0x3c,0x7e,0xe7,0xc3,0xc3,0xc3,0xc3,0xc3, - 0xc3,0xc3,0xc3,0x00,0x6c,0x6c,0x0c,0x00, - 0x0c,0x00,0x0c,0x00,0x0c,0x00,0x0c,0x00, - 0x1e,0x00,0x1e,0x00,0x33,0x00,0x33,0x00, - 0x61,0x80,0xe1,0xc0,0x00,0x00,0x0c,0x00, - 0x06,0x00,0xc0,0xc0,0xf8,0xfc,0xce,0xc6, - 0xc6,0xce,0xfc,0xf8,0xc0,0xc0,0xd8,0xdc, - 0xc6,0xc6,0xc6,0xdc,0xd8,0xcc,0xcc,0xcc, - 0x7c,0x38,0x6c,0xfc,0xcc,0xcc,0x7c,0x1c, - 0xcc,0xfc,0x78,0x00,0x30,0x60,0x6c,0xfc, - 0xcc,0xcc,0x7c,0x1c,0xcc,0xfc,0x78,0x00, - 0x30,0x18,0x6c,0xfc,0xcc,0xcc,0x7c,0x1c, - 0xcc,0xfc,0x78,0x00,0xd8,0x70,0x6c,0xfc, - 0xcc,0xcc,0x7c,0x1c,0xcc,0xfc,0x78,0x00, - 0x58,0x34,0x6c,0xfc,0xcc,0xcc,0x7c,0x1c, - 0xcc,0xfc,0x78,0x00,0xd8,0xd8,0x6c,0xfc, - 0xcc,0xcc,0x7c,0x1c,0xcc,0xfc,0x78,0x00, - 0x30,0x28,0x18,0x73,0x80,0xff,0xc0,0xcc, - 0xc0,0xcc,0x00,0x7f,0xc0,0x1c,0xc0,0xcc, - 0xc0,0xff,0xc0,0x73,0x80,0x30,0x18,0x10, - 0x38,0x7c,0xec,0xc0,0xc0,0xc0,0xec,0x7c, - 0x38,0x38,0x7c,0xcc,0xc0,0xfc,0xcc,0xcc, - 0x78,0x30,0x00,0x30,0x60,0x38,0x7c,0xcc, - 0xc0,0xfc,0xcc,0xcc,0x78,0x30,0x00,0x30, - 0x18,0x38,0x7c,0xcc,0xc0,0xfc,0xcc,0xcc, - 0x78,0x30,0x00,0x6c,0x38,0x38,0x7c,0xcc, - 0xc0,0xfc,0xcc,0xcc,0x78,0x30,0x00,0xd8, - 0xd8,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x00,0x60,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0xc0, - 0x60,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x00,0xd8,0x70,0x30,0x30,0x30, - 0x30,0x30,0x30,0x30,0x30,0x30,0x00,0xd8, - 0xd8,0x38,0x7c,0xee,0xc6,0xc6,0xc6,0xee, - 0x7c,0x3c,0xf8,0x38,0x6c,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xe6,0xfe,0xdc,0x00,0x58, - 0x34,0x38,0x7c,0xee,0xc6,0xc6,0xc6,0xee, - 0x7c,0x38,0x00,0x18,0x30,0x38,0x7c,0xee, - 0xc6,0xc6,0xc6,0xee,0x7c,0x38,0x00,0x30, - 0x18,0x38,0x7c,0xee,0xc6,0xc6,0xc6,0xee, - 0x7c,0x38,0x00,0x6c,0x38,0x38,0x7c,0xee, - 0xc6,0xc6,0xc6,0xee,0x7c,0x38,0x00,0x58, - 0x34,0x38,0x7c,0xee,0xc6,0xc6,0xc6,0xee, - 0x7c,0x38,0x00,0x6c,0x6c,0x30,0x30,0x00, - 0xfc,0xfc,0x00,0x30,0x30,0xb8,0x7c,0xee, - 0xe6,0xd6,0xce,0xee,0x7c,0x3a,0x76,0xfe, - 0xce,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00, - 0x18,0x30,0x76,0xfe,0xce,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0x00,0x30,0x18,0x76,0xfe, - 0xce,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00, - 0x6c,0x38,0x76,0xfe,0xce,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0x00,0x6c,0x6c,0x60,0x70, - 0x10,0x18,0x38,0x38,0x2c,0x6c,0x6c,0xc6, - 0xc6,0xc6,0x00,0x30,0x18,0xc0,0xc0,0xc0, - 0xd8,0xfc,0xee,0xc6,0xc6,0xc6,0xee,0xfc, - 0xd8,0xc0,0xc0,0xc0,0x60,0x70,0x10,0x18, - 0x38,0x38,0x2c,0x6c,0x6c,0xc6,0xc6,0xc6, - 0x00,0x6c,0x6c, -}; - -BMF_FontData BMF_font_helvb14 = { - -2, -3, - 12, 14, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 0}, - {2, 12, -1, 0, 4, 1}, - {5, 4, 0, -8, 6, 13}, - {8, 12, 1, 0, 7, 17}, - {7, 15, 0, 2, 7, 29}, - {11, 11, 0, 0, 12, 44}, - {9, 12, 0, 0, 9, 66}, - {2, 4, -1, -8, 4, 90}, - {4, 15, 0, 3, 4, 94}, - {4, 15, 1, 3, 4, 109}, - {5, 6, 0, -6, 5, 124}, - {6, 8, -1, 0, 8, 130}, - {2, 5, 0, 3, 3, 138}, - {7, 2, 0, -3, 8, 143}, - {2, 2, 0, 0, 3, 145}, - {4, 11, 0, 0, 4, 147}, - {6, 12, 0, 0, 7, 158}, - {4, 12, 0, 0, 7, 170}, - {6, 12, 0, 0, 7, 182}, - {6, 12, 0, 0, 7, 194}, - {6, 12, 0, 0, 7, 206}, - {6, 12, 0, 0, 7, 218}, - {6, 12, 0, 0, 7, 230}, - {6, 12, 0, 0, 7, 242}, - {6, 12, 0, 0, 7, 254}, - {6, 12, 0, 0, 7, 266}, - {2, 8, -1, 0, 4, 278}, - {2, 11, -1, 3, 4, 286}, - {7, 8, 0, 0, 8, 297}, - {6, 6, -1, -1, 8, 305}, - {7, 8, 0, 0, 8, 311}, - {6, 12, -1, 0, 8, 319}, - {12, 14, 0, 2, 13, 331}, - {10, 12, 1, 0, 9, 359}, - {8, 12, 0, 0, 9, 383}, - {8, 12, 0, 0, 9, 395}, - {8, 12, 0, 0, 9, 407}, - {7, 12, 0, 0, 8, 419}, - {7, 12, -1, 0, 8, 431}, - {9, 12, 0, 0, 10, 443}, - {8, 12, 0, 0, 9, 467}, - {2, 12, -1, 0, 5, 479}, - {6, 12, 0, 0, 7, 491}, - {9, 12, -1, 0, 10, 503}, - {7, 12, -1, 0, 8, 527}, - {10, 12, 0, 0, 11, 539}, - {8, 12, 0, 0, 9, 563}, - {9, 12, 0, 0, 10, 575}, - {7, 12, -1, 0, 9, 599}, - {9, 13, 0, 1, 10, 611}, - {8, 12, 0, 0, 9, 637}, - {8, 12, 0, 0, 9, 649}, - {8, 12, 0, 0, 9, 661}, - {8, 12, 0, 0, 9, 673}, - {8, 12, 0, 0, 9, 685}, - {12, 12, 0, 0, 13, 697}, - {9, 12, 0, 0, 10, 721}, - {10, 12, 1, 0, 9, 745}, - {8, 12, 0, 0, 9, 769}, - {3, 15, 0, 3, 4, 781}, - {4, 11, 0, 0, 4, 796}, - {3, 15, 0, 3, 4, 807}, - {6, 7, -1, -4, 8, 822}, - {7, 1, 0, 3, 7, 829}, - {2, 4, -1, -8, 4, 830}, - {6, 9, 0, 0, 7, 834}, - {7, 12, 0, 0, 8, 843}, - {6, 9, 0, 0, 7, 855}, - {7, 12, 0, 0, 8, 864}, - {6, 9, 0, 0, 7, 876}, - {4, 12, 0, 0, 5, 885}, - {7, 12, 0, 3, 8, 897}, - {7, 12, 0, 0, 8, 909}, - {2, 12, 0, 0, 3, 921}, - {3, 15, 1, 3, 3, 933}, - {7, 12, 0, 0, 7, 948}, - {2, 12, 0, 0, 3, 960}, - {10, 9, 0, 0, 11, 972}, - {7, 9, 0, 0, 8, 990}, - {7, 9, 0, 0, 8, 999}, - {7, 12, 0, 3, 8, 1008}, - {7, 12, 0, 3, 8, 1020}, - {5, 9, 0, 0, 5, 1032}, - {6, 9, 0, 0, 7, 1041}, - {4, 11, 0, 0, 5, 1050}, - {7, 9, 0, 0, 8, 1061}, - {6, 9, 0, 0, 7, 1070}, - {10, 9, 0, 0, 11, 1079}, - {7, 9, 0, 0, 8, 1097}, - {7, 12, 0, 3, 8, 1106}, - {6, 9, 0, 0, 7, 1118}, - {4, 15, 0, 3, 5, 1127}, - {1, 15, -1, 3, 4, 1142}, - {4, 15, 0, 3, 5, 1157}, - {6, 3, -1, -3, 8, 1172}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {2, 12, -1, 3, 4, 1175}, - {6, 13, 0, 2, 7, 1187}, - {7, 12, 0, 0, 7, 1200}, - {6, 8, 0, -2, 7, 1212}, - {8, 12, 1, 0, 7, 1220}, - {1, 15, -1, 3, 4, 1232}, - {7, 15, 0, 3, 7, 1247}, - {5, 2, 1, -10, 4, 1262}, - {10, 12, 0, 0, 10, 1264}, - {4, 7, 0, -5, 5, 1288}, - {6, 6, 0, -1, 7, 1295}, - {7, 5, 0, -2, 8, 1301}, - {3, 2, 0, -3, 4, 1306}, - {10, 12, 0, 0, 10, 1308}, - {4, 1, 0, -11, 4, 1332}, - {4, 5, 0, -7, 5, 1333}, - {6, 11, -1, 0, 8, 1338}, - {4, 7, 0, -5, 4, 1349}, - {4, 7, 0, -5, 4, 1356}, - {3, 2, -1, -10, 4, 1363}, - {7, 12, 0, 3, 8, 1365}, - {7, 15, 0, 3, 7, 1377}, - {2, 2, 0, -5, 3, 1392}, - {3, 3, 0, 3, 4, 1394}, - {3, 7, 0, -5, 4, 1397}, - {4, 7, 0, -5, 5, 1404}, - {6, 6, 0, -1, 7, 1411}, - {11, 12, 1, 0, 11, 1417}, - {11, 12, 1, 0, 11, 1441}, - {11, 12, 0, 0, 11, 1465}, - {6, 12, -1, 3, 8, 1489}, - {10, 14, 1, 0, 9, 1501}, - {10, 14, 1, 0, 9, 1529}, - {10, 14, 1, 0, 9, 1557}, - {10, 14, 1, 0, 9, 1585}, - {10, 14, 1, 0, 9, 1613}, - {10, 14, 1, 0, 9, 1641}, - {13, 12, 1, 0, 13, 1669}, - {8, 15, 0, 3, 9, 1693}, - {7, 14, 0, 0, 8, 1708}, - {7, 14, 0, 0, 8, 1722}, - {7, 14, 0, 0, 8, 1736}, - {7, 14, 0, 0, 8, 1750}, - {3, 14, 0, 0, 5, 1764}, - {3, 14, -1, 0, 5, 1778}, - {5, 14, 1, 0, 5, 1792}, - {5, 14, 1, 0, 5, 1806}, - {9, 12, 1, 0, 9, 1820}, - {8, 14, 0, 0, 9, 1844}, - {9, 14, 0, 0, 10, 1858}, - {9, 14, 0, 0, 10, 1886}, - {9, 14, 0, 0, 10, 1914}, - {9, 14, 0, 0, 10, 1942}, - {9, 14, 0, 0, 10, 1970}, - {6, 8, -1, 0, 8, 1998}, - {9, 12, 0, 0, 10, 2006}, - {8, 14, 0, 0, 9, 2030}, - {8, 14, 0, 0, 9, 2044}, - {8, 14, 0, 0, 9, 2058}, - {8, 14, 0, 0, 9, 2072}, - {10, 14, 1, 0, 9, 2086}, - {7, 12, -1, 0, 9, 2114}, - {7, 12, 0, 0, 8, 2126}, - {6, 12, 0, 0, 7, 2138}, - {6, 12, 0, 0, 7, 2150}, - {6, 12, 0, 0, 7, 2162}, - {6, 12, 0, 0, 7, 2174}, - {6, 12, 0, 0, 7, 2186}, - {6, 13, 0, 0, 7, 2198}, - {10, 9, 0, 0, 11, 2211}, - {6, 12, 0, 3, 7, 2229}, - {6, 12, 0, 0, 7, 2241}, - {6, 12, 0, 0, 7, 2253}, - {6, 12, 0, 0, 7, 2265}, - {6, 12, 0, 0, 7, 2277}, - {3, 12, 1, 0, 3, 2289}, - {3, 12, 0, 0, 3, 2301}, - {5, 12, 2, 0, 3, 2313}, - {5, 12, 2, 0, 3, 2325}, - {7, 12, 0, 0, 8, 2337}, - {7, 12, 0, 0, 8, 2349}, - {7, 12, 0, 0, 8, 2361}, - {7, 12, 0, 0, 8, 2373}, - {7, 12, 0, 0, 8, 2385}, - {7, 12, 0, 0, 8, 2397}, - {7, 12, 0, 0, 8, 2409}, - {6, 8, -1, 0, 8, 2421}, - {7, 9, 0, 0, 8, 2429}, - {7, 12, 0, 0, 8, 2438}, - {7, 12, 0, 0, 8, 2450}, - {7, 12, 0, 0, 8, 2462}, - {7, 12, 0, 0, 8, 2474}, - {7, 15, 0, 3, 8, 2486}, - {7, 15, 0, 3, 8, 2501}, - {7, 15, 0, 3, 8, 2516}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_helvb8.cpp b/intern/bmfont/intern/BMF_font_helvb8.cpp deleted file mode 100644 index fb56049c8fe..00000000000 --- a/intern/bmfont/intern/BMF_font_helvb8.cpp +++ /dev/null @@ -1,455 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_HELVB8 - -static unsigned char bitmap_data[]= { - 0x00,0x80,0x00,0x80,0x80,0x80,0x80,0xa0, - 0xa0,0xa0,0x50,0xf8,0x50,0xf8,0x50,0x40, - 0xe0,0x10,0x60,0x80,0x70,0x20,0x5c,0x54, - 0x2c,0xd0,0xa8,0xe8,0x58,0xb0,0xa8,0x48, - 0xa0,0x40,0x80,0x80,0x80,0x40,0x80,0x80, - 0x80,0x80,0x80,0x40,0x80,0x40,0x40,0x40, - 0x40,0x40,0x80,0x40,0xe0,0x40,0x20,0x20, - 0xf8,0x20,0x20,0x80,0x40,0x40,0xf0,0x80, - 0x80,0x80,0x80,0x80,0x40,0x40,0x40,0x60, - 0x90,0x90,0x90,0x90,0x60,0x40,0x40,0x40, - 0x40,0xc0,0x40,0xf0,0x40,0x20,0x10,0x90, - 0x60,0xc0,0x20,0x20,0xc0,0x20,0xc0,0x20, - 0x20,0xf0,0x60,0x20,0x20,0xc0,0x20,0x20, - 0xc0,0x80,0xe0,0x60,0x90,0x90,0xe0,0x80, - 0x70,0x40,0x40,0x40,0x20,0x10,0xf0,0x60, - 0x90,0x90,0x60,0x90,0x60,0x60,0x10,0x70, - 0x90,0x90,0x60,0x80,0x00,0x00,0x80,0x80, - 0x40,0x40,0x00,0x00,0x40,0x20,0x40,0x80, - 0x40,0x20,0xe0,0x00,0xe0,0x80,0x40,0x20, - 0x40,0x80,0x40,0x00,0x40,0x20,0xc0,0x78, - 0x80,0x9e,0xa5,0x99,0x41,0x3e,0x88,0x88, - 0x70,0x50,0x20,0x20,0xe0,0x90,0x90,0xe0, - 0x90,0xe0,0x70,0x88,0x80,0x80,0x88,0x70, - 0xf0,0x88,0x88,0x88,0x88,0xf0,0xf0,0x80, - 0x80,0xe0,0x80,0xf0,0x80,0x80,0x80,0xe0, - 0x80,0xf0,0x70,0x88,0x88,0x98,0x80,0x70, - 0x88,0x88,0x88,0xf8,0x88,0x88,0x80,0x80, - 0x80,0x80,0x80,0x80,0x40,0xa0,0x20,0x20, - 0x20,0x20,0x90,0x90,0xe0,0xc0,0xa0,0x90, - 0xe0,0x80,0x80,0x80,0x80,0x80,0xa8,0xa8, - 0xa8,0xa8,0xd8,0x88,0x88,0x98,0xa8,0xa8, - 0xc8,0x88,0x70,0x88,0x88,0x88,0x88,0x70, - 0x80,0x80,0xe0,0x90,0x90,0xe0,0x10,0x20, - 0x70,0x88,0x88,0x88,0x88,0x70,0x90,0x90, - 0xe0,0x90,0x90,0xe0,0xe0,0x10,0x10,0xe0, - 0x80,0x70,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x70,0x88,0x88,0x88,0x88,0x88,0x40,0xa0, - 0x90,0x90,0x90,0x90,0x48,0x48,0x6c,0x92, - 0x92,0x92,0x90,0x90,0x60,0x60,0x90,0x90, - 0x20,0x20,0x30,0x48,0x48,0xc8,0xf0,0x80, - 0x40,0x20,0x10,0xf0,0xc0,0x80,0x80,0x80, - 0x80,0x80,0xc0,0x40,0x40,0x40,0x40,0x80, - 0x80,0x80,0xc0,0x40,0x40,0x40,0x40,0x40, - 0xc0,0x88,0x50,0x20,0xf8,0x80,0x80,0x80, - 0xd0,0xa0,0xe0,0x20,0xc0,0xe0,0x90,0x90, - 0x90,0xe0,0x80,0x80,0x60,0x80,0x80,0x80, - 0x60,0x70,0x90,0x90,0x90,0x70,0x10,0x10, - 0x60,0x80,0xe0,0xa0,0x40,0x40,0x40,0x40, - 0x40,0xe0,0x40,0x20,0x60,0x10,0x70,0x90, - 0x90,0x70,0x90,0x90,0x90,0x90,0xe0,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x80,0x40,0x40,0x40,0x40,0x40,0x40,0x00, - 0x40,0xa0,0xa0,0xc0,0xc0,0xa0,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xa8, - 0xa8,0xa8,0xa8,0xf0,0x90,0x90,0x90,0x90, - 0xe0,0x60,0x90,0x90,0x90,0x60,0x80,0xe0, - 0x90,0x90,0x90,0xe0,0x10,0x70,0x90,0x90, - 0x90,0x70,0x80,0x80,0x80,0xc0,0xa0,0xc0, - 0x20,0x60,0x80,0x60,0x40,0x40,0x40,0x40, - 0xe0,0x40,0x40,0x60,0xa0,0xa0,0xa0,0xa0, - 0x40,0xa0,0x90,0x90,0x90,0x50,0x50,0xa8, - 0xa8,0xa8,0x90,0x90,0x60,0x90,0x90,0x80, - 0x40,0x60,0x90,0x90,0x90,0xe0,0x80,0x40, - 0x20,0xe0,0x20,0x40,0x40,0xc0,0x40,0x40, - 0x20,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x40,0x40,0x60,0x40,0x40,0x80,0xb0, - 0x48,0x00,0x80,0x80,0x80,0x80,0x80,0x00, - 0x80,0x40,0x40,0xa0,0x80,0xa0,0x40,0x40, - 0xf0,0x40,0x40,0xe0,0x40,0x30,0x88,0x70, - 0x50,0x70,0x88,0x20,0x20,0xf8,0x50,0x88, - 0x80,0x80,0x80,0x00,0x80,0x80,0x80,0xe0, - 0x10,0x30,0x60,0x90,0x60,0x80,0x70,0x90, - 0x78,0x84,0xb4,0xa4,0xb4,0x84,0x78,0xe0, - 0x00,0xe0,0x20,0xc0,0x50,0xa0,0x50,0x10, - 0x10,0xf0,0xc0,0x78,0x84,0xac,0xb4,0xb4, - 0x84,0x78,0xe0,0x40,0xa0,0x40,0xf0,0x00, - 0x20,0xf0,0x20,0xc0,0x80,0x40,0x80,0xc0, - 0x20,0x60,0xe0,0x80,0x40,0x80,0x80,0xe0, - 0xa0,0xa0,0xa0,0x50,0x50,0x50,0x50,0xd0, - 0xd0,0xd0,0x78,0x80,0x80,0x80,0x40,0x40, - 0x40,0xc0,0x40,0xe0,0x00,0xe0,0xa0,0xe0, - 0xa0,0x50,0xa0,0x04,0x5e,0x2c,0x54,0x48, - 0xc4,0x40,0x0e,0x44,0x22,0x5c,0x48,0xc4, - 0x40,0x04,0x5e,0x2c,0xd4,0x28,0x64,0xe0, - 0x60,0x90,0x40,0x20,0x00,0x20,0x88,0x88, - 0x70,0x50,0x20,0x20,0x00,0x20,0x40,0x88, - 0x88,0x70,0x50,0x20,0x20,0x00,0x20,0x10, - 0x88,0x88,0x70,0x50,0x20,0x20,0x00,0x50, - 0x20,0x88,0x88,0x70,0x50,0x20,0x20,0x00, - 0x50,0x28,0x88,0x88,0x70,0x50,0x20,0x20, - 0x00,0x50,0x88,0x88,0x70,0x50,0x20,0x20, - 0x20,0x50,0x20,0x9e,0x90,0x7c,0x50,0x30, - 0x3e,0x80,0x40,0x70,0x88,0x80,0x88,0x88, - 0x70,0xf0,0x80,0x80,0xe0,0x80,0xf0,0x00, - 0x20,0x40,0xf0,0x80,0x80,0xe0,0x80,0xf0, - 0x00,0x40,0x20,0xf0,0x80,0x80,0xe0,0x80, - 0xf0,0x00,0xa0,0x40,0xf0,0x80,0x80,0xe0, - 0x80,0xf0,0x00,0xa0,0x40,0x40,0x40,0x40, - 0x40,0x40,0x00,0x40,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x00,0x80,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x00,0xa0,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x00,0xa0,0x70, - 0x48,0x48,0xe8,0x48,0x70,0x88,0x98,0xa8, - 0xa8,0xc8,0x88,0x00,0x50,0x28,0x70,0x88, - 0x88,0x88,0x88,0x70,0x00,0x20,0x40,0x70, - 0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x10, - 0x70,0x88,0x88,0x88,0x88,0x70,0x00,0x50, - 0x20,0x70,0x88,0x88,0x88,0x88,0x70,0x00, - 0x50,0x28,0x70,0x88,0x88,0x88,0x88,0x70, - 0x00,0x50,0x90,0x60,0x60,0x90,0x80,0xf0, - 0xc8,0xa8,0x98,0x88,0x78,0x08,0x70,0x88, - 0x88,0x88,0x88,0x88,0x00,0x20,0x40,0x70, - 0x88,0x88,0x88,0x88,0x88,0x00,0x20,0x10, - 0x70,0x88,0x88,0x88,0x88,0x88,0x00,0x50, - 0x20,0x70,0x88,0x88,0x88,0x88,0x88,0x00, - 0x50,0x20,0x20,0x30,0x48,0x48,0xc8,0x00, - 0x10,0x08,0x80,0xf0,0x88,0x88,0xf0,0x80, - 0x80,0xa0,0x90,0x90,0xa0,0x90,0x60,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0x40,0x80,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0x40,0x20,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0xa0,0x40,0x68, - 0x50,0x70,0x10,0x60,0x00,0xb0,0x68,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0xa0,0xd0,0xa0, - 0xe0,0x20,0xc0,0x40,0xa0,0x40,0xd8,0xa0, - 0xf8,0x28,0xd0,0x80,0x40,0x60,0x80,0x80, - 0x80,0x60,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0x20,0x40,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0x40,0x20,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0xa0,0x40,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0xa0,0x40,0x40,0x40,0x40,0x40,0x00,0x40, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0xa0, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0xa0, - 0x60,0x90,0x90,0x90,0x70,0xa0,0x60,0x90, - 0x90,0x90,0x90,0x90,0xe0,0x00,0xa0,0x50, - 0x60,0x90,0x90,0x90,0x60,0x00,0x20,0x40, - 0x60,0x90,0x90,0x90,0x60,0x00,0x20,0x10, - 0x60,0x90,0x90,0x90,0x60,0x00,0xa0,0x40, - 0x60,0x90,0x90,0x90,0x60,0x00,0xa0,0x50, - 0x60,0x90,0x90,0x90,0x60,0x00,0x90,0x20, - 0x00,0xf0,0x00,0x20,0x80,0x70,0x68,0x58, - 0x48,0x3c,0x02,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0x40,0x80,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0x40,0x20,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0xa0,0x40,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0xa0,0x80,0x40,0x60,0x90,0x90,0x90, - 0x00,0x20,0x10,0x80,0xe0,0x90,0x90,0x90, - 0xe0,0x80,0x80,0x40,0x60,0x90,0x90,0x90, - 0x00,0x50, -}; - -BMF_FontData BMF_font_helvb8 = { - 0, -2, - 9, 9, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 8, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 2, 0}, - {1, 6, -1, 0, 2, 1}, - {3, 3, -1, -3, 3, 7}, - {5, 5, 0, 0, 5, 10}, - {4, 7, -1, 1, 5, 15}, - {6, 6, -1, 0, 7, 22}, - {5, 6, -1, 0, 6, 28}, - {1, 3, -1, -3, 2, 34}, - {2, 7, -1, 1, 3, 37}, - {2, 7, -1, 1, 3, 44}, - {3, 3, -1, -2, 3, 51}, - {5, 5, -1, 0, 5, 54}, - {2, 3, 0, 2, 2, 59}, - {4, 1, -2, -2, 6, 62}, - {1, 1, -1, 0, 2, 63}, - {2, 7, -1, 1, 2, 64}, - {4, 6, -1, 0, 5, 71}, - {2, 6, -2, 0, 5, 77}, - {4, 6, -1, 0, 5, 83}, - {3, 6, -2, 0, 5, 89}, - {4, 6, -1, 0, 5, 95}, - {3, 6, -2, 0, 5, 101}, - {4, 6, -1, 0, 5, 107}, - {4, 6, -1, 0, 5, 113}, - {4, 6, -1, 0, 5, 119}, - {4, 6, -1, 0, 5, 125}, - {1, 4, -1, 0, 2, 131}, - {2, 6, 0, 2, 2, 135}, - {3, 5, -1, 0, 5, 141}, - {3, 3, -1, -1, 4, 146}, - {3, 5, -2, 0, 5, 149}, - {3, 5, -2, 0, 5, 154}, - {8, 7, -1, 1, 9, 159}, - {5, 6, -1, 0, 6, 166}, - {4, 6, -2, 0, 6, 172}, - {5, 6, -1, 0, 6, 178}, - {5, 6, -1, 0, 6, 184}, - {4, 6, -2, 0, 6, 190}, - {4, 6, -2, 0, 5, 196}, - {5, 6, -1, 0, 6, 202}, - {5, 6, -1, 0, 6, 208}, - {1, 6, -1, 0, 2, 214}, - {3, 6, -1, 0, 4, 220}, - {4, 6, -2, 0, 6, 226}, - {3, 6, -2, 0, 5, 232}, - {5, 6, -2, 0, 7, 238}, - {5, 6, -1, 0, 6, 244}, - {5, 6, -1, 0, 6, 250}, - {4, 6, -2, 0, 6, 256}, - {5, 8, -1, 2, 6, 262}, - {4, 6, -2, 0, 6, 270}, - {4, 6, -2, 0, 6, 276}, - {3, 6, -1, 0, 4, 282}, - {5, 6, -1, 0, 6, 288}, - {4, 6, -2, 0, 6, 294}, - {7, 6, -1, 0, 7, 300}, - {4, 6, -2, 0, 6, 306}, - {5, 6, -1, 0, 6, 312}, - {4, 6, -2, 0, 6, 318}, - {2, 7, -1, 1, 2, 324}, - {2, 7, 0, 1, 2, 331}, - {2, 7, 0, 1, 2, 338}, - {5, 3, 0, -2, 5, 345}, - {5, 1, 0, 1, 5, 348}, - {1, 3, -1, -3, 2, 349}, - {4, 5, -1, 0, 4, 352}, - {4, 7, -1, 0, 5, 357}, - {3, 5, -1, 0, 4, 364}, - {4, 7, -1, 0, 5, 369}, - {3, 5, -1, 0, 4, 376}, - {3, 7, -1, 0, 3, 381}, - {4, 6, -1, 1, 5, 388}, - {4, 7, -1, 0, 5, 394}, - {1, 7, -1, 0, 2, 401}, - {2, 9, 0, 2, 2, 408}, - {3, 7, -1, 0, 4, 417}, - {1, 7, -1, 0, 2, 424}, - {5, 5, -1, 0, 6, 431}, - {4, 5, -1, 0, 5, 436}, - {4, 5, -1, 0, 5, 441}, - {4, 6, -1, 1, 5, 446}, - {4, 6, -1, 1, 5, 452}, - {3, 5, -1, 0, 3, 458}, - {3, 5, -1, 0, 4, 463}, - {3, 7, -1, 0, 3, 468}, - {3, 5, -1, 0, 4, 475}, - {4, 5, -1, 0, 5, 480}, - {5, 5, -1, 0, 6, 485}, - {4, 5, -1, 0, 5, 490}, - {4, 6, -1, 1, 4, 495}, - {3, 5, -1, 0, 4, 501}, - {3, 7, 0, 1, 2, 506}, - {1, 7, -1, 1, 2, 513}, - {3, 7, 0, 1, 2, 520}, - {5, 2, -1, -2, 6, 527}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 2, 529}, - {1, 7, -1, 2, 2, 530}, - {3, 7, -1, 1, 5, 537}, - {4, 6, -1, 0, 5, 544}, - {5, 5, 0, 0, 4, 550}, - {5, 5, -1, 0, 6, 555}, - {1, 7, -1, 1, 2, 560}, - {4, 8, -1, 2, 5, 567}, - {4, 1, 0, -5, 2, 575}, - {6, 7, -1, 1, 7, 576}, - {3, 5, 0, -1, 3, 583}, - {4, 3, -1, -1, 5, 588}, - {4, 3, -1, -1, 6, 591}, - {2, 1, 0, -2, 3, 594}, - {6, 7, -1, 1, 7, 595}, - {3, 1, 0, -5, 2, 602}, - {3, 3, -1, -3, 3, 603}, - {4, 5, -1, 0, 5, 606}, - {2, 4, -1, -2, 2, 611}, - {3, 4, 0, -2, 2, 615}, - {2, 2, 0, -4, 2, 619}, - {3, 6, -1, 2, 4, 621}, - {5, 8, 0, 2, 5, 627}, - {1, 2, -1, -1, 2, 635}, - {2, 2, 0, 2, 2, 637}, - {2, 4, 0, -2, 2, 639}, - {3, 5, 0, -1, 3, 643}, - {4, 3, -1, -1, 5, 648}, - {7, 7, 0, 1, 7, 651}, - {7, 7, 0, 1, 7, 658}, - {7, 7, 0, 1, 7, 665}, - {4, 6, -1, 1, 5, 672}, - {5, 9, -1, 0, 6, 678}, - {5, 9, -1, 0, 6, 687}, - {5, 9, -1, 0, 6, 696}, - {5, 9, -1, 0, 6, 705}, - {5, 8, -1, 0, 6, 714}, - {5, 9, -1, 0, 6, 722}, - {7, 6, -1, 0, 8, 731}, - {5, 8, -1, 2, 6, 737}, - {4, 9, -2, 0, 6, 745}, - {4, 9, -2, 0, 6, 754}, - {4, 9, -2, 0, 6, 763}, - {4, 8, -2, 0, 6, 772}, - {2, 9, 0, 0, 2, 780}, - {2, 9, -1, 0, 2, 789}, - {3, 9, 0, 0, 2, 798}, - {3, 8, 0, 0, 2, 807}, - {5, 6, -1, 0, 6, 815}, - {5, 9, -1, 0, 6, 821}, - {5, 9, -1, 0, 6, 830}, - {5, 9, -1, 0, 6, 839}, - {5, 9, -1, 0, 6, 848}, - {5, 9, -1, 0, 6, 857}, - {5, 8, -1, 0, 6, 866}, - {4, 4, -1, 0, 5, 874}, - {5, 8, -1, 1, 6, 878}, - {5, 9, -1, 0, 6, 886}, - {5, 9, -1, 0, 6, 895}, - {5, 9, -1, 0, 6, 904}, - {5, 8, -1, 0, 6, 913}, - {5, 9, -1, 0, 6, 921}, - {5, 6, -1, 0, 6, 930}, - {4, 7, -2, 1, 6, 936}, - {4, 8, -1, 0, 4, 943}, - {4, 8, -1, 0, 4, 951}, - {4, 8, -1, 0, 4, 959}, - {5, 8, 0, 0, 4, 967}, - {4, 7, -1, 0, 4, 975}, - {4, 8, -1, 0, 4, 982}, - {5, 5, -1, 0, 6, 990}, - {3, 7, -1, 2, 4, 995}, - {3, 8, -1, 0, 4, 1002}, - {3, 8, -1, 0, 4, 1010}, - {3, 8, -1, 0, 4, 1018}, - {3, 7, -1, 0, 4, 1026}, - {2, 8, 0, 0, 2, 1033}, - {2, 8, -1, 0, 2, 1041}, - {3, 8, 0, 0, 2, 1049}, - {3, 7, 0, 0, 2, 1057}, - {4, 8, -1, 0, 5, 1064}, - {4, 8, -1, 0, 5, 1072}, - {4, 8, -1, 0, 5, 1080}, - {4, 8, -1, 0, 5, 1088}, - {4, 8, -1, 0, 5, 1096}, - {4, 8, -1, 0, 5, 1104}, - {4, 7, -1, 0, 5, 1112}, - {4, 5, -1, 0, 5, 1119}, - {7, 7, 0, 1, 5, 1124}, - {3, 8, -1, 0, 4, 1131}, - {3, 8, -1, 0, 4, 1139}, - {3, 8, -1, 0, 4, 1147}, - {3, 7, -1, 0, 4, 1155}, - {4, 9, -1, 1, 4, 1162}, - {4, 7, -1, 1, 5, 1171}, - {4, 8, -1, 1, 4, 1178}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_scr12.cpp b/intern/bmfont/intern/BMF_font_scr12.cpp deleted file mode 100644 index be0be544474..00000000000 --- a/intern/bmfont/intern/BMF_font_scr12.cpp +++ /dev/null @@ -1,484 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_SCR12 - -static unsigned char bitmap_data[]= { - 0x80,0x80,0x00,0x80,0x80,0x80,0x80,0x80, - 0xa0,0xa0,0xa0,0xa0,0x50,0x50,0xfc,0x28, - 0x28,0x7e,0x14,0x14,0x20,0x70,0xa8,0x28, - 0x70,0xa0,0xa8,0x70,0x20,0x98,0x54,0x54, - 0x2c,0xd0,0xa8,0xa8,0x64,0x74,0x88,0x8c, - 0x50,0x20,0x50,0x48,0x30,0x80,0x40,0x20, - 0x20,0x20,0x40,0x40,0x80,0x80,0x80,0x80, - 0x40,0x40,0x20,0x80,0x40,0x40,0x20,0x20, - 0x20,0x20,0x40,0x40,0x80,0x20,0xa8,0x70, - 0xa8,0x20,0x20,0x20,0xf8,0x20,0x20,0x80, - 0x40,0x40,0xc0,0xf8,0x80,0x80,0x80,0x80, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08, - 0x70,0x88,0x88,0xc8,0xa8,0x98,0x88,0x70, - 0xe0,0x40,0x40,0x40,0x40,0x40,0xc0,0x40, - 0xf8,0x80,0x40,0x20,0x10,0x08,0x88,0x70, - 0x70,0x88,0x08,0x08,0x70,0x08,0x88,0x70, - 0x10,0x10,0x10,0xf8,0x90,0x50,0x30,0x10, - 0x70,0x88,0x08,0x08,0xf0,0x80,0x80,0xf8, - 0x70,0x88,0x88,0x88,0xf0,0x80,0x88,0x70, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0xf8, - 0x70,0x88,0x88,0x88,0x70,0x88,0x88,0x70, - 0x70,0x88,0x08,0x78,0x88,0x88,0x88,0x70, - 0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x40, - 0x40,0xc0,0x00,0x00,0x40,0x40,0x08,0x10, - 0x20,0x40,0x80,0x40,0x20,0x10,0x08,0xf8, - 0x00,0xf8,0x80,0x40,0x20,0x10,0x08,0x10, - 0x20,0x40,0x80,0x20,0x00,0x20,0x20,0x10, - 0x88,0x88,0x70,0x38,0x40,0x98,0xa8,0xa8, - 0x98,0x48,0x30,0x88,0x88,0xf8,0x88,0x50, - 0x50,0x20,0x20,0xf0,0x88,0x88,0x88,0xf0, - 0x88,0x88,0xf0,0x70,0x88,0x80,0x80,0x80, - 0x80,0x88,0x70,0xf0,0x88,0x88,0x88,0x88, - 0x88,0x88,0xf0,0xf8,0x80,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x80,0x80,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x68,0x98,0x88,0x88,0x98, - 0x80,0x88,0x70,0x88,0x88,0x88,0x88,0xf8, - 0x88,0x88,0x88,0xe0,0x40,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x70,0x88,0x88,0x08,0x08, - 0x08,0x08,0x08,0x88,0x88,0x90,0xa0,0xc0, - 0xa0,0x90,0x88,0xf8,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x88,0x88,0xa8,0xa8,0xd8, - 0xd8,0x88,0x88,0x88,0x98,0x98,0xa8,0xa8, - 0xc8,0xc8,0x88,0x70,0x88,0x88,0x88,0x88, - 0x88,0x88,0x70,0x80,0x80,0x80,0x80,0xf0, - 0x88,0x88,0xf0,0x08,0x10,0x70,0xa8,0x88, - 0x88,0x88,0x88,0x88,0x70,0x88,0x90,0x90, - 0xa0,0xf0,0x88,0x88,0xf0,0x70,0x88,0x88, - 0x08,0x70,0x80,0x88,0x70,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xf8,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x88,0x20,0x20,0x50, - 0x50,0x50,0x88,0x88,0x88,0x50,0x50,0xf8, - 0xa8,0xa8,0xa8,0x88,0x88,0x88,0x88,0x50, - 0x20,0x20,0x50,0x88,0x88,0x20,0x20,0x20, - 0x20,0x50,0x50,0x88,0x88,0xf8,0x80,0x40, - 0x40,0x20,0x10,0x08,0xf8,0xe0,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xe0,0x08,0x08, - 0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80, - 0xe0,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x88,0x50,0x20,0xfe,0x20,0x40,0x80, - 0x80,0x68,0x98,0x88,0x78,0x08,0x70,0xb0, - 0xc8,0x88,0x88,0xc8,0xb0,0x80,0x80,0x70, - 0x88,0x80,0x80,0x88,0x70,0x68,0x98,0x88, - 0x88,0x98,0x68,0x08,0x08,0x70,0x88,0x80, - 0xf8,0x88,0x70,0x40,0x40,0x40,0x40,0x40, - 0xf0,0x40,0x38,0xf0,0x08,0x68,0x98,0x88, - 0x88,0x98,0x68,0x88,0x88,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x00,0x20,0x60,0x90,0x10,0x10,0x10, - 0x10,0x10,0x70,0x00,0x10,0x88,0x90,0xa0, - 0xc0,0xa0,0x90,0x80,0x80,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0xa8,0xa8,0xa8, - 0xa8,0xa8,0xd0,0x88,0x88,0x88,0x88,0xc8, - 0xb0,0x70,0x88,0x88,0x88,0x88,0x70,0x80, - 0x80,0xb0,0xc8,0x88,0x88,0xc8,0xb0,0x08, - 0x08,0x68,0x98,0x88,0x88,0x98,0x68,0x80, - 0x80,0x80,0x80,0xc8,0xb0,0x70,0x88,0x10, - 0x60,0x88,0x70,0x30,0x40,0x40,0x40,0x40, - 0xf0,0x40,0x68,0x98,0x88,0x88,0x88,0x88, - 0x20,0x20,0x50,0x50,0x88,0x88,0x50,0xa8, - 0xa8,0xa8,0x88,0x88,0x88,0x88,0x50,0x20, - 0x50,0x88,0xf0,0x08,0x68,0x98,0x88,0x88, - 0x88,0x88,0xf8,0x80,0x40,0x20,0x10,0xf8, - 0x18,0x20,0x20,0x20,0x20,0xc0,0x20,0x20, - 0x20,0x18,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0xc0,0x20,0x20,0x20, - 0x20,0x18,0x20,0x20,0x20,0xc0,0x98,0xb4, - 0x64,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x80,0x20,0x20,0x70,0x88,0x80,0x88,0x70, - 0x20,0x20,0xb0,0x48,0x40,0xf0,0x40,0x40, - 0x48,0x30,0x90,0x60,0x90,0x90,0x60,0x90, - 0x20,0x70,0x20,0x70,0x20,0x50,0x88,0x88, - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x80,0x70,0x88,0x10,0x28,0x48,0x90, - 0xa0,0x40,0x88,0x70,0xa0,0x78,0x84,0xb4, - 0xa4,0xb4,0x84,0x78,0xf0,0x90,0x70,0x10, - 0x60,0x14,0x28,0x50,0xa0,0x50,0x28,0x14, - 0x08,0xf8,0xf0,0x78,0x84,0xac,0xb4,0xb4, - 0x84,0x78,0xe0,0x60,0x90,0x60,0xf8,0x00, - 0x20,0x20,0xf8,0x20,0x20,0xe0,0x40,0x20, - 0xa0,0x40,0xc0,0x20,0x40,0x20,0xc0,0x80, - 0x40,0x80,0xe8,0x90,0x90,0x90,0x90,0x28, - 0x28,0x28,0x28,0x68,0xa8,0xa8,0xa8,0x7c, - 0x80,0x80,0xc0,0x40,0xe0,0x40,0x40,0xc0, - 0x40,0xf0,0x60,0x90,0x90,0x60,0xa0,0x50, - 0x28,0x14,0x28,0x50,0xa0,0x08,0x38,0xa8, - 0x58,0x28,0xf0,0x48,0x40,0xc0,0x40,0x38, - 0x10,0x88,0x68,0x30,0xf0,0x48,0x40,0xc0, - 0x40,0x08,0x38,0xa8,0x58,0x28,0xd0,0x28, - 0x40,0x20,0xc0,0x70,0x88,0x88,0x40,0x20, - 0x20,0x00,0x20,0x88,0x88,0xf8,0x88,0x50, - 0x50,0x20,0x00,0x20,0x40,0x88,0x88,0xf8, - 0x50,0x50,0x20,0x20,0x00,0x20,0x10,0x88, - 0x88,0xf8,0x50,0x50,0x20,0x20,0x00,0x50, - 0x20,0x88,0x88,0xf8,0x50,0x50,0x20,0x20, - 0x00,0xb0,0x68,0x88,0x88,0xf8,0x50,0x50, - 0x20,0x20,0x00,0x50,0x88,0x88,0xf8,0x50, - 0x50,0x20,0x20,0x20,0x50,0x20,0x9c,0x90, - 0xf0,0x50,0x5c,0x30,0x30,0x1c,0x60,0x20, - 0x70,0x88,0x80,0x80,0x80,0x80,0x88,0x70, - 0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x00, - 0x20,0x40,0xf8,0x80,0x80,0xf0,0x80,0x80, - 0xf8,0x00,0x20,0x10,0xf8,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x00,0x50,0x20,0xf8,0x80, - 0x80,0xf0,0x80,0x80,0xf8,0x00,0x50,0xe0, - 0x40,0x40,0x40,0x40,0x40,0xe0,0x00,0x40, - 0x80,0xe0,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x00,0x40,0x20,0xe0,0x40,0x40,0x40,0x40, - 0x40,0xe0,0x00,0xa0,0x40,0xe0,0x40,0x40, - 0x40,0x40,0x40,0xe0,0x00,0xa0,0x78,0x44, - 0x44,0xf4,0x44,0x44,0x44,0x78,0x88,0x98, - 0x98,0xa8,0xc8,0xc8,0x88,0x00,0xb0,0x68, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00, - 0x20,0x40,0x70,0x88,0x88,0x88,0x88,0x88, - 0x70,0x00,0x20,0x10,0x70,0x88,0x88,0x88, - 0x88,0x88,0x70,0x00,0x50,0x20,0x70,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0xb0,0x68, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00, - 0x50,0x88,0x50,0x20,0x50,0x88,0xb8,0x44, - 0x64,0x54,0x4c,0x44,0x3a,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x00,0x20,0x40,0x70, - 0x88,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x10,0x70,0x88,0x88,0x88,0x88,0x88,0x88, - 0x00,0x50,0x20,0x70,0x88,0x88,0x88,0x88, - 0x88,0x88,0x00,0x50,0x20,0x20,0x20,0x50, - 0x50,0x88,0x88,0x00,0x20,0x10,0x80,0x80, - 0xf0,0x88,0x88,0x88,0xf0,0x80,0x80,0xb0, - 0x88,0x88,0x88,0x90,0xa0,0x90,0x60,0x78, - 0x88,0x78,0x08,0x70,0x00,0x20,0x40,0x78, - 0x88,0x78,0x08,0x70,0x00,0x20,0x10,0x78, - 0x88,0x78,0x08,0x70,0x00,0x50,0x20,0x78, - 0x88,0x78,0x08,0x70,0x00,0xb0,0x68,0x78, - 0x88,0x78,0x08,0x70,0x00,0x50,0x78,0x88, - 0x78,0x08,0x70,0x00,0x20,0x50,0x20,0x6c, - 0x90,0x7c,0x12,0x6c,0x60,0x20,0x70,0x88, - 0x80,0x80,0x88,0x70,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x20,0x40,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x20,0x10,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x50,0x20,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x50,0x20,0x20,0x20,0x20,0xe0, - 0x00,0x40,0x80,0x20,0x20,0x20,0x20,0xe0, - 0x00,0x40,0x20,0x20,0x20,0x20,0x20,0xe0, - 0x00,0xa0,0x40,0x20,0x20,0x20,0x20,0xe0, - 0x00,0xa0,0x70,0x88,0x88,0x88,0x78,0x08, - 0x90,0x60,0xd0,0x88,0x88,0x88,0xc8,0xb0, - 0x00,0xb0,0x68,0x70,0x88,0x88,0x88,0x70, - 0x00,0x20,0x40,0x70,0x88,0x88,0x88,0x70, - 0x00,0x20,0x10,0x70,0x88,0x88,0x88,0x70, - 0x00,0x50,0x20,0x70,0x88,0x88,0x88,0x70, - 0x00,0xb0,0x68,0x70,0x88,0x88,0x88,0x70, - 0x00,0x50,0x20,0x00,0xf8,0x00,0x20,0xb8, - 0x64,0x54,0x4c,0x3a,0x68,0x98,0x88,0x88, - 0x88,0x00,0x20,0x40,0x68,0x98,0x88,0x88, - 0x88,0x00,0x20,0x10,0x68,0x98,0x88,0x88, - 0x88,0x00,0x50,0x20,0x68,0x98,0x88,0x88, - 0x88,0x00,0x50,0xf0,0x08,0x68,0x98,0x88, - 0x88,0x88,0x00,0x20,0x10,0x80,0x80,0xb0, - 0xc8,0x88,0x88,0xc8,0xb0,0x80,0x80,0xf0, - 0x08,0x68,0x98,0x88,0x88,0x88,0x00,0xd8, -}; - -BMF_FontData BMF_font_scr12 = { - 0, -2, - 7, 10, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 16, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 7, -1}, - {1, 8, -3, 0, 7, 0}, - {3, 4, -2, -5, 7, 8}, - {7, 8, 0, 0, 7, 12}, - {5, 9, -1, 1, 7, 20}, - {6, 8, 0, 0, 7, 29}, - {6, 8, 0, 0, 7, 37}, - {3, 4, -2, -5, 7, 45}, - {3, 10, -2, 2, 7, 49}, - {3, 10, -2, 2, 7, 59}, - {5, 5, -1, -3, 7, 69}, - {5, 5, -1, -1, 7, 74}, - {2, 4, -2, 2, 7, 79}, - {5, 1, -1, -3, 7, 83}, - {1, 2, -3, 0, 7, 84}, - {5, 10, -1, 1, 7, 86}, - {5, 8, -1, 0, 7, 96}, - {3, 8, -2, 0, 7, 104}, - {5, 8, -1, 0, 7, 112}, - {5, 8, -1, 0, 7, 120}, - {5, 8, -1, 0, 7, 128}, - {5, 8, -1, 0, 7, 136}, - {5, 8, -1, 0, 7, 144}, - {5, 8, -1, 0, 7, 152}, - {5, 8, -1, 0, 7, 160}, - {5, 8, -1, 0, 7, 168}, - {1, 6, -3, 0, 7, 176}, - {2, 8, -2, 2, 7, 182}, - {5, 9, -1, 1, 7, 190}, - {5, 3, -1, -2, 7, 199}, - {5, 9, -1, 1, 7, 202}, - {5, 8, -1, 0, 7, 211}, - {5, 8, -1, 0, 7, 219}, - {5, 8, -1, 0, 7, 227}, - {5, 8, -1, 0, 7, 235}, - {5, 8, -1, 0, 7, 243}, - {5, 8, -1, 0, 7, 251}, - {5, 8, -1, 0, 7, 259}, - {5, 8, -1, 0, 7, 267}, - {5, 8, -1, 0, 7, 275}, - {5, 8, -1, 0, 7, 283}, - {3, 8, -2, 0, 7, 291}, - {5, 8, -1, 0, 7, 299}, - {5, 8, -1, 0, 7, 307}, - {5, 8, -1, 0, 7, 315}, - {5, 8, -1, 0, 7, 323}, - {5, 8, -1, 0, 7, 331}, - {5, 8, -1, 0, 7, 339}, - {5, 8, -1, 0, 7, 347}, - {5, 10, -1, 2, 7, 355}, - {5, 8, -1, 0, 7, 365}, - {5, 8, -1, 0, 7, 373}, - {5, 8, -1, 0, 7, 381}, - {5, 8, -1, 0, 7, 389}, - {5, 8, -1, 0, 7, 397}, - {5, 8, -1, 0, 7, 405}, - {5, 8, -1, 0, 7, 413}, - {5, 8, -1, 0, 7, 421}, - {5, 8, -1, 0, 7, 429}, - {3, 9, -2, 1, 7, 437}, - {5, 10, -1, 1, 7, 446}, - {3, 9, -2, 1, 7, 456}, - {5, 3, -1, -5, 7, 465}, - {7, 1, 0, 1, 7, 468}, - {3, 4, -2, -5, 7, 469}, - {5, 6, -1, 0, 7, 473}, - {5, 8, -1, 0, 7, 479}, - {5, 6, -1, 0, 7, 487}, - {5, 8, -1, 0, 7, 493}, - {5, 6, -1, 0, 7, 501}, - {5, 8, -1, 0, 7, 507}, - {5, 8, -1, 2, 7, 515}, - {5, 8, -1, 0, 7, 523}, - {3, 8, -2, 0, 7, 531}, - {4, 10, -1, 2, 7, 539}, - {5, 8, -1, 0, 7, 549}, - {3, 8, -2, 0, 7, 557}, - {5, 6, -1, 0, 7, 565}, - {5, 6, -1, 0, 7, 571}, - {5, 6, -1, 0, 7, 577}, - {5, 8, -1, 2, 7, 583}, - {5, 8, -1, 2, 7, 591}, - {5, 6, -1, 0, 7, 599}, - {5, 6, -1, 0, 7, 605}, - {4, 7, -1, 0, 7, 611}, - {5, 6, -1, 0, 7, 618}, - {5, 6, -1, 0, 7, 624}, - {5, 6, -1, 0, 7, 630}, - {5, 6, -1, 0, 7, 636}, - {5, 8, -1, 2, 7, 642}, - {5, 6, -1, 0, 7, 650}, - {5, 10, -1, 2, 7, 656}, - {1, 10, -3, 1, 7, 666}, - {5, 10, -1, 2, 7, 676}, - {6, 3, 0, -2, 7, 686}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 8, -3, 2, 7, 689}, - {5, 9, -1, 0, 7, 697}, - {5, 8, -1, 0, 7, 706}, - {4, 6, -1, -2, 7, 714}, - {5, 8, -1, 0, 7, 720}, - {1, 10, -3, 1, 7, 728}, - {5, 10, -1, 1, 7, 738}, - {3, 1, -2, -7, 7, 748}, - {6, 7, 0, 0, 7, 749}, - {4, 5, -1, -4, 7, 756}, - {6, 7, 0, 0, 7, 761}, - {5, 2, -1, -3, 7, 768}, - {4, 1, -1, -3, 7, 770}, - {6, 7, 0, 0, 7, 771}, - {3, 1, -2, -7, 7, 778}, - {4, 3, -1, -4, 7, 779}, - {5, 7, -1, 0, 7, 782}, - {3, 5, -2, -4, 7, 789}, - {3, 5, -2, -4, 7, 794}, - {2, 2, -2, -7, 7, 799}, - {5, 6, -1, 1, 7, 801}, - {6, 9, 0, 1, 7, 807}, - {1, 2, -3, -3, 7, 816}, - {2, 2, -2, 2, 7, 818}, - {3, 5, -2, -4, 7, 820}, - {4, 5, -1, -4, 7, 825}, - {6, 7, 0, 0, 7, 830}, - {5, 10, -1, 1, 7, 837}, - {5, 10, -1, 1, 7, 847}, - {5, 10, -1, 1, 7, 857}, - {5, 8, -1, 2, 7, 867}, - {5, 10, -1, 0, 7, 875}, - {5, 10, -1, 0, 7, 885}, - {5, 10, -1, 0, 7, 895}, - {5, 10, -1, 0, 7, 905}, - {5, 9, -1, 0, 7, 915}, - {5, 10, -1, 0, 7, 924}, - {6, 8, 0, 0, 7, 934}, - {5, 10, -1, 2, 7, 942}, - {5, 10, -1, 0, 7, 952}, - {5, 10, -1, 0, 7, 962}, - {5, 10, -1, 0, 7, 972}, - {5, 9, -1, 0, 7, 982}, - {3, 10, -2, 0, 7, 991}, - {3, 10, -2, 0, 7, 1001}, - {3, 10, -2, 0, 7, 1011}, - {3, 9, -2, 0, 7, 1021}, - {6, 8, 0, 0, 7, 1030}, - {5, 10, -1, 0, 7, 1038}, - {5, 10, -1, 0, 7, 1048}, - {5, 10, -1, 0, 7, 1058}, - {5, 10, -1, 0, 7, 1068}, - {5, 10, -1, 0, 7, 1078}, - {5, 9, -1, 0, 7, 1088}, - {5, 5, -1, -1, 7, 1097}, - {7, 7, 0, 0, 7, 1102}, - {5, 10, -1, 0, 7, 1109}, - {5, 10, -1, 0, 7, 1119}, - {5, 10, -1, 0, 7, 1129}, - {5, 9, -1, 0, 7, 1139}, - {5, 10, -1, 0, 7, 1148}, - {5, 9, -1, 0, 7, 1158}, - {5, 8, -1, 0, 7, 1167}, - {5, 8, -1, 0, 7, 1175}, - {5, 8, -1, 0, 7, 1183}, - {5, 8, -1, 0, 7, 1191}, - {5, 8, -1, 0, 7, 1199}, - {5, 7, -1, 0, 7, 1207}, - {5, 9, -1, 0, 7, 1214}, - {7, 5, 0, 0, 7, 1223}, - {5, 8, -1, 2, 7, 1228}, - {5, 8, -1, 0, 7, 1236}, - {5, 8, -1, 0, 7, 1244}, - {5, 8, -1, 0, 7, 1252}, - {5, 7, -1, 0, 7, 1260}, - {3, 8, -2, 0, 7, 1267}, - {3, 8, -2, 0, 7, 1275}, - {3, 8, -2, 0, 7, 1283}, - {3, 7, -2, 0, 7, 1291}, - {5, 9, -1, 0, 7, 1298}, - {5, 8, -1, 0, 7, 1307}, - {5, 8, -1, 0, 7, 1315}, - {5, 8, -1, 0, 7, 1323}, - {5, 8, -1, 0, 7, 1331}, - {5, 8, -1, 0, 7, 1339}, - {5, 7, -1, 0, 7, 1347}, - {5, 5, -1, -1, 7, 1354}, - {7, 5, 0, 0, 7, 1359}, - {5, 8, -1, 0, 7, 1364}, - {5, 8, -1, 0, 7, 1372}, - {5, 8, -1, 0, 7, 1380}, - {5, 7, -1, 0, 7, 1388}, - {5, 10, -1, 2, 7, 1395}, - {5, 10, -1, 2, 7, 1405}, - {5, 9, -1, 2, 7, 1415}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_scr14.cpp b/intern/bmfont/intern/BMF_font_scr14.cpp deleted file mode 100644 index 596442885e1..00000000000 --- a/intern/bmfont/intern/BMF_font_scr14.cpp +++ /dev/null @@ -1,510 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_SCR14 - -static unsigned char bitmap_data[]= { - 0x80,0x80,0x00,0x80,0x80,0x80,0x80,0x80, - 0x80,0xa0,0xa0,0xa0,0xa0,0x50,0x50,0xfc, - 0x28,0x28,0x28,0x7e,0x14,0x14,0x20,0x70, - 0xa8,0x28,0x30,0x60,0xa0,0xa8,0x70,0x20, - 0x98,0x54,0x54,0x2c,0x10,0x68,0x54,0x54, - 0x32,0x74,0x88,0x8c,0x90,0x60,0x20,0x50, - 0x48,0x30,0x80,0x40,0x20,0x20,0x20,0x40, - 0x40,0x80,0x80,0x80,0x80,0x80,0x40,0x40, - 0x20,0x80,0x40,0x40,0x20,0x20,0x20,0x20, - 0x20,0x40,0x40,0x80,0x20,0xa8,0x70,0x70, - 0xa8,0x20,0x20,0x20,0xf8,0x20,0x20,0x80, - 0x40,0x40,0xc0,0xf8,0x80,0x80,0x80,0x80, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08, - 0x70,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88, - 0x70,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0xc0,0x40,0xf8,0x80,0x40,0x20,0x10,0x08, - 0x88,0x88,0x70,0x70,0x88,0x08,0x08,0x70, - 0x08,0x08,0x88,0x70,0x10,0x10,0x10,0xf8, - 0x90,0x50,0x50,0x30,0x10,0x70,0x88,0x08, - 0x08,0x08,0xf0,0x80,0x80,0xf8,0x70,0x88, - 0x88,0x88,0x88,0xf0,0x80,0x88,0x70,0x40, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0xf8, - 0x70,0x88,0x88,0x88,0x70,0x88,0x88,0x88, - 0x70,0x70,0x88,0x08,0x08,0x78,0x88,0x88, - 0x88,0x70,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x40,0x40,0xc0,0x00,0x00,0x40,0x40, - 0x08,0x10,0x20,0x40,0x80,0x40,0x20,0x10, - 0x08,0xf8,0x00,0xf8,0x80,0x40,0x20,0x10, - 0x08,0x10,0x20,0x40,0x80,0x20,0x20,0x00, - 0x20,0x20,0x10,0x88,0x88,0x70,0x38,0x40, - 0x98,0xa8,0xa8,0x98,0x88,0x48,0x30,0x88, - 0x88,0xf8,0x88,0x50,0x50,0x50,0x20,0x20, - 0xf0,0x88,0x88,0x88,0xf0,0x88,0x88,0x88, - 0xf0,0x70,0x88,0x80,0x80,0x80,0x80,0x80, - 0x88,0x70,0xf0,0x88,0x88,0x88,0x88,0x88, - 0x88,0x88,0xf0,0xf8,0x80,0x80,0x80,0xf0, - 0x80,0x80,0x80,0xf8,0x80,0x80,0x80,0x80, - 0xf0,0x80,0x80,0x80,0xf8,0x68,0x98,0x88, - 0x88,0x98,0x80,0x80,0x88,0x70,0x88,0x88, - 0x88,0x88,0xf8,0x88,0x88,0x88,0x88,0xe0, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x70,0x88,0x88,0x08,0x08,0x08,0x08,0x08, - 0x08,0x88,0x88,0x90,0xa0,0xc0,0xa0,0x90, - 0x88,0x88,0xf8,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x88,0x88,0x88,0xa8,0xa8, - 0xd8,0xd8,0x88,0x88,0x88,0x98,0x98,0xa8, - 0xa8,0xc8,0xc8,0x88,0x88,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x88,0x70,0x80,0x80, - 0x80,0x80,0xf0,0x88,0x88,0x88,0xf0,0x08, - 0x10,0x70,0xa8,0x88,0x88,0x88,0x88,0x88, - 0x88,0x70,0x88,0x88,0x90,0xa0,0xf0,0x88, - 0x88,0x88,0xf0,0x70,0x88,0x08,0x08,0x70, - 0x80,0x80,0x88,0x70,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xf8,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x88,0x88,0x20,0x20, - 0x50,0x50,0x50,0x88,0x88,0x88,0x88,0x50, - 0x50,0xf8,0xa8,0xa8,0x88,0x88,0x88,0x88, - 0x88,0x88,0x50,0x50,0x20,0x50,0x50,0x88, - 0x88,0x20,0x20,0x20,0x20,0x20,0x50,0x50, - 0x88,0x88,0xf8,0x80,0x40,0x40,0x20,0x10, - 0x10,0x08,0xf8,0xf0,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xf0,0x08,0x08, - 0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80, - 0xf0,0x10,0x10,0x10,0x10,0x10,0x10,0x10, - 0x10,0x10,0xf0,0x88,0x50,0x20,0xfe,0x20, - 0x40,0x80,0x80,0x68,0x98,0x88,0x78,0x08, - 0x88,0x70,0xb0,0xc8,0x88,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x70,0x88,0x80,0x80,0x80, - 0x88,0x70,0x68,0x98,0x88,0x88,0x88,0x98, - 0x68,0x08,0x08,0x70,0x88,0x80,0xf8,0x88, - 0x88,0x70,0x40,0x40,0x40,0x40,0x40,0x40, - 0xf0,0x40,0x38,0x70,0x88,0x08,0x68,0x98, - 0x88,0x88,0x88,0x98,0x68,0x88,0x88,0x88, - 0x88,0x88,0xc8,0xb0,0x80,0x80,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0x20,0x60, - 0x90,0x10,0x10,0x10,0x10,0x10,0x10,0x10, - 0x70,0x00,0x10,0x88,0x88,0x90,0xe0,0xa0, - 0x90,0x88,0x80,0x80,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0xa8,0xa8,0xa8, - 0xa8,0xa8,0xa8,0xd0,0x88,0x88,0x88,0x88, - 0x88,0xc8,0xb0,0x70,0x88,0x88,0x88,0x88, - 0x88,0x70,0x80,0x80,0x80,0xb0,0xc8,0x88, - 0x88,0x88,0xc8,0xb0,0x08,0x08,0x08,0x68, - 0x98,0x88,0x88,0x88,0x98,0x68,0x80,0x80, - 0x80,0x80,0x80,0xc8,0xb0,0x70,0x88,0x08, - 0x70,0x80,0x88,0x70,0x30,0x40,0x40,0x40, - 0x40,0x40,0xf0,0x40,0x40,0x68,0x98,0x88, - 0x88,0x88,0x88,0x88,0x20,0x20,0x50,0x50, - 0x88,0x88,0x88,0x50,0xa8,0xa8,0xa8,0xa8, - 0x88,0x88,0x88,0x88,0x50,0x20,0x50,0x88, - 0x88,0x70,0x88,0x08,0x68,0x98,0x88,0x88, - 0x88,0x88,0x88,0xf8,0x80,0x40,0x20,0x10, - 0x08,0xf8,0x18,0x20,0x20,0x20,0x20,0x20, - 0xc0,0x20,0x20,0x20,0x20,0x18,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0xc0,0x20,0x20,0x20,0x20,0x20, - 0x18,0x20,0x20,0x20,0x20,0xc0,0x98,0xb4, - 0x64,0x80,0x80,0x80,0x80,0x80,0x80,0x00, - 0x80,0x80,0x20,0x20,0x70,0x88,0x80,0x80, - 0x88,0x70,0x20,0x20,0xb0,0x48,0x40,0x40, - 0xf0,0x40,0x40,0x48,0x30,0x88,0x70,0x88, - 0x88,0x70,0x88,0x70,0x20,0xf8,0x20,0xf8, - 0x50,0x50,0x88,0x88,0x80,0x80,0x80,0x80, - 0x80,0x00,0x00,0x80,0x80,0x80,0x80,0x80, - 0x70,0x88,0x10,0x28,0x48,0x88,0x90,0xa0, - 0x40,0x88,0x70,0xd8,0x38,0x44,0x92,0xaa, - 0xa2,0xaa,0x92,0x44,0x38,0xf8,0x00,0x68, - 0x90,0x70,0x10,0x60,0x12,0x24,0x48,0x90, - 0x48,0x24,0x12,0x08,0x08,0xf8,0xf0,0x38, - 0x44,0xaa,0xaa,0xb2,0xaa,0xb2,0x44,0x38, - 0xe0,0x60,0x90,0x90,0x60,0xf8,0x00,0x20, - 0x20,0xf8,0x20,0x20,0xe0,0x40,0x20,0xa0, - 0x40,0xc0,0x20,0x40,0x20,0xc0,0x80,0x40, - 0x80,0x80,0xb4,0xc8,0x88,0x88,0x88,0x88, - 0x28,0x28,0x28,0x28,0x28,0x68,0xa8,0xa8, - 0xa8,0x7c,0x80,0x80,0xc0,0x20,0x40,0xe0, - 0x40,0x40,0xc0,0x40,0xf8,0x00,0x70,0x88, - 0x88,0x88,0x70,0x90,0x48,0x24,0x12,0x24, - 0x48,0x90,0x04,0x9e,0x54,0x2c,0x14,0xe8, - 0x44,0x40,0xc0,0x40,0x1c,0x08,0x84,0x54, - 0x28,0x10,0xe8,0x44,0x40,0xc0,0x40,0x04, - 0x9e,0x54,0x2c,0xd4,0x28,0x44,0x20,0xc0, - 0x70,0x88,0x80,0x40,0x20,0x20,0x00,0x00, - 0x20,0x20,0x88,0x88,0xf8,0x88,0x50,0x50, - 0x20,0x20,0x00,0x20,0x40,0x88,0x88,0xf8, - 0x88,0x50,0x50,0x20,0x20,0x00,0x20,0x10, - 0x88,0x88,0xf8,0x88,0x50,0x50,0x20,0x20, - 0x00,0x50,0x20,0x88,0x88,0xf8,0x88,0x50, - 0x50,0x20,0x20,0x00,0xb0,0x68,0x88,0x88, - 0xf8,0x88,0x50,0x50,0x20,0x20,0x00,0xd8, - 0x88,0x88,0xf8,0x88,0x50,0x50,0x20,0x20, - 0x20,0x50,0x20,0x9c,0x90,0xf0,0x90,0x5c, - 0x50,0x30,0x30,0x1c,0x60,0x10,0x20,0x70, - 0x88,0x80,0x80,0x80,0x80,0x80,0x88,0x70, - 0xf8,0x80,0x80,0x80,0xf0,0x80,0x80,0xf8, - 0x00,0x20,0x40,0xf8,0x80,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x00,0x20,0x10,0xf8,0x80, - 0x80,0x80,0xf0,0x80,0x80,0xf8,0x00,0x50, - 0x20,0xf8,0x80,0x80,0x80,0xf0,0x80,0x80, - 0xf8,0x00,0xd8,0xe0,0x40,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x00,0x40,0x80,0xe0,0x40, - 0x40,0x40,0x40,0x40,0x40,0xe0,0x00,0x40, - 0x20,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0xe0,0x00,0xa0,0x40,0x70,0x20,0x20,0x20, - 0x20,0x20,0x20,0x70,0x00,0xd8,0x78,0x44, - 0x44,0x44,0xf4,0x44,0x44,0x44,0x78,0x88, - 0x98,0x98,0xa8,0xa8,0xc8,0xc8,0x88,0x00, - 0xb0,0x68,0x70,0x88,0x88,0x88,0x88,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x10, - 0x70,0x88,0x88,0x88,0x88,0x88,0x88,0x70, - 0x00,0x50,0x20,0x70,0x88,0x88,0x88,0x88, - 0x88,0x88,0x70,0x00,0xb0,0x68,0x70,0x88, - 0x88,0x88,0x88,0x88,0x88,0x70,0x00,0xd8, - 0x88,0x50,0x20,0x50,0x88,0xb8,0x44,0x64, - 0x64,0x54,0x4c,0x4c,0x44,0x3a,0x70,0x88, - 0x88,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x40,0x70,0x88,0x88,0x88,0x88,0x88,0x88, - 0x88,0x00,0x20,0x10,0x70,0x88,0x88,0x88, - 0x88,0x88,0x88,0x88,0x00,0x50,0x20,0x70, - 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x00, - 0xd8,0x20,0x20,0x20,0x20,0x50,0x50,0x88, - 0x88,0x00,0x20,0x10,0xe0,0x40,0x78,0x44, - 0x44,0x44,0x78,0x40,0xe0,0xb0,0x88,0x88, - 0x88,0x90,0xa0,0x90,0x90,0x60,0x68,0x98, - 0x88,0x78,0x08,0x88,0x70,0x00,0x20,0x40, - 0x68,0x98,0x88,0x78,0x08,0x88,0x70,0x00, - 0x20,0x10,0x68,0x98,0x88,0x78,0x08,0x88, - 0x70,0x00,0x50,0x20,0x68,0x98,0x88,0x78, - 0x08,0x88,0x70,0x00,0xb0,0x68,0x68,0x98, - 0x88,0x78,0x08,0x88,0x70,0x00,0xd8,0x68, - 0x98,0x88,0x78,0x08,0x88,0x70,0x00,0x20, - 0x50,0x20,0x6c,0x92,0x90,0x7e,0x12,0x92, - 0x6c,0x60,0x10,0x20,0x70,0x88,0x80,0x80, - 0x80,0x88,0x70,0x70,0x88,0x80,0xf8,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x80, - 0xf8,0x88,0x88,0x70,0x00,0x20,0x10,0x70, - 0x88,0x80,0xf8,0x88,0x88,0x70,0x00,0x50, - 0x20,0x70,0x88,0x80,0xf8,0x88,0x88,0x70, - 0x00,0xd8,0x20,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x00,0x20,0x40,0x20,0x20,0x20,0x20, - 0x20,0x20,0xe0,0x00,0x20,0x10,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0xa0,0x40, - 0x20,0x20,0x20,0x20,0x20,0x20,0xe0,0x00, - 0xd8,0x70,0x88,0x88,0x88,0x88,0x88,0x78, - 0x10,0xd0,0x20,0xd0,0x88,0x88,0x88,0x88, - 0x88,0xc8,0xb0,0x00,0xb0,0x68,0x70,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x40, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00, - 0x20,0x10,0x70,0x88,0x88,0x88,0x88,0x88, - 0x70,0x00,0x50,0x20,0x70,0x88,0x88,0x88, - 0x88,0x88,0x70,0x00,0xb0,0x68,0x70,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0xd8,0x10, - 0x10,0x00,0xfe,0x00,0x10,0x10,0xb8,0x44, - 0x64,0x54,0x4c,0x44,0x3a,0x68,0x98,0x88, - 0x88,0x88,0x88,0x88,0x00,0x20,0x40,0x68, - 0x98,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x10,0x68,0x98,0x88,0x88,0x88,0x88,0x88, - 0x00,0x50,0x20,0x68,0x98,0x88,0x88,0x88, - 0x88,0x88,0x00,0xd8,0x70,0x88,0x08,0x68, - 0x98,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x10,0xe0,0x40,0x58,0x64,0x44,0x44,0x44, - 0x64,0x58,0x40,0xc0,0x70,0x88,0x08,0x68, - 0x98,0x88,0x88,0x88,0x88,0x88,0x00,0xd8, -}; - -BMF_FontData BMF_font_scr14 = { - 0, -3, - 7, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 16, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 7, -1}, - {1, 9, -3, 0, 7, 0}, - {3, 4, -2, -5, 7, 9}, - {7, 9, 0, 0, 7, 13}, - {5, 10, -1, 1, 7, 22}, - {7, 9, 0, 0, 7, 32}, - {6, 9, 0, 0, 7, 41}, - {3, 4, -2, -5, 7, 50}, - {3, 11, -2, 1, 7, 54}, - {3, 11, -2, 1, 7, 65}, - {5, 6, -1, -2, 7, 76}, - {5, 5, -1, -2, 7, 82}, - {2, 4, -2, 2, 7, 87}, - {5, 1, -1, -4, 7, 91}, - {1, 2, -3, 0, 7, 92}, - {5, 10, -1, 0, 7, 94}, - {5, 9, -1, 0, 7, 104}, - {3, 9, -2, 0, 7, 113}, - {5, 9, -1, 0, 7, 122}, - {5, 9, -1, 0, 7, 131}, - {5, 9, -1, 0, 7, 140}, - {5, 9, -1, 0, 7, 149}, - {5, 9, -1, 0, 7, 158}, - {5, 9, -1, 0, 7, 167}, - {5, 9, -1, 0, 7, 176}, - {5, 9, -1, 0, 7, 185}, - {1, 6, -3, 0, 7, 194}, - {2, 8, -2, 1, 7, 200}, - {5, 9, -1, 0, 7, 208}, - {5, 3, -1, -3, 7, 217}, - {5, 9, -1, 0, 7, 220}, - {5, 9, -1, 0, 7, 229}, - {5, 9, -1, 0, 7, 238}, - {5, 9, -1, 0, 7, 247}, - {5, 9, -1, 0, 7, 256}, - {5, 9, -1, 0, 7, 265}, - {5, 9, -1, 0, 7, 274}, - {5, 9, -1, 0, 7, 283}, - {5, 9, -1, 0, 7, 292}, - {5, 9, -1, 0, 7, 301}, - {5, 9, -1, 0, 7, 310}, - {3, 9, -2, 0, 7, 319}, - {5, 9, -1, 0, 7, 328}, - {5, 9, -1, 0, 7, 337}, - {5, 9, -1, 0, 7, 346}, - {5, 9, -1, 0, 7, 355}, - {5, 9, -1, 0, 7, 364}, - {5, 9, -1, 0, 7, 373}, - {5, 9, -1, 0, 7, 382}, - {5, 11, -1, 2, 7, 391}, - {5, 9, -1, 0, 7, 402}, - {5, 9, -1, 0, 7, 411}, - {5, 9, -1, 0, 7, 420}, - {5, 9, -1, 0, 7, 429}, - {5, 9, -1, 0, 7, 438}, - {5, 9, -1, 0, 7, 447}, - {5, 9, -1, 0, 7, 456}, - {5, 9, -1, 0, 7, 465}, - {5, 9, -1, 0, 7, 474}, - {4, 11, -2, 1, 7, 483}, - {5, 10, -1, 0, 7, 494}, - {4, 11, -1, 1, 7, 504}, - {5, 3, -1, -6, 7, 515}, - {7, 1, 0, 2, 7, 518}, - {3, 4, -2, -5, 7, 519}, - {5, 7, -1, 0, 7, 523}, - {5, 9, -1, 0, 7, 530}, - {5, 7, -1, 0, 7, 539}, - {5, 9, -1, 0, 7, 546}, - {5, 7, -1, 0, 7, 555}, - {5, 9, -1, 0, 7, 562}, - {5, 10, -1, 3, 7, 571}, - {5, 9, -1, 0, 7, 581}, - {3, 9, -2, 0, 7, 590}, - {4, 12, -1, 3, 7, 599}, - {5, 9, -1, 0, 7, 611}, - {3, 9, -2, 0, 7, 620}, - {5, 7, -1, 0, 7, 629}, - {5, 7, -1, 0, 7, 636}, - {5, 7, -1, 0, 7, 643}, - {5, 10, -1, 3, 7, 650}, - {5, 10, -1, 3, 7, 660}, - {5, 7, -1, 0, 7, 670}, - {5, 7, -1, 0, 7, 677}, - {4, 9, -1, 0, 7, 684}, - {5, 7, -1, 0, 7, 693}, - {5, 7, -1, 0, 7, 700}, - {5, 7, -1, 0, 7, 707}, - {5, 7, -1, 0, 7, 714}, - {5, 10, -1, 3, 7, 721}, - {5, 7, -1, 0, 7, 731}, - {5, 12, -1, 2, 7, 738}, - {1, 12, -3, 2, 7, 750}, - {5, 12, -1, 2, 7, 762}, - {6, 3, 0, -3, 7, 774}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 9, -3, 2, 7, 777}, - {5, 10, -1, 0, 7, 786}, - {5, 9, -1, 0, 7, 796}, - {5, 6, -1, -3, 7, 805}, - {5, 9, -1, 0, 7, 811}, - {1, 12, -3, 2, 7, 820}, - {5, 11, -1, 2, 7, 832}, - {5, 1, -1, -8, 7, 843}, - {7, 9, 0, 0, 7, 844}, - {5, 7, -1, -2, 7, 853}, - {7, 7, 0, 0, 7, 860}, - {5, 3, -1, -3, 7, 867}, - {4, 1, -1, -4, 7, 870}, - {7, 9, 0, 0, 7, 871}, - {3, 1, -2, -8, 7, 880}, - {4, 4, -1, -4, 7, 881}, - {5, 7, -1, 0, 7, 885}, - {3, 5, -2, -5, 7, 892}, - {3, 5, -2, -5, 7, 897}, - {2, 2, -3, -8, 7, 902}, - {6, 8, -1, 2, 7, 904}, - {6, 10, 0, 1, 7, 912}, - {1, 2, -3, -3, 7, 922}, - {3, 3, -2, 3, 7, 924}, - {3, 5, -2, -5, 7, 927}, - {5, 7, -1, -2, 7, 932}, - {7, 7, 0, 0, 7, 939}, - {7, 10, 0, 0, 7, 946}, - {6, 11, 0, 1, 7, 956}, - {7, 9, 0, -1, 7, 967}, - {5, 10, -1, 3, 7, 976}, - {5, 11, -1, 0, 7, 986}, - {5, 11, -1, 0, 7, 997}, - {5, 11, -1, 0, 7, 1008}, - {5, 11, -1, 0, 7, 1019}, - {5, 10, -1, 0, 7, 1030}, - {5, 11, -1, 0, 7, 1040}, - {6, 9, 0, 0, 7, 1051}, - {5, 12, -1, 3, 7, 1060}, - {5, 11, -1, 0, 7, 1072}, - {5, 11, -1, 0, 7, 1083}, - {5, 11, -1, 0, 7, 1094}, - {5, 10, -1, 0, 7, 1105}, - {3, 11, -2, 0, 7, 1115}, - {3, 11, -2, 0, 7, 1126}, - {3, 11, -2, 0, 7, 1137}, - {5, 10, -1, 0, 7, 1148}, - {6, 9, 0, 0, 7, 1158}, - {5, 11, -1, 0, 7, 1167}, - {5, 11, -1, 0, 7, 1178}, - {5, 11, -1, 0, 7, 1189}, - {5, 11, -1, 0, 7, 1200}, - {5, 11, -1, 0, 7, 1211}, - {5, 10, -1, 0, 7, 1222}, - {5, 5, -1, -1, 7, 1232}, - {7, 9, 0, 0, 7, 1237}, - {5, 11, -1, 0, 7, 1246}, - {5, 11, -1, 0, 7, 1257}, - {5, 11, -1, 0, 7, 1268}, - {5, 10, -1, 0, 7, 1279}, - {5, 11, -1, 0, 7, 1289}, - {6, 9, 0, 0, 7, 1300}, - {5, 9, -1, 0, 7, 1309}, - {5, 10, -1, 0, 7, 1318}, - {5, 10, -1, 0, 7, 1328}, - {5, 10, -1, 0, 7, 1338}, - {5, 10, -1, 0, 7, 1348}, - {5, 9, -1, 0, 7, 1358}, - {5, 11, -1, 0, 7, 1367}, - {7, 7, 0, 0, 7, 1378}, - {5, 10, -1, 3, 7, 1385}, - {5, 10, -1, 0, 7, 1395}, - {5, 10, -1, 0, 7, 1405}, - {5, 10, -1, 0, 7, 1415}, - {5, 9, -1, 0, 7, 1425}, - {3, 10, -2, 0, 7, 1434}, - {4, 10, -2, 0, 7, 1444}, - {3, 10, -2, 0, 7, 1454}, - {5, 9, -2, 0, 7, 1464}, - {5, 11, -1, 0, 7, 1473}, - {5, 10, -1, 0, 7, 1484}, - {5, 10, -1, 0, 7, 1494}, - {5, 10, -1, 0, 7, 1504}, - {5, 10, -1, 0, 7, 1514}, - {5, 10, -1, 0, 7, 1524}, - {5, 9, -1, 0, 7, 1534}, - {7, 7, 0, 0, 7, 1543}, - {7, 7, 0, 0, 7, 1550}, - {5, 10, -1, 0, 7, 1557}, - {5, 10, -1, 0, 7, 1567}, - {5, 10, -1, 0, 7, 1577}, - {5, 9, -1, 0, 7, 1587}, - {5, 13, -1, 3, 7, 1596}, - {6, 11, 0, 2, 7, 1609}, - {5, 12, -1, 3, 7, 1620}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_scr15.cpp b/intern/bmfont/intern/BMF_font_scr15.cpp deleted file mode 100644 index 8490e999bdb..00000000000 --- a/intern/bmfont/intern/BMF_font_scr15.cpp +++ /dev/null @@ -1,525 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_SCR15 - -static unsigned char bitmap_data[]= { - 0x80,0x80,0x00,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x90,0x90,0x90,0x90,0x48,0x48, - 0x48,0xfe,0x24,0x24,0x24,0x7f,0x12,0x12, - 0x20,0x70,0xa8,0xa8,0x28,0x30,0x60,0xa0, - 0xa8,0xa8,0x70,0x20,0x8c,0x52,0x52,0x2c, - 0x10,0x10,0x68,0x94,0x94,0x62,0x72,0x8c, - 0x84,0x8a,0x50,0x20,0x30,0x48,0x48,0x30, - 0x80,0x40,0x60,0x60,0x10,0x20,0x40,0x40, - 0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x20, - 0x10,0x80,0x40,0x20,0x20,0x10,0x10,0x10, - 0x10,0x10,0x20,0x20,0x40,0x80,0x20,0xa8, - 0x70,0x70,0xa8,0x20,0x10,0x10,0x10,0xfe, - 0x10,0x10,0x10,0x80,0x40,0x20,0x60,0x60, - 0xfc,0xc0,0xc0,0x80,0x80,0x40,0x40,0x20, - 0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x78, - 0x84,0x84,0xc4,0xa4,0x94,0x8c,0x84,0x84, - 0x78,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0xc0,0x40,0xfc,0x80,0x40,0x20,0x10, - 0x08,0x04,0x84,0x84,0x78,0x78,0x84,0x04, - 0x04,0x04,0x38,0x04,0x04,0x84,0x78,0x08, - 0x08,0x08,0xfc,0x88,0x48,0x48,0x28,0x18, - 0x08,0x78,0x84,0x04,0x04,0x04,0xf8,0x80, - 0x80,0x80,0xfc,0x78,0x84,0x84,0x84,0x84, - 0xf8,0x80,0x80,0x84,0x78,0x20,0x20,0x20, - 0x10,0x10,0x08,0x08,0x04,0x04,0xfc,0x78, - 0x84,0x84,0x84,0x84,0x78,0x84,0x84,0x84, - 0x78,0x78,0x84,0x04,0x04,0x7c,0x84,0x84, - 0x84,0x84,0x78,0xc0,0xc0,0x00,0x00,0x00, - 0xc0,0xc0,0x80,0x40,0xc0,0xc0,0x00,0x00, - 0x00,0xc0,0xc0,0x04,0x08,0x10,0x20,0x40, - 0x80,0x40,0x20,0x10,0x08,0x04,0xfc,0x00, - 0x00,0xfc,0x80,0x40,0x20,0x10,0x08,0x04, - 0x08,0x10,0x20,0x40,0x80,0x10,0x10,0x00, - 0x10,0x10,0x08,0x04,0x84,0x84,0x78,0x38, - 0x44,0x80,0x98,0xa4,0xa4,0x9c,0x84,0x48, - 0x30,0x84,0x84,0xfc,0x84,0x48,0x48,0x48, - 0x30,0x30,0x30,0xf8,0x84,0x84,0x84,0x84, - 0xf8,0x84,0x84,0x84,0xf8,0x78,0x84,0x84, - 0x80,0x80,0x80,0x80,0x84,0x84,0x78,0xf0, - 0x88,0x84,0x84,0x84,0x84,0x84,0x84,0x88, - 0xf0,0xfc,0x80,0x80,0x80,0x80,0xf8,0x80, - 0x80,0x80,0xfc,0x80,0x80,0x80,0x80,0x80, - 0xf8,0x80,0x80,0x80,0xfc,0x74,0x8c,0x84, - 0x84,0x84,0x9c,0x80,0x80,0x84,0x78,0x84, - 0x84,0x84,0x84,0x84,0xfc,0x84,0x84,0x84, - 0x84,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x70,0x88,0x88,0x08,0x08, - 0x08,0x08,0x08,0x08,0x08,0x84,0x84,0x88, - 0x90,0xa0,0xc0,0xa0,0x90,0x88,0x84,0xfc, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x82,0x82,0x92,0x92,0xaa,0xaa,0xc6, - 0xc6,0x82,0x82,0x84,0x8c,0x8c,0x94,0x94, - 0xa4,0xa4,0xc4,0xc4,0x84,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x78,0x80, - 0x80,0x80,0x80,0xf8,0x84,0x84,0x84,0x84, - 0xf8,0x04,0x08,0x10,0x78,0xa4,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x78,0x84,0x84, - 0x88,0x90,0xf8,0x84,0x84,0x84,0x84,0xf8, - 0x78,0x84,0x84,0x04,0x18,0x60,0x80,0x84, - 0x84,0x78,0x10,0x10,0x10,0x10,0x10,0x10, - 0x10,0x10,0x10,0xfe,0x78,0x84,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x30,0x30, - 0x30,0x48,0x48,0x48,0x84,0x84,0x84,0x84, - 0x44,0x44,0x44,0xaa,0xaa,0xaa,0x92,0x92, - 0x92,0x82,0x84,0x84,0x48,0x48,0x30,0x30, - 0x48,0x48,0x84,0x84,0x10,0x10,0x10,0x10, - 0x10,0x28,0x44,0x44,0x82,0x82,0xfc,0x80, - 0x40,0x40,0x20,0x10,0x08,0x08,0x04,0xfc, - 0xf0,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0xf0,0x04,0x04,0x08, - 0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x80, - 0x80,0xf0,0x10,0x10,0x10,0x10,0x10,0x10, - 0x10,0x10,0x10,0x10,0x10,0xf0,0x88,0x50, - 0x20,0xff,0x20,0x40,0xc0,0xc0,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0xb8,0xc4,0x84, - 0x84,0x84,0xc4,0xb8,0x80,0x80,0x80,0x78, - 0x84,0x80,0x80,0x80,0x84,0x78,0x74,0x8c, - 0x84,0x84,0x84,0x8c,0x74,0x04,0x04,0x04, - 0x78,0x84,0x80,0xfc,0x84,0x84,0x78,0x20, - 0x20,0x20,0x20,0x20,0x20,0xf8,0x20,0x20, - 0x1c,0x78,0x84,0x04,0x04,0x74,0x8c,0x84, - 0x84,0x84,0x8c,0x74,0x84,0x84,0x84,0x84, - 0x84,0xc4,0xb8,0x80,0x80,0x80,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0x20,0x20, - 0x70,0x88,0x08,0x08,0x08,0x08,0x08,0x08, - 0x08,0x08,0x38,0x00,0x08,0x08,0x84,0x88, - 0x90,0xe0,0xa0,0x90,0x88,0x80,0x80,0x80, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0xe0,0x92,0x92,0x92,0x92,0x92,0x92, - 0xec,0x84,0x84,0x84,0x84,0x84,0xc4,0xb8, - 0x78,0x84,0x84,0x84,0x84,0x84,0x78,0x80, - 0x80,0x80,0x80,0xb8,0xc4,0x84,0x84,0x84, - 0xc4,0xb8,0x04,0x04,0x04,0x04,0x74,0x8c, - 0x84,0x84,0x84,0x8c,0x74,0x80,0x80,0x80, - 0x80,0x80,0xc4,0xb8,0x78,0x84,0x04,0x78, - 0x80,0x84,0x78,0x1c,0x20,0x20,0x20,0x20, - 0x20,0xf8,0x20,0x20,0x74,0x8c,0x84,0x84, - 0x84,0x84,0x84,0x30,0x30,0x48,0x48,0x84, - 0x84,0x84,0x6c,0x92,0x92,0x92,0x92,0x82, - 0x82,0x84,0x84,0x48,0x30,0x48,0x84,0x84, - 0x78,0x84,0x04,0x04,0x74,0x8c,0x84,0x84, - 0x84,0x84,0x84,0xfc,0x80,0x40,0x20,0x10, - 0x08,0xfc,0x1c,0x20,0x20,0x20,0x20,0x20, - 0xc0,0x20,0x20,0x20,0x20,0x20,0x1c,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xe0,0x10,0x10, - 0x10,0x10,0x10,0x0c,0x10,0x10,0x10,0x10, - 0x10,0xe0,0x98,0xb4,0x64,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x80,0x20, - 0x20,0x70,0x88,0x80,0x80,0x88,0x70,0x20, - 0x20,0xb8,0x44,0x40,0x40,0xf0,0x40,0x40, - 0x40,0x48,0x30,0x84,0x78,0x84,0x84,0x84, - 0x78,0x84,0x38,0x10,0x7c,0x10,0x7c,0x28, - 0x44,0x44,0x82,0x82,0x80,0x80,0x80,0x80, - 0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x80, - 0x80,0x80,0x78,0x84,0x04,0x18,0x24,0x44, - 0x84,0x88,0x90,0x60,0x80,0x84,0x78,0xd8, - 0x38,0x44,0x92,0xaa,0xa2,0xaa,0x92,0x44, - 0x38,0xf8,0x00,0x68,0x90,0x70,0x10,0x60, - 0x09,0x12,0x24,0x48,0x90,0x48,0x24,0x12, - 0x09,0x04,0x04,0xfc,0xfc,0x38,0x44,0xaa, - 0xaa,0xb2,0xaa,0xb2,0x44,0x38,0xf0,0x60, - 0x90,0x90,0x60,0xfe,0x00,0x10,0x10,0x10, - 0xfe,0x10,0x10,0x10,0xf0,0x40,0x20,0x90, - 0x60,0xe0,0x10,0x60,0x10,0xe0,0x80,0x40, - 0x80,0x80,0x80,0xb4,0xc8,0x88,0x88,0x88, - 0x88,0x88,0x24,0x24,0x24,0x24,0x24,0x24, - 0x64,0xa4,0xa4,0xa4,0xa4,0x7e,0xc0,0xc0, - 0x20,0x40,0xe0,0x40,0x40,0xc0,0x40,0xf8, - 0x00,0x70,0x88,0x88,0x88,0x70,0x90,0x48, - 0x24,0x12,0x09,0x12,0x24,0x48,0x90,0x04, - 0x9e,0x54,0x2c,0x14,0xe8,0x44,0x42,0xc0, - 0x40,0x1e,0x08,0x84,0x52,0x2c,0x10,0xe8, - 0x44,0x42,0xc0,0x40,0x04,0x9e,0x54,0x2c, - 0xd4,0x28,0x44,0x22,0xc0,0x78,0x84,0x84, - 0x80,0x40,0x20,0x20,0x00,0x20,0x20,0x84, - 0x84,0xfc,0x84,0x48,0x48,0x30,0x30,0x00, - 0x20,0x40,0x84,0x84,0xfc,0x84,0x48,0x48, - 0x30,0x30,0x00,0x10,0x08,0x84,0x84,0xfc, - 0x84,0x48,0x48,0x30,0x30,0x00,0x48,0x30, - 0x84,0x84,0xfc,0x84,0x48,0x48,0x30,0x30, - 0x00,0x98,0x64,0x84,0x84,0xfc,0x84,0x48, - 0x48,0x30,0x30,0x00,0x6c,0x84,0x84,0xfc, - 0x84,0x48,0x48,0x30,0x30,0x30,0x48,0x30, - 0x9e,0x90,0x90,0xf0,0x90,0x5c,0x50,0x50, - 0x30,0x1e,0x30,0x08,0x10,0x78,0x84,0x84, - 0x80,0x80,0x80,0x80,0x84,0x84,0x78,0xfc, - 0x80,0x80,0x80,0xf8,0x80,0x80,0xfc,0x00, - 0x20,0x40,0xfc,0x80,0x80,0x80,0xf8,0x80, - 0x80,0xfc,0x00,0x10,0x08,0xfc,0x80,0x80, - 0x80,0xf8,0x80,0x80,0xfc,0x00,0x48,0x30, - 0xfc,0x80,0x80,0x80,0xf8,0x80,0x80,0xfc, - 0x00,0x6c,0xe0,0x40,0x40,0x40,0x40,0x40, - 0x40,0xe0,0x00,0x40,0x80,0xe0,0x40,0x40, - 0x40,0x40,0x40,0x40,0xe0,0x00,0x40,0x20, - 0xe0,0x40,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x00,0x90,0x60,0x70,0x20,0x20,0x20,0x20, - 0x20,0x20,0x70,0x00,0xd8,0x78,0x44,0x42, - 0x42,0x42,0xf2,0x42,0x42,0x44,0x78,0x84, - 0x8c,0x94,0x94,0xa4,0xa4,0xc4,0x84,0x00, - 0x98,0x64,0x78,0x84,0x84,0x84,0x84,0x84, - 0x84,0x78,0x00,0x20,0x40,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x78,0x00,0x10,0x08, - 0x78,0x84,0x84,0x84,0x84,0x84,0x84,0x78, - 0x00,0x48,0x30,0x78,0x84,0x84,0x84,0x84, - 0x84,0x84,0x78,0x00,0x98,0x64,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x78,0x00,0x6c, - 0x84,0x48,0x30,0x30,0x48,0x84,0xbc,0x42, - 0x62,0x52,0x52,0x4a,0x4a,0x46,0x42,0x3d, - 0x78,0x84,0x84,0x84,0x84,0x84,0x84,0x84, - 0x00,0x20,0x40,0x78,0x84,0x84,0x84,0x84, - 0x84,0x84,0x84,0x00,0x10,0x08,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x48, - 0x30,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x00,0x6c,0x10,0x10,0x10,0x10,0x28, - 0x44,0x44,0x82,0x00,0x10,0x08,0xe0,0x40, - 0x7c,0x42,0x42,0x42,0x42,0x7c,0x40,0xe0, - 0x98,0xa4,0x84,0x84,0x84,0x88,0xb0,0x88, - 0x88,0x70,0x74,0x88,0x88,0x78,0x08,0x88, - 0x70,0x00,0x20,0x40,0x74,0x88,0x88,0x78, - 0x08,0x88,0x70,0x00,0x20,0x10,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0x00,0x48,0x30, - 0x74,0x88,0x88,0x78,0x08,0x88,0x70,0x00, - 0x98,0x64,0x74,0x88,0x88,0x78,0x08,0x88, - 0x70,0x00,0xd8,0x74,0x88,0x88,0x78,0x08, - 0x88,0x70,0x00,0x30,0x48,0x30,0x6c,0x92, - 0x90,0x7e,0x12,0x92,0x6c,0x30,0x08,0x10, - 0x78,0x84,0x80,0x80,0x80,0x84,0x78,0x78, - 0x84,0x80,0xfc,0x84,0x84,0x78,0x00,0x20, - 0x40,0x78,0x84,0x80,0xfc,0x84,0x84,0x78, - 0x00,0x10,0x08,0x78,0x84,0x80,0xfc,0x84, - 0x84,0x78,0x00,0x48,0x30,0x78,0x84,0x80, - 0xfc,0x84,0x84,0x78,0x00,0x6c,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0x40,0x80, - 0x20,0x20,0x20,0x20,0x20,0x20,0xe0,0x00, - 0x40,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x00,0x90,0x60,0x10,0x10,0x10,0x10, - 0x10,0x10,0x70,0x00,0xd8,0x78,0x84,0x84, - 0x84,0x84,0x84,0x7c,0x04,0xc8,0x30,0xc8, - 0x84,0x84,0x84,0x84,0x84,0xc4,0xb8,0x00, - 0x98,0x64,0x78,0x84,0x84,0x84,0x84,0x84, - 0x78,0x00,0x20,0x40,0x78,0x84,0x84,0x84, - 0x84,0x84,0x78,0x00,0x10,0x08,0x78,0x84, - 0x84,0x84,0x84,0x84,0x78,0x00,0x48,0x30, - 0x78,0x84,0x84,0x84,0x84,0x84,0x78,0x00, - 0x98,0x64,0x78,0x84,0x84,0x84,0x84,0x84, - 0x78,0x00,0x00,0x6c,0x30,0x00,0x00,0xfc, - 0x00,0x00,0x30,0xbc,0x62,0x52,0x4a,0x46, - 0x42,0x3d,0x74,0x8c,0x84,0x84,0x84,0x84, - 0x84,0x00,0x20,0x40,0x74,0x8c,0x84,0x84, - 0x84,0x84,0x84,0x00,0x20,0x10,0x74,0x8c, - 0x84,0x84,0x84,0x84,0x84,0x00,0x48,0x30, - 0x74,0x8c,0x84,0x84,0x84,0x84,0x84,0x00, - 0x00,0x6c,0x78,0x84,0x04,0x04,0x74,0x8c, - 0x84,0x84,0x84,0x84,0x84,0x00,0x20,0x10, - 0xe0,0x40,0x40,0x5c,0x62,0x42,0x42,0x42, - 0x62,0x5c,0x40,0x40,0xc0,0x78,0x84,0x04, - 0x04,0x74,0x8c,0x84,0x84,0x84,0x84,0x84, - 0x00,0x00,0x6c, -}; - -BMF_FontData BMF_font_scr15 = { - 0, -4, - 8, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 20, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 8, -1}, - {1, 10, -3, 0, 8, 0}, - {4, 4, -2, -6, 8, 10}, - {8, 10, 0, 0, 8, 14}, - {5, 12, -1, 1, 8, 24}, - {7, 10, 0, 0, 8, 36}, - {7, 10, 0, 0, 8, 46}, - {3, 4, -2, -6, 8, 56}, - {4, 13, -2, 2, 8, 60}, - {4, 13, -2, 2, 8, 73}, - {5, 6, -1, -2, 8, 86}, - {7, 7, 0, -1, 8, 92}, - {3, 5, -2, 3, 8, 99}, - {6, 1, -1, -4, 8, 104}, - {2, 2, -3, 0, 8, 105}, - {6, 12, -1, 1, 8, 107}, - {6, 10, -1, 0, 8, 119}, - {3, 10, -3, 0, 8, 129}, - {6, 10, -1, 0, 8, 139}, - {6, 10, -1, 0, 8, 149}, - {6, 10, -1, 0, 8, 159}, - {6, 10, -1, 0, 8, 169}, - {6, 10, -1, 0, 8, 179}, - {6, 10, -1, 0, 8, 189}, - {6, 10, -1, 0, 8, 199}, - {6, 10, -1, 0, 8, 209}, - {2, 7, -3, 0, 8, 219}, - {2, 9, -3, 2, 8, 226}, - {6, 11, -1, 1, 8, 235}, - {6, 4, -1, -3, 8, 246}, - {6, 11, -1, 1, 8, 250}, - {6, 10, -1, 0, 8, 261}, - {6, 10, -1, 0, 8, 271}, - {6, 10, -1, 0, 8, 281}, - {6, 10, -1, 0, 8, 291}, - {6, 10, -1, 0, 8, 301}, - {6, 10, -1, 0, 8, 311}, - {6, 10, -1, 0, 8, 321}, - {6, 10, -1, 0, 8, 331}, - {6, 10, -1, 0, 8, 341}, - {6, 10, -1, 0, 8, 351}, - {3, 10, -2, 0, 8, 361}, - {5, 10, -1, 0, 8, 371}, - {6, 10, -1, 0, 8, 381}, - {6, 10, -1, 0, 8, 391}, - {7, 10, 0, 0, 8, 401}, - {6, 10, -1, 0, 8, 411}, - {6, 10, -1, 0, 8, 421}, - {6, 10, -1, 0, 8, 431}, - {6, 13, -1, 3, 8, 441}, - {6, 10, -1, 0, 8, 454}, - {6, 10, -1, 0, 8, 464}, - {7, 10, 0, 0, 8, 474}, - {6, 10, -1, 0, 8, 484}, - {6, 10, -1, 0, 8, 494}, - {7, 10, 0, 0, 8, 504}, - {6, 10, -1, 0, 8, 514}, - {7, 10, 0, 0, 8, 524}, - {6, 10, -1, 0, 8, 534}, - {4, 13, -2, 2, 8, 544}, - {6, 12, -1, 1, 8, 557}, - {4, 13, -2, 2, 8, 569}, - {5, 3, -1, -6, 8, 582}, - {8, 1, 0, 3, 8, 585}, - {3, 4, -2, -6, 8, 586}, - {6, 7, -1, 0, 8, 590}, - {6, 10, -1, 0, 8, 597}, - {6, 7, -1, 0, 8, 607}, - {6, 10, -1, 0, 8, 614}, - {6, 7, -1, 0, 8, 624}, - {6, 10, -1, 0, 8, 631}, - {6, 11, -1, 4, 8, 641}, - {6, 10, -1, 0, 8, 652}, - {3, 10, -2, 0, 8, 662}, - {5, 14, -1, 4, 8, 672}, - {6, 10, -1, 0, 8, 686}, - {3, 10, -2, 0, 8, 696}, - {7, 7, 0, 0, 8, 706}, - {6, 7, -1, 0, 8, 713}, - {6, 7, -1, 0, 8, 720}, - {6, 11, -1, 4, 8, 727}, - {6, 11, -1, 4, 8, 738}, - {6, 7, -1, 0, 8, 749}, - {6, 7, -1, 0, 8, 756}, - {6, 9, -1, 0, 8, 763}, - {6, 7, -1, 0, 8, 772}, - {6, 7, -1, 0, 8, 779}, - {7, 7, 0, 0, 8, 786}, - {6, 7, -1, 0, 8, 793}, - {6, 11, -1, 4, 8, 800}, - {6, 7, -1, 0, 8, 811}, - {6, 13, -1, 2, 8, 818}, - {1, 14, -3, 3, 8, 831}, - {6, 13, -1, 2, 8, 845}, - {6, 3, -1, -3, 8, 858}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 8, -1}, - {1, 10, -3, 3, 8, 861}, - {5, 10, -1, 0, 8, 871}, - {6, 10, -1, 0, 8, 881}, - {6, 7, -1, -2, 8, 891}, - {7, 10, 0, 0, 8, 898}, - {1, 14, -3, 3, 8, 908}, - {6, 13, -1, 3, 8, 922}, - {5, 1, -1, -9, 8, 935}, - {7, 9, 0, 0, 8, 936}, - {5, 7, -1, -3, 8, 945}, - {8, 9, 0, 0, 8, 952}, - {6, 3, -1, -3, 8, 961}, - {6, 1, -1, -4, 8, 964}, - {7, 9, 0, 0, 8, 965}, - {4, 1, -2, -9, 8, 974}, - {4, 4, -2, -4, 8, 975}, - {7, 9, 0, 0, 8, 979}, - {4, 5, -2, -5, 8, 988}, - {4, 5, -2, -5, 8, 993}, - {2, 2, -3, -9, 8, 998}, - {6, 10, -1, 3, 8, 1000}, - {7, 12, 0, 2, 8, 1010}, - {2, 1, -3, -4, 8, 1022}, - {3, 3, -3, 3, 8, 1023}, - {3, 5, -3, -5, 8, 1026}, - {5, 7, -1, -3, 8, 1031}, - {8, 9, 0, 0, 8, 1038}, - {7, 10, 0, 0, 8, 1047}, - {7, 11, 0, 1, 8, 1057}, - {7, 9, 0, -1, 8, 1068}, - {6, 10, -1, 2, 8, 1077}, - {6, 11, -1, 0, 8, 1087}, - {6, 11, -1, 0, 8, 1098}, - {6, 11, -1, 0, 8, 1109}, - {6, 11, -1, 0, 8, 1120}, - {6, 10, -1, 0, 8, 1131}, - {6, 11, -1, 0, 8, 1141}, - {7, 10, 0, 0, 8, 1152}, - {6, 13, -1, 3, 8, 1162}, - {6, 11, -1, 0, 8, 1175}, - {6, 11, -1, 0, 8, 1186}, - {6, 11, -1, 0, 8, 1197}, - {6, 10, -1, 0, 8, 1208}, - {3, 11, -2, 0, 8, 1218}, - {3, 11, -2, 0, 8, 1229}, - {4, 11, -2, 0, 8, 1240}, - {5, 10, -1, 0, 8, 1251}, - {7, 10, 0, 0, 8, 1261}, - {6, 11, -1, 0, 8, 1271}, - {6, 11, -1, 0, 8, 1282}, - {6, 11, -1, 0, 8, 1293}, - {6, 11, -1, 0, 8, 1304}, - {6, 11, -1, 0, 8, 1315}, - {6, 10, -1, 0, 8, 1326}, - {6, 6, -1, -1, 8, 1336}, - {8, 10, 0, 0, 8, 1342}, - {6, 11, -1, 0, 8, 1352}, - {6, 11, -1, 0, 8, 1363}, - {6, 11, -1, 0, 8, 1374}, - {6, 10, -1, 0, 8, 1385}, - {7, 11, 0, 0, 8, 1395}, - {7, 10, 0, 0, 8, 1406}, - {6, 10, -1, 0, 8, 1416}, - {6, 10, -1, 0, 8, 1426}, - {6, 10, -1, 0, 8, 1436}, - {6, 10, -1, 0, 8, 1446}, - {6, 10, -1, 0, 8, 1456}, - {6, 9, -1, 0, 8, 1466}, - {6, 11, -1, 0, 8, 1475}, - {7, 7, 0, 0, 8, 1486}, - {6, 10, -1, 3, 8, 1493}, - {6, 10, -1, 0, 8, 1503}, - {6, 10, -1, 0, 8, 1513}, - {6, 10, -1, 0, 8, 1523}, - {6, 9, -1, 0, 8, 1533}, - {3, 10, -2, 0, 8, 1542}, - {3, 10, -2, 0, 8, 1552}, - {4, 10, -2, 0, 8, 1562}, - {5, 9, -1, 0, 8, 1572}, - {6, 11, -1, 0, 8, 1581}, - {6, 10, -1, 0, 8, 1592}, - {6, 10, -1, 0, 8, 1602}, - {6, 10, -1, 0, 8, 1612}, - {6, 10, -1, 0, 8, 1622}, - {6, 10, -1, 0, 8, 1632}, - {6, 10, -1, 0, 8, 1642}, - {6, 7, -1, 0, 8, 1652}, - {8, 7, 0, 0, 8, 1659}, - {6, 10, -1, 0, 8, 1666}, - {6, 10, -1, 0, 8, 1676}, - {6, 10, -1, 0, 8, 1686}, - {6, 10, -1, 0, 8, 1696}, - {6, 14, -1, 4, 8, 1706}, - {7, 13, 0, 3, 8, 1720}, - {6, 14, -1, 4, 8, 1733}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/Makefile b/intern/bmfont/intern/Makefile deleted file mode 100644 index f420cfcf1e6..00000000000 --- a/intern/bmfont/intern/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# bmfont intern Makefile -# - -LIBNAME = bmfont -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I. -CPPFLAGS += -I.. -CPPFLAGS += -I$(OPENGL_HEADERS) - diff --git a/intern/bmfont/make/msvc_6_0/bmfont.dsp b/intern/bmfont/make/msvc_6_0/bmfont.dsp deleted file mode 100644 index b7ff7774fa1..00000000000 --- a/intern/bmfont/make/msvc_6_0/bmfont.dsp +++ /dev/null @@ -1,176 +0,0 @@ -# Microsoft Developer Studio Project File - Name="bmfont" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=bmfont - 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 "bmfont.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 "bmfont.mak" CFG="bmfont - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "bmfont - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "bmfont - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "bmfont - 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 "..\..\..\..\obj\windows\intern\bmfont"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bmfont"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /I "../../intern" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /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
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bmfont\libbmfont.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Copying BMFONT files library (release target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\bmfont\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\bmfont\*.lib ..\..\..\..\..\lib\windows\bmfont\lib\*.a ECHO Done
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "bmfont - 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 "..\..\..\..\obj\windows\intern\bmfont\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bmfont\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../.." /I "../../intern" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /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
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bmfont\debug\libbmfont.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Copying BMFONT files library (debug target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\bmfont\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\bmfont\debug\*.lib ..\..\..\..\..\lib\windows\bmfont\lib\debug\*.a ECHO Done
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "bmfont - Win32 Release"
-# Name "bmfont - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_Api.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_BitmapFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_helv10.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_helv12.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_helvb10.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_helvb12.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_helvb14.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_helvb8.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_scr12.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_scr14.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_font_scr15.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_BitmapFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BMF_FontData.h
-# End Source File
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\BMF_Api.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\BMF_Fonts.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\BMF_Settings.h
-# End Source File
-# End Group
-# End Group
-# End Target
-# End Project
diff --git a/intern/bmfont/make/msvc_6_0/bmfont.dsw b/intern/bmfont/make/msvc_6_0/bmfont.dsw deleted file mode 100644 index 265738bc0fe..00000000000 --- a/intern/bmfont/make/msvc_6_0/bmfont.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "bmfont"=.\bmfont.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/intern/bmfont/make/msvc_7_0/bmfont.sln b/intern/bmfont/make/msvc_7_0/bmfont.sln deleted file mode 100644 index 7f1979a8273..00000000000 --- a/intern/bmfont/make/msvc_7_0/bmfont.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmfont", "bmfont.vcproj", "{8CDFE9DC-F28C-4E1F-9389-3066BB0AB09F}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {8CDFE9DC-F28C-4E1F-9389-3066BB0AB09F}.Debug.ActiveCfg = Debug|Win32 - {8CDFE9DC-F28C-4E1F-9389-3066BB0AB09F}.Debug.Build.0 = Debug|Win32 - {8CDFE9DC-F28C-4E1F-9389-3066BB0AB09F}.Release.ActiveCfg = Release|Win32 - {8CDFE9DC-F28C-4E1F-9389-3066BB0AB09F}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/intern/bmfont/make/msvc_7_0/bmfont.vcproj b/intern/bmfont/make/msvc_7_0/bmfont.vcproj deleted file mode 100644 index 089130bc5e0..00000000000 --- a/intern/bmfont/make/msvc_7_0/bmfont.vcproj +++ /dev/null @@ -1,314 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="bmfont" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\bmfont" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\bmfont" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..;..\..\intern" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\bmfont\bmfont.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\bmfont\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\bmfont\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\bmfont\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libbmfont.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying BMFONT files library to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\bmfont\include MKDIR ..\..\..\..\..\build\msvc_7\intern\bmfont\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\bmfont\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\bmfont\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\bmfont\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..;..\..\intern" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\bmfont\debug\bmfont.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\bmfont\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\bmfont\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\bmfont\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libbmfont.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying BMFONT files library (debug target) to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\bmfont\include MKDIR ..\..\..\..\..\build\msvc_7\intern\bmfont\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\bmfont\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\bmfont\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\bmfont\mtdll" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..;..\..\intern" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\bmfont\mtdll\bmfont.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\bmfont\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\bmfont\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\bmfont\mtdll\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libbmfont.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying BMFONT files library to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\bmfont\include MKDIR ..\..\..\..\..\build\msvc_7\intern\bmfont\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\bmfont\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\bmfont\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\bmfont\mtdll\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..;..\..\intern" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\bmfont\mtdll\debug\bmfont.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\bmfont\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\bmfont\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\bmfont\mtdll\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libbmfont.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying BMFONT files library (debug target) to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\bmfont\include MKDIR ..\..\..\..\..\build\msvc_7\intern\bmfont\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\bmfont\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> - <File - RelativePath="..\..\intern\BMF_Api.cpp"> - </File> - <File - RelativePath="..\..\intern\BMF_BitmapFont.cpp"> - </File> - <File - RelativePath="..\..\intern\BMF_font_helv10.cpp"> - </File> - <File - RelativePath="..\..\intern\BMF_font_helv12.cpp"> - </File> - <File - RelativePath="..\..\intern\BMF_font_helvb10.cpp"> - </File> - <File - RelativePath="..\..\intern\BMF_font_helvb12.cpp"> - </File> - <File - RelativePath="..\..\intern\BMF_font_helvb14.cpp"> - </File> - <File - RelativePath="..\..\intern\BMF_font_helvb8.cpp"> - </File> - <File - RelativePath="..\..\intern\BMF_font_scr12.cpp"> - </File> - <File - RelativePath="..\..\intern\BMF_font_scr14.cpp"> - </File> - <File - RelativePath="..\..\intern\BMF_font_scr15.cpp"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> - <Filter - Name="intern" - Filter=""> - <File - RelativePath="..\..\intern\BMF_BitmapFont.h"> - </File> - <File - RelativePath="..\..\intern\BMF_FontData.h"> - </File> - </Filter> - <Filter - Name="extern" - Filter=""> - <File - RelativePath="..\..\BMF_Api.h"> - </File> - <File - RelativePath="..\..\BMF_Fonts.h"> - </File> - <File - RelativePath="..\..\BMF_Settings.h"> - </File> - </Filter> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/bmfont/make/msvc_9_0/bmfont.vcproj b/intern/bmfont/make/msvc_9_0/bmfont.vcproj deleted file mode 100644 index 91d6e6afc1a..00000000000 --- a/intern/bmfont/make/msvc_9_0/bmfont.vcproj +++ /dev/null @@ -1,413 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_bmfont"
- ProjectGUID="{E784098D-3ED8-433A-9353-9679415DDDC5}"
- RootNamespace="bmfont"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\bmfont"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\bmfont"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..;..\..\intern"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\bmfont\bmfont.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\bmfont\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\bmfont\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\bmfont\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libbmfont.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying BMFONT files library to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\bmfont\include MKDIR ..\..\..\..\..\build\msvc_9\intern\bmfont\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\bmfont\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\bmfont\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\bmfont\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\intern"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\bmfont\debug\bmfont.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\bmfont\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\bmfont\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\bmfont\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libbmfont.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying BMFONT files library (debug target) to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\bmfont\include MKDIR ..\..\..\..\..\build\msvc_9\intern\bmfont\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\bmfont\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\bmfont\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\bmfont\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..;..\..\intern"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\bmfont\mtdll\bmfont.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\bmfont\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\bmfont\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\bmfont\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libbmfont.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying BMFONT files library to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\bmfont\include MKDIR ..\..\..\..\..\build\msvc_9\intern\bmfont\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\bmfont\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\bmfont\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\bmfont\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\intern"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\bmfont\mtdll\debug\bmfont.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\bmfont\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\bmfont\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\bmfont\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libbmfont.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying BMFONT files library (debug target) to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\bmfont\include MKDIR ..\..\..\..\..\build\msvc_9\intern\bmfont\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\bmfont\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\intern\BMF_Api.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BMF_BitmapFont.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BMF_font_helv10.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BMF_font_helv12.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BMF_font_helvb10.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BMF_font_helvb12.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BMF_font_helvb14.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BMF_font_helvb8.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BMF_font_scr12.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BMF_font_scr14.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BMF_font_scr15.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <Filter
- Name="intern"
- >
- <File
- RelativePath="..\..\intern\BMF_BitmapFont.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BMF_FontData.h"
- >
- </File>
- </Filter>
- <Filter
- Name="extern"
- >
- <File
- RelativePath="..\..\BMF_Api.h"
- >
- </File>
- <File
- RelativePath="..\..\BMF_Fonts.h"
- >
- </File>
- <File
- RelativePath="..\..\BMF_Settings.h"
- >
- </File>
- </Filter>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/bmfont/test/Makefile b/intern/bmfont/test/Makefile deleted file mode 100644 index 135db74f38b..00000000000 --- a/intern/bmfont/test/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# Test the bmfont module -# - -LIBNAME = bmfont -SOURCEDIR = intern/$(LIBNAME)/test -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = simpletest - -include nan_subdirs.mk -include nan_compile.mk -include nan_link.mk - -TESTLIBS = $(OCGDIR)/intern/$(LIBNAME)/$(DEBUG_DIR)lib$(LIBNAME).a -TESTLIBS += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a -TESTLIBS += $(LCGDIR)/ghost/$(DEBUG_DIR)lib/libghost.a - - -ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd")) - TESTLIBS += -L/usr/X11R6/lib -lglut -pthread -endif - -ifeq ($(OS),$(findstring $(OS), "solaris")) - TESTLIBS += -L/usr/openwin/lib -lglut -lX11 -lGL -lGLU -lXmu -endif - - -all debug:: - @echo "****> linking $@ in $(SOURCEDIR)" - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)BMF_Test $(DIR)/BMF_Test.o $(TESTLIBS) - -clean:: - $(RM) $(DIR)/BMF_Test $(DIR)/debug/BMF_Test - -test:: $(DIR)/BMF_Test - $(DIR)/BMF_Test $(NAN_TEST_VERBOSITY) - diff --git a/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp b/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp deleted file mode 100644 index d178f5b4dc1..00000000000 --- a/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp +++ /dev/null @@ -1,109 +0,0 @@ -# Microsoft Developer Studio Project File - Name="BMF_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=BMF_Test - 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 "BMF_Test.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 "BMF_Test.mak" CFG="BMF_Test - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "BMF_Test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "BMF_Test - 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)" == "BMF_Test - 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 "../../../../../../obj/windows/intern/BMF_bmfont/test"
-# PROP Intermediate_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../" /I "../../../../../lib/windows/string/include" /I "../../../../../lib/windows/ghost/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /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 winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libstring.a libghost.a glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../../../lib/windows/string/lib" /libpath:"../../../../../lib/windows/ghost/lib"
-
-!ELSEIF "$(CFG)" == "BMF_Test - 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 "../../../../../../obj/windows/intern/BMF_bmfont/test/debug"
-# PROP Intermediate_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test/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" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../" /I "../../../../../lib/windows/string/include" /I "../../../../../lib/windows/ghost/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /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 glu32.lib opengl32.lib libstring.a libghost.a user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../../lib/windows/string/lib" /libpath:"../../../../../lib/windows/ghost/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "BMF_Test - Win32 Release"
-# Name "BMF_Test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\intern\BMF_glut_helb8.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\intern\BMF_glut_helb8.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\BMF_Test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw b/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw deleted file mode 100644 index 321de497224..00000000000 --- a/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "BMF_Test"=.\BMF_Test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name BMF_bmfont
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "BMF_bmfont"=..\..\..\make\msvc_6_0\BMF_bmfont.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/intern/bmfont/test/simpletest/BMF_Test.cpp b/intern/bmfont/test/simpletest/BMF_Test.cpp deleted file mode 100644 index 93a55042a4f..00000000000 --- a/intern/bmfont/test/simpletest/BMF_Test.cpp +++ /dev/null @@ -1,226 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - * Simple test file for the bitmap font library using GHOST. - * @author Maarten Gribnau - * @date November 15, 2001 - */ - -#include <iostream> - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#define FALSE 0 -#define TRUE 1 - -#if defined(WIN32) || defined(__APPLE__) -#ifdef WIN32 -#include <windows.h> -#include <GL/gl.h> -#else // WIN32 -// __APPLE__ is defined -#include <AGL/gl.h> -#endif // WIN32 -#else // defined(WIN32) || defined(__APPLE__) -#include <GL/gl.h> -#endif // defined(WIN32) || defined(__APPLE__) - - -#include "STR_String.h" -#include "GHOST_Rect.h" - -#include "GHOST_ISystem.h" -#include "GHOST_IEvent.h" -#include "GHOST_IEventConsumer.h" - -#include "BMF_Api.h" - -static class Application* fApp; -static GHOST_ISystem* fSystem = 0; - - -static void drawGL() -{ - GLint x = 10, y = 10; - - ::glRasterPos2i(x, y); - BMF_Font *font = BMF_GetFont(BMF_kHelvetica10); - BMF_DrawString(font, "Helvetica 10 point"); - y += 14; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kHelvetica12); - BMF_DrawString(font, "Helvetica 12 point"); - y += 16; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kHelveticaBold8); - BMF_DrawString(font, "Helvetica Bold 8 point"); - y += 12; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kHelveticaBold10); - BMF_DrawString(font, "Helvetica Bold 10 point"); - y += 14; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kHelveticaBold12); - BMF_DrawString(font, "Helvetica Bold 12 point"); - y += 16; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kHelveticaBold14); - BMF_DrawString(font, "Helvetica Bold 14 point"); - y += 18; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kScreen12); - BMF_DrawString(font, "Screen 12 point"); - y += 16; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kScreen14); - BMF_DrawString(font, "Screen 14 point"); - y += 18; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kScreen15); - BMF_DrawString(font, "Screen 15 point"); -} - - -static void setViewPortGL(GHOST_IWindow* window) -{ - window->activateDrawingContext(); - GHOST_Rect bnds; - window->getClientBounds(bnds); - - ::glViewport(0, 0, bnds.getWidth(), bnds.getHeight()); - - ::glMatrixMode(GL_PROJECTION); - ::glLoadIdentity(); - ::glOrtho(0, bnds.getWidth(), 0, bnds.getHeight(), -10, 10); - - ::glClearColor(.2f,0.0f,0.0f,0.0f); - ::glClear(GL_COLOR_BUFFER_BIT); -} - - - -class Application : public GHOST_IEventConsumer { -public: - Application(GHOST_ISystem* system); - virtual bool processEvent(GHOST_IEvent* event); - - GHOST_ISystem* m_system; - GHOST_IWindow* m_mainWindow; - bool m_exitRequested; -}; - - -Application::Application(GHOST_ISystem* system) - : m_system(system), m_mainWindow(0), m_exitRequested(false) -{ - fApp = this; - - // Create the main window - STR_String title1 ("gears - main window"); - m_mainWindow = system->createWindow(title1, 10, 64, 320, 200, GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL,FALSE); - if (!m_mainWindow) { - std::cout << "could not create main window\n"; - exit(-1); - } -} - - -bool Application::processEvent(GHOST_IEvent* event) -{ - bool handled = true; - - switch (event->getType()) { - case GHOST_kEventWindowClose: - { - GHOST_IWindow* window2 = event->getWindow(); - if (window2 == m_mainWindow) { - exit(0); - } else { - m_system->disposeWindow(window2); - } - } - break; - - case GHOST_kEventWindowActivate: - handled = false; - break; - case GHOST_kEventWindowDeactivate: - handled = false; - break; - case GHOST_kEventWindowUpdate: - { - GHOST_IWindow* window2 = event->getWindow(); - if (!m_system->validWindow(window2)) break; - { - setViewPortGL(window2); - drawGL(); - window2->swapBuffers(); - } - } - break; - - default: - handled = false; - break; - } - return handled; -} - - -int main(int /*argc*/, char** /*argv*/) -{ - // Create the system - GHOST_ISystem::createSystem(); - fSystem = GHOST_ISystem::getSystem(); - - if (fSystem) { - // Create an application object - Application app (fSystem); - - // Add the application as event consumer - fSystem->addEventConsumer(&app); - - // Enter main loop - while (!app.m_exitRequested) { - fSystem->processEvents(TRUE); - fSystem->dispatchEvents(); - } - } - - // Dispose the system - GHOST_ISystem::disposeSystem(); - - return 0; -} - diff --git a/intern/bmfont/test/simpletest/Makefile b/intern/bmfont/test/simpletest/Makefile deleted file mode 100644 index 5c5e32f2ed2..00000000000 --- a/intern/bmfont/test/simpletest/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# Test the bmfont module -# - -LIBNAME = bmfont -DIR = $(OCGDIR)/intern/$(LIBNAME)/test - -# we don't want a library here, only object files: -ALLTARGETS = $(OBJS) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS = -I../.. -CPPFLAGS += -I../../intern -CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_GHOST)/include diff --git a/intern/boolop/Makefile b/intern/boolop/Makefile index 4058c4ca7c1..a7a08f665c7 100644 --- a/intern/boolop/Makefile +++ b/intern/boolop/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # bsp main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_BOOLOP) ] || mkdir $(NAN_BOOLOP) @[ -d $(NAN_BOOLOP)/include ] || mkdir $(NAN_BOOLOP)/include - @[ -d $(NAN_BOOLOP)/lib ] || mkdir $(NAN_BOOLOP)/lib - @[ -d $(NAN_BOOLOP)/lib/debug ] || mkdir $(NAN_BOOLOP)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libboolop.a $(NAN_BOOLOP)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libboolop.a $(NAN_BOOLOP)/lib/debug/ + @[ -d $(NAN_BOOLOP)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BOOLOP)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libboolop.a $(NAN_BOOLOP)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_BOOLOP)/lib/libboolop.a - ranlib $(NAN_BOOLOP)/lib/debug/libboolop.a + ranlib $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_BOOLOP)/include/ diff --git a/intern/boolop/SConscript b/intern/boolop/SConscript index bec263f251f..6a85b2d69be 100644 --- a/intern/boolop/SConscript +++ b/intern/boolop/SConscript @@ -8,7 +8,7 @@ incs += ' ../../source/blender/makesdna ../../intern/guardedalloc' incs += ' ../../source/blender/blenlib' if (env['OURPLATFORM'] == 'win32-mingw'): - env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [30,85] ) + env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='intern', priority = 5 ) else: - env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 ) + env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='intern', priority = 5 ) diff --git a/intern/boolop/intern/BOP_Merge2.cpp b/intern/boolop/intern/BOP_Merge2.cpp index 2dc182289b3..e2367d1319e 100644 --- a/intern/boolop/intern/BOP_Merge2.cpp +++ b/intern/boolop/intern/BOP_Merge2.cpp @@ -294,8 +294,8 @@ void BOP_Merge2::cleanup( void ) BOP_Vertexs v = m_mesh->getVertexs(); for( BOP_IT_Vertexs it = v.begin(); it != v.end(); ++it ) { if( (*it)->getTAG() != BROKEN) { - BOP_Indexs edges = (*it)->getEdges(); - for(BOP_IT_Indexs i = edges.begin();i!=edges.end();i++) + BOP_Indexs iedges = (*it)->getEdges(); + for(BOP_IT_Indexs i = iedges.begin();i!=iedges.end();i++) if( m_mesh->getEdge((*i))->getUsed( ) == false) (*it)->removeEdge( *i ); if( (*it)->getEdges().size() == 0 ) (*it)->setTAG(BROKEN); } @@ -432,8 +432,8 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices) vert->setTAG(BROKEN); for(BOP_IT_Indexs it = edges.begin(); it != edges.end(); ++it ) { - BOP_Edge *edge = m_mesh->getEdge(*it); - edge->setUsed(false); + BOP_Edge *tedge = m_mesh->getEdge(*it); + tedge->setUsed(false); } didMerge = true; } diff --git a/intern/bsp/Makefile b/intern/bsp/Makefile index fd106acab83..cd1653206a6 100644 --- a/intern/bsp/Makefile +++ b/intern/bsp/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # bsp main makefile. @@ -38,19 +40,14 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_BSP) ] || mkdir $(NAN_BSP) @[ -d $(NAN_BSP)/include ] || mkdir $(NAN_BSP)/include - @[ -d $(NAN_BSP)/lib ] || mkdir $(NAN_BSP)/lib - @[ -d $(NAN_BSP)/lib/debug ] || mkdir $(NAN_BSP)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libbsp.a $(NAN_BSP)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libbsp.a $(NAN_BSP)/lib/debug/ + @[ -d $(NAN_BSP)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BSP)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libbsp.a $(NAN_BSP)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_BSP)/lib/libbsp.a - ranlib $(NAN_BSP)/lib/debug/libbsp.a + ranlib $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_BSP)/include/ - - diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript index 39f278625a9..2ecc280f135 100644 --- a/intern/bsp/SConscript +++ b/intern/bsp/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('intern/*.cpp') incs = 'intern ../container ../moto/include ../memutil' if (env['OURPLATFORM'] == 'win32-mingw'): - env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,69] ) -else: env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=26 ) +else: + env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=20 ) diff --git a/intern/container/Makefile b/intern/container/Makefile index 76cba5b3ea1..8a9c038f0ee 100644 --- a/intern/container/Makefile +++ b/intern/container/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # container main makefile. @@ -38,12 +40,10 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_CONTAINER) ] || mkdir $(NAN_CONTAINER) @[ -d $(NAN_CONTAINER)/include ] || mkdir $(NAN_CONTAINER)/include - @[ -d $(NAN_CONTAINER)/lib ] || mkdir $(NAN_CONTAINER)/lib - @[ -d $(NAN_CONTAINER)/lib/debug ] || mkdir $(NAN_CONTAINER)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libcontainer.a $(NAN_CONTAINER)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libcontainer.a $(NAN_CONTAINER)/lib/debug + @[ -d $(NAN_CONTAINER)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_CONTAINER)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libcontainer.a $(NAN_CONTAINER)/lib/$(DEBUG_DIR) @../tools/cpifdiff.sh *.h $(NAN_CONTAINER)/include/ diff --git a/intern/decimation/Makefile b/intern/decimation/Makefile index 9241d87c3a3..7ff87fa018b 100644 --- a/intern/decimation/Makefile +++ b/intern/decimation/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # decimation main makefile. @@ -38,16 +40,13 @@ TESTDIRS = test include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_DECIMATION) ] || mkdir $(NAN_DECIMATION) @[ -d $(NAN_DECIMATION)/include ] || mkdir $(NAN_DECIMATION)/include - @[ -d $(NAN_DECIMATION)/lib ] || mkdir $(NAN_DECIMATION)/lib - @[ -d $(NAN_DECIMATION)/lib/debug ] || mkdir $(NAN_DECIMATION)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libdecimation.a $(NAN_DECIMATION)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libdecimation.a $(NAN_DECIMATION)/lib/debug/ + @[ -d $(NAN_DECIMATION)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_DECIMATION)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libdecimation.a $(NAN_DECIMATION)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_DECIMATION)/lib/libdecimation.a - ranlib $(NAN_DECIMATION)/lib/debug/libdecimation.a + ranlib $(NAN_DECIMATION)/lib/$(DEBUG_DIR)libdecimation.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_DECIMATION)/include/ diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript index 0df93032394..ef95a795928 100644 --- a/intern/decimation/SConscript +++ b/intern/decimation/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp') incs = '. ../moto/include ../container ../memutil' -env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['core','common'], priority = [10, 20] ) +env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['core'], priority = [10] ) diff --git a/intern/decimation/intern/LOD_ExternNormalEditor.cpp b/intern/decimation/intern/LOD_ExternNormalEditor.cpp index b7c7b5a529b..21fd4f3e39f 100644 --- a/intern/decimation/intern/LOD_ExternNormalEditor.cpp +++ b/intern/decimation/intern/LOD_ExternNormalEditor.cpp @@ -41,8 +41,8 @@ LOD_ExternNormalEditor( LOD_Decimation_InfoPtr extern_info, LOD_ManMesh2 &mesh ) : - m_extern_info (extern_info), - m_mesh(mesh) + m_mesh(mesh), + m_extern_info (extern_info) { } diff --git a/intern/decimation/intern/LOD_ManMesh2.cpp b/intern/decimation/intern/LOD_ManMesh2.cpp index 2fe49b36583..99f1c7d926a 100644 --- a/intern/decimation/intern/LOD_ManMesh2.cpp +++ b/intern/decimation/intern/LOD_ManMesh2.cpp @@ -546,7 +546,7 @@ DeleteEdge( // edges[e] should already have been removed from the heap - MT_assert(edges[e].HeapPos() == 0xffffffff); + MT_assert(edges[e].HeapPos() == -1); edges[e] = edges[last]; // also have to swap there heap positions.!!!!! diff --git a/intern/decimation/intern/LOD_QSDecimator.cpp b/intern/decimation/intern/LOD_QSDecimator.cpp index 1a0ec87f05b..0b0de767a9a 100644 --- a/intern/decimation/intern/LOD_QSDecimator.cpp +++ b/intern/decimation/intern/LOD_QSDecimator.cpp @@ -91,10 +91,10 @@ LOD_QSDecimator( LOD_ExternNormalEditor &face_editor, LOD_ExternBufferEditor &extern_editor ) : + m_is_armed (false), m_mesh(mesh), m_face_editor(face_editor), - m_extern_editor(extern_editor), - m_is_armed (false) + m_extern_editor(extern_editor) { m_deg_edges.reserve(32); m_deg_faces.reserve(32); @@ -318,7 +318,7 @@ UpdateHeap( LOD_Edge &e = edge_set[*edge_it]; m_heap->Remove(&edge_set[0],e.HeapPos()); - e.HeapPos() = 0xffffffff; + e.HeapPos() = -1; } } diff --git a/intern/elbeem/Makefile b/intern/elbeem/Makefile index 9ea08d63374..e7e8a8baa64 100644 --- a/intern/elbeem/Makefile +++ b/intern/elbeem/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # elbeem main makefile. @@ -40,16 +42,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_ELBEEM) ] || mkdir $(NAN_ELBEEM) @[ -d $(NAN_ELBEEM)/include ] || mkdir $(NAN_ELBEEM)/include - @[ -d $(NAN_ELBEEM)/lib ] || mkdir $(NAN_ELBEEM)/lib - @[ -d $(NAN_ELBEEM)/lib/debug ] || mkdir $(NAN_ELBEEM)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libelbeem.a $(NAN_ELBEEM)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libelbeem.a $(NAN_ELBEEM)/lib/debug/ + @[ -d $(NAN_ELBEEM)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_ELBEEM)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libelbeem.a $(NAN_ELBEEM)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_ELBEEM)/lib/libelbeem.a - ranlib $(NAN_ELBEEM)/lib/debug/libelbeem.a + ranlib $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_ELBEEM)/include/ diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript index dc8d84ef5a0..92e80c36cea 100644 --- a/intern/elbeem/SConscript +++ b/intern/elbeem/SConscript @@ -15,4 +15,4 @@ if env['OURPLATFORM']=='win32-vc': incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] incs += ' extern ' -env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='blender', priority=0 ) +env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='intern', priority=0 ) diff --git a/intern/elbeem/extern/LBM_fluidsim.h b/intern/elbeem/extern/LBM_fluidsim.h index dd8c63d0d39..ec30d65af20 100644 --- a/intern/elbeem/extern/LBM_fluidsim.h +++ b/intern/elbeem/extern/LBM_fluidsim.h @@ -31,36 +31,11 @@ #ifndef LBM_FLUIDSIM_H #define LBM_FLUIDSIM_H -struct Mesh; -struct DerivedMesh; -struct Object; -struct fluidsimDerivedMesh; - -extern double fluidsimViscosityPreset[6]; -extern char* fluidsimViscosityPresetString[6]; - -/* allocates and initializes fluidsim data */ -struct FluidsimSettings* fluidsimSettingsNew(struct Object *srcob); - -/* frees internal data itself */ -void fluidsimSettingsFree(struct FluidsimSettings* sb); - -/* duplicate internal data */ -struct FluidsimSettings* fluidsimSettingsCopy(struct FluidsimSettings* sb); - -/* export blender geometry to fluid solver */ -void fluidsimBake(struct Object* ob); - -/* read & write bobj / bobj.gz files (e.g. for fluid sim surface meshes) */ -void writeBobjgz(char *filename, struct Object *ob, int useGlobalCoords, int append, float time); -struct Mesh* readBobjgz(char *filename, struct Mesh *orgmesh, float* bbstart, float *bbsize); - -/* create derived mesh for fluid sim objects */ -// WARNING - currently implemented in DerivedMesh.c! -void loadFluidsimMesh(struct Object *srcob, int useRenderParams); +/* note; elbeem.h was exported all over, should only expose LBM_fluidsim.h */ +#include "elbeem.h" /* run simulation with given config file */ -// WARNING - implemented in intern/elbeem/blendercall.cpp +// implemented in intern/elbeem/blendercall.cpp int performElbeemSimulation(char *cfgfilename); diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index 270531d80be..ce54adb48ee 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -1401,7 +1401,7 @@ void LbmFsgrSolver::initMovingObstacles(bool staticInit) { debMsgStd("LbmFsgrSolver::initMovingObstacles",DM_MSG," obj "<<obj->getName()<<" skip:"<<skip<<", static:"<<staticInit<<" anim:"<<obj->getIsAnimated()<<" gid:"<<obj->getGeoInitId()<<" simgid:"<<mLbmInitId, 10); if( (obj->getGeoInitType()&FGI_ALLBOUNDS) || - (obj->getGeoInitType()&FGI_FLUID) && staticInit ) { + ((obj->getGeoInitType()&FGI_FLUID) && staticInit) ) { otype = ntype = CFInvalid; switch(obj->getGeoInitType()) { diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index cb1eac7a9a6..c3158214830 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -771,14 +771,16 @@ extern GHOST_TSuccess GHOST_ClipRectangle(GHOST_RectangleHandle rectanglehandle, /** * Return the data from the clipboad - * @return clipboard data + * @param return the selection instead, X11 only feature + * @return clipboard data */ -extern GHOST_TUns8* GHOST_getClipboard(int flag); +extern GHOST_TUns8* GHOST_getClipboard(int selection); /** * Put data to the Clipboard + * @param set the selection instead, X11 only feature */ -extern void GHOST_putClipboard(GHOST_TInt8 *buffer, int flag); +extern void GHOST_putClipboard(GHOST_TInt8 *buffer, int selection); #ifdef __cplusplus } diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index baf0cb813f8..08794dfd085 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -356,12 +356,12 @@ public: * @return Returns "unsinged char" from X11 XA_CUT_BUFFER0 buffer * */ - virtual GHOST_TUns8* getClipboard(int flag) const = 0; + virtual GHOST_TUns8* getClipboard(bool selection) const = 0; /** * Put data to the Clipboard */ - virtual void putClipboard(GHOST_TInt8 *buffer, int flag) const = 0; + virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const = 0; protected: /** diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index 6b1295f649b..2441251dc33 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -104,7 +104,9 @@ typedef enum { GHOST_kWindowState8Normal = 8, GHOST_kWindowState8Maximized, GHOST_kWindowState8Minimized, - GHOST_kWindowState8FullScreen + GHOST_kWindowState8FullScreen, + GHOST_kWindowStateModified, + GHOST_kWindowStateUnModified } GHOST_TWindowState; @@ -150,6 +152,9 @@ typedef enum { GHOST_kEventWindowDeactivate, GHOST_kEventWindowUpdate, GHOST_kEventWindowSize, + GHOST_kEventWindowMove, + + GHOST_kEventTimer, GHOST_kNumEventTypes } GHOST_TEventType; diff --git a/intern/ghost/Makefile b/intern/ghost/Makefile index f809a32ac8f..e983c3a9cee 100644 --- a/intern/ghost/Makefile +++ b/intern/ghost/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # ghost main makefile. @@ -38,16 +40,13 @@ TESTDIRS = test include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_GHOST) ] || mkdir $(NAN_GHOST) @[ -d $(NAN_GHOST)/include ] || mkdir $(NAN_GHOST)/include - @[ -d $(NAN_GHOST)/lib ] || mkdir $(NAN_GHOST)/lib - @[ -d $(NAN_GHOST)/lib/debug ] || mkdir $(NAN_GHOST)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libghost.a $(NAN_GHOST)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libghost.a $(NAN_GHOST)/lib/debug/ + @[ -d $(NAN_GHOST)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_GHOST)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libghost.a $(NAN_GHOST)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_GHOST)/lib/libghost.a - ranlib $(NAN_GHOST)/lib/debug/libghost.a + ranlib $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a endif @../tools/cpifdiff.sh *.h $(NAN_GHOST)/include/ diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index f6283cfc0f2..9de82ac44fb 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -14,7 +14,7 @@ if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6', 'irix6'): for f in pf: sources.remove('intern' + os.sep + f + 'Win32.cpp') sources.remove('intern' + os.sep + f + 'Carbon.cpp') -elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'): +elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): for f in pf: sources.remove('intern' + os.sep + f + 'X11.cpp') sources.remove('intern' + os.sep + f + 'Carbon.cpp') @@ -27,6 +27,6 @@ else: Exit() incs = '. ../string ' + env['BF_OPENGL_INC'] -if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'): +if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): incs = env['BF_WINTAB_INC'] + ' ' + incs -env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['core','player'], priority = [25,15] ) +env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['intern'], priority = [40] ) diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp index b7643784250..401dba8d240 100644 --- a/intern/ghost/intern/GHOST_C-api.cpp +++ b/intern/ghost/intern/GHOST_C-api.cpp @@ -48,11 +48,6 @@ #include "GHOST_IEventConsumer.h" #include "intern/GHOST_CallbackEventConsumer.h" -#ifdef WIN32 -#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning -#endif //WIN32 - - GHOST_SystemHandle GHOST_CreateSystem(void) { GHOST_ISystem::createSystem(); @@ -815,15 +810,15 @@ GHOST_TSuccess GHOST_ClipRectangle(GHOST_RectangleHandle rectanglehandle, return result; } -GHOST_TUns8* GHOST_getClipboard(int flag) +GHOST_TUns8* GHOST_getClipboard(int selection) { GHOST_ISystem* system = GHOST_ISystem::getSystem(); - return system->getClipboard(flag); + return system->getClipboard(selection); } -void GHOST_putClipboard(GHOST_TInt8 *buffer, int flag) +void GHOST_putClipboard(GHOST_TInt8 *buffer, int selection) { GHOST_ISystem* system = GHOST_ISystem::getSystem(); - system->putClipboard(buffer, flag); + system->putClipboard(buffer, selection); } diff --git a/intern/ghost/intern/GHOST_DisplayManager.h b/intern/ghost/intern/GHOST_DisplayManager.h index a707b5aeddd..50c59a6d348 100644 --- a/intern/ghost/intern/GHOST_DisplayManager.h +++ b/intern/ghost/intern/GHOST_DisplayManager.h @@ -35,10 +35,6 @@ #include "GHOST_Types.h" -#ifdef WIN32 -#pragma warning (disable:4786) // suppress stl-MSVC debug info warning -#endif // WIN32 - #include <vector> /** diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp index a8565578967..1a61428bccc 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp @@ -126,7 +126,7 @@ GHOST_TSuccess GHOST_DisplayManagerWin32::setCurrentDisplaySetting(GHOST_TUns8 d GHOST_ASSERT((display==kMainDisplay), "GHOST_DisplayManagerWin32::setCurrentDisplaySetting(): only main display is supported"); GHOST_DisplaySetting match; - GHOST_TSuccess success = findMatch(display, setting, match); + findMatch(display, setting, match); DEVMODE dm; int i = 0; while (::EnumDisplaySettings(NULL, i++, &dm)) { diff --git a/intern/ghost/intern/GHOST_EventManager.h b/intern/ghost/intern/GHOST_EventManager.h index 33e5c2f20ba..c3ec9583c04 100644 --- a/intern/ghost/intern/GHOST_EventManager.h +++ b/intern/ghost/intern/GHOST_EventManager.h @@ -33,10 +33,6 @@ #ifndef _GHOST_EVENT_MANAGER_H_ #define _GHOST_EVENT_MANAGER_H_ -#ifdef WIN32 -#pragma warning (disable:4786) // suppress stl-MSVC debug info warning -#endif // WIN32 - #include <deque> #include <vector> diff --git a/intern/ghost/intern/GHOST_EventPrinter.cpp b/intern/ghost/intern/GHOST_EventPrinter.cpp index ae9c0d81a01..b4f5cc96083 100644 --- a/intern/ghost/intern/GHOST_EventPrinter.cpp +++ b/intern/ghost/intern/GHOST_EventPrinter.cpp @@ -48,36 +48,36 @@ bool GHOST_EventPrinter::processEvent(GHOST_IEvent* event) if (event->getType() == GHOST_kEventWindowUpdate) return false; - //std::cout << "GHOST_EventPrinter::processEvent, time: " << (GHOST_TInt32)event->getTime() << ", type: "; + std::cout << "GHOST_EventPrinter::processEvent, time: " << (GHOST_TInt32)event->getTime() << ", type: "; switch (event->getType()) { case GHOST_kEventUnknown: - //std::cout << "GHOST_kEventUnknown"; handled = false; + std::cout << "GHOST_kEventUnknown"; handled = false; break; case GHOST_kEventButtonUp: { GHOST_TEventButtonData* buttonData = (GHOST_TEventButtonData*)((GHOST_IEvent*)event)->getData(); - //std::cout << "GHOST_kEventCursorButtonUp, button: " << buttonData->button; + std::cout << "GHOST_kEventCursorButtonUp, button: " << buttonData->button; } break; case GHOST_kEventButtonDown: { GHOST_TEventButtonData* buttonData = (GHOST_TEventButtonData*)((GHOST_IEvent*)event)->getData(); - //std::cout << "GHOST_kEventButtonDown, button: " << buttonData->button; + std::cout << "GHOST_kEventButtonDown, button: " << buttonData->button; } break; case GHOST_kEventWheel: { GHOST_TEventWheelData* wheelData = (GHOST_TEventWheelData*)((GHOST_IEvent*)event)->getData(); - //std::cout << "GHOST_kEventWheel, z: " << wheelData->z; + std::cout << "GHOST_kEventWheel, z: " << wheelData->z; } break; case GHOST_kEventCursorMove: { GHOST_TEventCursorData* cursorData = (GHOST_TEventCursorData*)((GHOST_IEvent*)event)->getData(); - //std::cout << "GHOST_kEventCursorMove, (x,y): (" << cursorData->x << "," << cursorData->y << ")"; + std::cout << "GHOST_kEventCursorMove, (x,y): (" << cursorData->x << "," << cursorData->y << ")"; } break; @@ -86,7 +86,7 @@ bool GHOST_EventPrinter::processEvent(GHOST_IEvent* event) GHOST_TEventKeyData* keyData = (GHOST_TEventKeyData*)((GHOST_IEvent*)event)->getData(); STR_String str; getKeyString(keyData->key, str); - //std::cout << "GHOST_kEventKeyUp, key: " << str.Ptr(); + std::cout << "GHOST_kEventKeyUp, key: " << str.Ptr(); } break; case GHOST_kEventKeyDown: @@ -94,34 +94,34 @@ bool GHOST_EventPrinter::processEvent(GHOST_IEvent* event) GHOST_TEventKeyData* keyData = (GHOST_TEventKeyData*)((GHOST_IEvent*)event)->getData(); STR_String str; getKeyString(keyData->key, str); - //std::cout << "GHOST_kEventKeyDown, key: " << str.Ptr(); + std::cout << "GHOST_kEventKeyDown, key: " << str.Ptr(); } break; case GHOST_kEventQuit: - //std::cout << "GHOST_kEventQuit"; + std::cout << "GHOST_kEventQuit"; break; case GHOST_kEventWindowClose: - //std::cout << "GHOST_kEventWindowClose"; + std::cout << "GHOST_kEventWindowClose"; break; case GHOST_kEventWindowActivate: - //std::cout << "GHOST_kEventWindowActivate"; + std::cout << "GHOST_kEventWindowActivate"; break; case GHOST_kEventWindowDeactivate: - //std::cout << "GHOST_kEventWindowDeactivate"; + std::cout << "GHOST_kEventWindowDeactivate"; break; case GHOST_kEventWindowUpdate: - //std::cout << "GHOST_kEventWindowUpdate"; + std::cout << "GHOST_kEventWindowUpdate"; break; case GHOST_kEventWindowSize: - //std::cout << "GHOST_kEventWindowSize"; + std::cout << "GHOST_kEventWindowSize"; break; default: - //std::cout << "not found"; handled = false; + std::cout << "not found"; handled = false; break; } - //std::cout << "\n"; + std::cout << "\n"; return handled; } diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index efce931860a..9310e9b2591 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -284,18 +284,18 @@ public: /** * Returns the selection buffer - * @param flag Only used on X11 - * @return Returns the clipboard data + * @param selection Only used on X11 + * @return Returns the clipboard data * */ - virtual GHOST_TUns8* getClipboard(int flag) const = 0; + virtual GHOST_TUns8* getClipboard(bool selection) const = 0; /** * Put data to the Clipboard - * @param buffer The buffer to copy to the clipboard - * @param flag The clipboard to copy too only used on X11 + * @param buffer The buffer to copy to the clipboard + * @param selection The clipboard to copy too only used on X11 */ - virtual void putClipboard(GHOST_TInt8 *buffer, int flag) const = 0; + virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const = 0; protected: /** diff --git a/intern/ghost/intern/GHOST_SystemCarbon.cpp b/intern/ghost/intern/GHOST_SystemCarbon.cpp index 067c8deee32..fb1b96fcbc7 100644 --- a/intern/ghost/intern/GHOST_SystemCarbon.cpp +++ b/intern/ghost/intern/GHOST_SystemCarbon.cpp @@ -34,7 +34,6 @@ * @date May 7, 2001 */ - #include <Carbon/Carbon.h> #include <ApplicationServices/ApplicationServices.h> #include "GHOST_SystemCarbon.h" @@ -430,6 +429,29 @@ GHOST_IWindow* GHOST_SystemCarbon::createWindow( return window; } +GHOST_TSuccess GHOST_SystemCarbon::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, const bool stereoVisual) +{ + GHOST_TSuccess success = GHOST_kFailure; + + // need yo make this Carbon all on 10.5 for fullscreen to work correctly + CGCaptureAllDisplays(); + + success = GHOST_System::beginFullScreen( setting, window, stereoVisual); + + if( success != GHOST_kSuccess ) { + // fullscreen failed for other reasons, release + CGReleaseAllDisplays(); + } + + return success; +} + +GHOST_TSuccess GHOST_SystemCarbon::endFullScreen(void) +{ + CGReleaseAllDisplays(); + return GHOST_System::endFullScreen(); +} + /* this is an old style low level event queue. As we want to handle our own timers, this is ok. the full screen hack should be removed */ @@ -438,21 +460,21 @@ bool GHOST_SystemCarbon::processEvents(bool waitForEvent) bool anyProcessed = false; EventRef event; +// SetMouseCoalescingEnabled(false, NULL); + do { GHOST_TimerManager* timerMgr = getTimerManager(); if (waitForEvent) { - GHOST_TUns64 curtime = getMilliSeconds(); GHOST_TUns64 next = timerMgr->nextFireTime(); double timeOut; if (next == GHOST_kFireTimeNever) { timeOut = kEventDurationForever; } else { - if (next<=curtime) + timeOut = (double)(next - getMilliSeconds())/1000.0; + if (timeOut < 0.0) timeOut = 0.0; - else - timeOut = (double) (next - getMilliSeconds())/1000.0; } ::ReceiveNextEvent(0, NULL, timeOut, false, &event); @@ -471,7 +493,6 @@ bool GHOST_SystemCarbon::processEvents(bool waitForEvent) } } - /* end loop when no more events available */ while (::ReceiveNextEvent(0, NULL, 0, true, &event)==noErr) { OSStatus status= ::SendEventToEventTarget(event, ::GetEventDispatcherTarget()); @@ -959,10 +980,16 @@ bool GHOST_SystemCarbon::handleMouseDown(EventRef event) * events. By setting m_ignoreWindowSizedMessages these are suppressed. * @see GHOST_SystemCarbon::handleWindowEvent(EventRef event) */ + /* even worse: scale window also generates a load of events, and nothing + is handled (read: client's event proc called) until you release mouse (ton) */ + GHOST_ASSERT(validWindow(ghostWindow), "GHOST_SystemCarbon::handleMouseDown: invalid window"); m_ignoreWindowSizedMessages = true; ::DragWindow(window, mousePos, &GetQDGlobalsScreenBits(&screenBits)->bounds); m_ignoreWindowSizedMessages = false; + + pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowMove, ghostWindow) ); + break; case inContent: @@ -1114,7 +1141,7 @@ OSStatus GHOST_SystemCarbon::sEventHandlerProc(EventHandlerCallRef handler, Even return err; } -GHOST_TUns8* GHOST_SystemCarbon::getClipboard(int flag) const +GHOST_TUns8* GHOST_SystemCarbon::getClipboard(bool selection) const { PasteboardRef inPasteboard; PasteboardItemID itemID; @@ -1153,9 +1180,9 @@ GHOST_TUns8* GHOST_SystemCarbon::getClipboard(int flag) const } } -void GHOST_SystemCarbon::putClipboard(GHOST_TInt8 *buffer, int flag) const +void GHOST_SystemCarbon::putClipboard(GHOST_TInt8 *buffer, bool selection) const { - if(flag == 1) {return;} //If Flag is 1 means the selection and is used on X11 + if(selection) {return;} // for copying the selection, used on X11 PasteboardRef inPasteboard; CFDataRef textData = NULL; diff --git a/intern/ghost/intern/GHOST_SystemCarbon.h b/intern/ghost/intern/GHOST_SystemCarbon.h index 2a1d6325784..5b3b786a5ac 100644 --- a/intern/ghost/intern/GHOST_SystemCarbon.h +++ b/intern/ghost/intern/GHOST_SystemCarbon.h @@ -118,6 +118,14 @@ public: const GHOST_TEmbedderWindowID parentWindow = 0 ); + virtual GHOST_TSuccess beginFullScreen( + const GHOST_DisplaySetting& setting, + GHOST_IWindow** window, + const bool stereoVisual + ); + + virtual GHOST_TSuccess endFullScreen( void ); + /*************************************************************************************** ** Event management functionality ***************************************************************************************/ @@ -169,17 +177,17 @@ public: /** * Returns Clipboard data - * @param flag Indicate which buffer to return - * @return Returns the selected buffer + * @param selection Indicate which buffer to return + * @return Returns the selected buffer */ - virtual GHOST_TUns8* getClipboard(int flag) const; + virtual GHOST_TUns8* getClipboard(bool selection) const; /** * Puts buffer to system clipboard * @param buffer The buffer to be copied - * @param flag Indicates which buffer to copy too Only used on X11 + * @param selection Indicates which buffer to copy too, only used on X11 */ - virtual void putClipboard(GHOST_TInt8 *buffer, int flag) const; + virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const; protected: /** diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index feb0fe39040..8513d056795 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -38,9 +38,8 @@ #include <config.h> #endif -#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning - #include "GHOST_SystemWin32.h" +//#include <stdio.h> //for printf() // win64 doesn't define GWL_USERDATA #ifdef WIN32 @@ -202,11 +201,12 @@ bool GHOST_SystemWin32::processEvents(bool waitForEvent) ::Sleep(1); #else GHOST_TUns64 next = timerMgr->nextFireTime(); + GHOST_TInt64 maxSleep = next - getMilliSeconds(); if (next == GHOST_kFireTimeNever) { ::WaitMessage(); - } else { - ::SetTimer(NULL, 0, next - getMilliSeconds(), NULL); + } else if(maxSleep >= 0.0) { + ::SetTimer(NULL, 0, maxSleep, NULL); ::WaitMessage(); ::KillTimer(NULL, 0); } @@ -232,7 +232,7 @@ bool GHOST_SystemWin32::processEvents(bool waitForEvent) GHOST_TSuccess GHOST_SystemWin32::getCursorPosition(GHOST_TInt32& x, GHOST_TInt32& y) const { POINT point; - bool success = ::GetCursorPos(&point) == TRUE; + ::GetCursorPos(&point); x = point.x; y = point.y; return GHOST_kSuccess; @@ -537,7 +537,7 @@ GHOST_Event* GHOST_SystemWin32::processWindowEvent(GHOST_TEventType type, GHOST_ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { GHOST_Event* event = 0; - LRESULT lResult; + LRESULT lResult = 0; GHOST_SystemWin32* system = ((GHOST_SystemWin32*)getSystem()); GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized") @@ -747,6 +747,9 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, * the message is sent asynchronously, so the window is activated immediately. */ event = processWindowEvent(LOWORD(wParam) ? GHOST_kEventWindowActivate : GHOST_kEventWindowDeactivate, window); + /* WARNING: Let DefWindowProc handle WM_ACTIVATE, otherwise WM_MOUSEWHEEL + will not be dispatched to OUR active window if we minimize one of OUR windows. */ + lResult = ::DefWindowProc(hwnd, msg, wParam, lParam); break; case WM_PAINT: /* An application sends the WM_PAINT message when the system or another application @@ -766,10 +769,23 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, * message without calling DefWindowProc. */ event = processWindowEvent(GHOST_kEventWindowSize, window); + break; case WM_CAPTURECHANGED: window->lostMouseCapture(); break; - + case WM_MOVING: + /* The WM_MOVING message is sent to a window that the user is moving. By processing + * this message, an application can monitor the size and position of the drag rectangle + * and, if needed, change its size or position. + */ + case WM_MOVE: + /* The WM_SIZE and WM_MOVE messages are not sent if an application handles the + * WM_WINDOWPOSCHANGED message without calling DefWindowProc. It is more efficient + * to perform any move or size change processing during the WM_WINDOWPOSCHANGED + * message without calling DefWindowProc. + */ + event = processWindowEvent(GHOST_kEventWindowMove, window); + break; //////////////////////////////////////////////////////////////////////// // Window events, ignored //////////////////////////////////////////////////////////////////////// @@ -782,12 +798,6 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, * to perform any move or size change processing during the WM_WINDOWPOSCHANGED * message without calling DefWindowProc. */ - case WM_MOVE: - /* The WM_SIZE and WM_MOVE messages are not sent if an application handles the - * WM_WINDOWPOSCHANGED message without calling DefWindowProc. It is more efficient - * to perform any move or size change processing during the WM_WINDOWPOSCHANGED - * message without calling DefWindowProc. - */ case WM_ERASEBKGND: /* An application sends the WM_ERASEBKGND message when the window background must be * erased (for example, when a window is resized). The message is sent to prepare an @@ -822,11 +832,6 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, */ case WM_SETFOCUS: /* The WM_SETFOCUS message is sent to a window after it has gained the keyboard focus. */ - case WM_MOVING: - /* The WM_MOVING message is sent to a window that the user is moving. By processing - * this message, an application can monitor the size and position of the drag rectangle - * and, if needed, change its size or position. - */ case WM_ENTERSIZEMOVE: /* The WM_ENTERSIZEMOVE message is sent one time to a window after it enters the moving * or sizing modal loop. The window enters the moving or sizing modal loop when the user @@ -904,7 +909,6 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, if (event) { system->pushEvent(event); - lResult = 0; } else { lResult = ::DefWindowProc(hwnd, msg, wParam, lParam); @@ -912,7 +916,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, return lResult; } -GHOST_TUns8* GHOST_SystemWin32::getClipboard(int flag) const +GHOST_TUns8* GHOST_SystemWin32::getClipboard(bool selection) const { char *buffer; char *temp_buff; @@ -942,9 +946,10 @@ GHOST_TUns8* GHOST_SystemWin32::getClipboard(int flag) const } } -void GHOST_SystemWin32::putClipboard(GHOST_TInt8 *buffer, int flag) const +void GHOST_SystemWin32::putClipboard(GHOST_TInt8 *buffer, bool selection) const { - if(flag == 1) {return;} //If Flag is 1 means the selection and is used on X11 + if(selection) {return;} // for copying the selection, used on X11 + if (OpenClipboard(NULL)) { HLOCAL clipbuffer; char *data; diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index 00f7af00162..9387b6cad50 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -170,17 +170,17 @@ public: /** * Returns unsinged char from CUT_BUFFER0 - * @param flag Flag is not used on win32 on used on X11 - * @return Returns the Clipboard + * @param selection Used by X11 only + * @return Returns the Clipboard */ - virtual GHOST_TUns8* getClipboard(int flag) const; + virtual GHOST_TUns8* getClipboard(bool selection) const; /** * Puts buffer to system clipboard - * @param flag Flag is not used on win32 on used on X11 - * @return No return + * @param selection Used by X11 only + * @return No return */ - virtual void putClipboard(GHOST_TInt8 *buffer, int flag) const; + virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const; protected: /** diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 02dfdc2e25c..a975322e9ce 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -107,6 +107,25 @@ GHOST_SystemX11( m_wm_protocols= XInternAtom(m_display, "WM_PROTOCOLS", False); m_wm_take_focus= XInternAtom(m_display, "WM_TAKE_FOCUS", False); + m_wm_state= XInternAtom(m_display, "WM_STATE", False); + m_wm_change_state= XInternAtom(m_display, "WM_CHANGE_STATE", False); + m_net_state= XInternAtom(m_display, "_NET_WM_STATE", False); + m_net_max_horz= XInternAtom(m_display, + "_NET_WM_STATE_MAXIMIZED_HORZ", False); + m_net_max_vert= XInternAtom(m_display, + "_NET_WM_STATE_MAXIMIZED_VERT", False); + m_net_fullscreen= XInternAtom(m_display, + "_NET_WM_STATE_FULLSCREEN", False); + m_motif= XInternAtom(m_display, "_MOTIF_WM_HINTS", False); + m_targets= XInternAtom(m_display, "TARGETS", False); + m_string= XInternAtom(m_display, "STRING", False); + m_compound_text= XInternAtom(m_display, "COMPOUND_TEXT", False); + m_text= XInternAtom(m_display, "TEXT", False); + m_clipboard= XInternAtom(m_display, "CLIPBOARD", False); + m_primary= XInternAtom(m_display, "PRIMARY", False); + m_xclip_out= XInternAtom(m_display, "XCLIP_OUT", False); + m_incr= XInternAtom(m_display, "INCR", False); + m_utf8_string= XInternAtom(m_display, "UTF8_STRING", False); // compute the initial time timeval tv; @@ -222,11 +241,8 @@ createWindow( ); if (window) { - - // Install a new protocol for this window - so we can overide - // the default window closure mechanism. - - XSetWMProtocols(m_display, window->getXWindow(), &m_delete_window_atom, 1); + // Both are now handle in GHOST_WindowX11.cpp + // Focus and Delete atoms. if (window->getValid()) { // Store the pointer to the window @@ -308,7 +324,10 @@ processEvents( if (next==GHOST_kFireTimeNever) { SleepTillEvent(m_display, -1); } else { - SleepTillEvent(m_display, next - getMilliSeconds()); + GHOST_TInt64 maxSleep = next - getMilliSeconds(); + + if(maxSleep >= 0) + SleepTillEvent(m_display, next - getMilliSeconds()); } } @@ -537,6 +556,24 @@ GHOST_SystemX11::processEvent(XEvent *xe) // XCrossingEvents pointer leave enter window. break; case MapNotify: + /* + * From ICCCM: + * [ Clients can select for StructureNotify on their + * top-level windows to track transition between + * Normal and Iconic states. Receipt of a MapNotify + * event will indicate a transition to the Normal + * state, and receipt of an UnmapNotify event will + * indicate a transition to the Iconic state. ] + */ + if (window->m_post_init == True) { + /* + * Now we are sure that the window is + * mapped, so only need change the state. + */ + window->setState (window->m_post_state); + window->m_post_init = False; + } + break; case UnmapNotify: break; case MappingNotify: @@ -975,144 +1012,298 @@ convertXKey( #undef GXMAP - GHOST_TUns8* -GHOST_SystemX11:: -getClipboard(int flag -) const { - //Flag - //0 = Regular clipboard 1 = selection - static Atom Primary_atom, clip_String, compound_text, a_text, a_string; - Atom rtype; - Window m_window, owner; - unsigned char *data, *tmp_data; - int bits, count; - unsigned long len, bytes; - XEvent xevent; - +/* from xclip.c xcout() v0.11 */ + +#define XCLIB_XCOUT_NONE 0 /* no context */ +#define XCLIB_XCOUT_SENTCONVSEL 1 /* sent a request */ +#define XCLIB_XCOUT_INCR 2 /* in an incr loop */ +#define XCLIB_XCOUT_FALLBACK 3 /* STRING failed, need fallback to UTF8 */ +#define XCLIB_XCOUT_FALLBACK_UTF8 4 /* UTF8 failed, move to compouned */ +#define XCLIB_XCOUT_FALLBACK_COMP 5 /* compouned failed, move to text. */ +#define XCLIB_XCOUT_FALLBACK_TEXT 6 + +// Retrieves the contents of a selections. +void GHOST_SystemX11::getClipboard_xcout(XEvent evt, + Atom sel, Atom target, unsigned char **txt, + unsigned long *len, unsigned int *context) const +{ + Atom pty_type; + int pty_format; + unsigned char *buffer; + unsigned long pty_size, pty_items; + unsigned char *ltxt= *txt; + vector<GHOST_IWindow *> & win_vec = m_windowManager->getWindows(); vector<GHOST_IWindow *>::iterator win_it = win_vec.begin(); GHOST_WindowX11 * window = static_cast<GHOST_WindowX11 *>(*win_it); - m_window = window->getXWindow(); + Window win = window->getXWindow(); + + switch (*context) { + // There is no context, do an XConvertSelection() + case XCLIB_XCOUT_NONE: + // Initialise return length to 0 + if (*len > 0) { + free(*txt); + *len = 0; + } - clip_String = XInternAtom(m_display, "_BLENDER_STRING", False); - compound_text = XInternAtom(m_display, "COMPOUND_TEXT", False); - a_text= XInternAtom(m_display, "TEXT", False); - a_string= XInternAtom(m_display, "STRING", False); - - //lets check the owner and if it is us then return the static buffer - if(flag == 0) { - Primary_atom = XInternAtom(m_display, "CLIPBOARD", False); - owner = XGetSelectionOwner(m_display, Primary_atom); - if (owner == m_window) { - data = (unsigned char*) malloc(strlen(txt_cut_buffer)+1); - strcpy((char*)data, txt_cut_buffer); - return (GHOST_TUns8*)data; - } else if (owner == None) { - return NULL; - } - } else { - Primary_atom = XInternAtom(m_display, "PRIMARY", False); - owner = XGetSelectionOwner(m_display, Primary_atom); - if (owner == m_window) { - data = (unsigned char*) malloc(strlen(txt_select_buffer)+1); - strcpy((char*)data, txt_select_buffer); - return (GHOST_TUns8*)data; - } else if (owner == None) { - return NULL; - } - } + // Send a selection request + XConvertSelection(m_display, sel, target, m_xclip_out, win, CurrentTime); + *context = XCLIB_XCOUT_SENTCONVSEL; + return; - if(!Primary_atom) { - return NULL; - } - - XDeleteProperty(m_display, m_window, Primary_atom); - XConvertSelection(m_display, Primary_atom, compound_text, clip_String, m_window, CurrentTime); //XA_STRING - XFlush(m_display); + case XCLIB_XCOUT_SENTCONVSEL: + if (evt.type != SelectionNotify) + return; - //This needs to change so we do not wait for ever or check owner first - count= 1; - while(1) { - XNextEvent(m_display, &xevent); - if(xevent.type == SelectionNotify) { - if (xevent.xselection.property == None) { - /* Ok, the client can't convert the property - * to some that we can handle, try other types.. - */ - if (count == 1) { - XConvertSelection(m_display, Primary_atom, a_text, clip_String, m_window, CurrentTime); - count++; - } - else if (count == 2) { - XConvertSelection(m_display, Primary_atom, a_string, clip_String, m_window, CurrentTime); - count++; - } - else { - /* Ok, the owner of the selection can't - * convert the data to something that we can - * handle. - */ - return(NULL); - } + if (target == m_utf8_string && evt.xselection.property == None) { + *context= XCLIB_XCOUT_FALLBACK_UTF8; + return; + } + else if (target == m_compound_text && evt.xselection.property == None) { + *context= XCLIB_XCOUT_FALLBACK_COMP; + return; + } + else if (target == m_text && evt.xselection.property == None) { + *context= XCLIB_XCOUT_FALLBACK_TEXT; + return; + } + + // find the size and format of the data in property + XGetWindowProperty(m_display, win, m_xclip_out, 0, 0, False, + AnyPropertyType, &pty_type, &pty_format, + &pty_items, &pty_size, &buffer); + XFree(buffer); + + if (pty_type == m_incr) { + // start INCR mechanism by deleting property + XDeleteProperty(m_display, win, m_xclip_out); + XFlush(m_display); + *context = XCLIB_XCOUT_INCR; + return; + } + + // if it's not incr, and not format == 8, then there's + // nothing in the selection (that xclip understands, anyway) + + if (pty_format != 8) { + *context = XCLIB_XCOUT_NONE; + return; + } + + // not using INCR mechanism, just read the property + XGetWindowProperty(m_display, win, m_xclip_out, 0, (long) pty_size, + False, AnyPropertyType, &pty_type, + &pty_format, &pty_items, &pty_size, &buffer); + + // finished with property, delete it + XDeleteProperty(m_display, win, m_xclip_out); + + // copy the buffer to the pointer for returned data + ltxt = (unsigned char *) malloc(pty_items); + memcpy(ltxt, buffer, pty_items); + + // set the length of the returned data + *len = pty_items; + *txt = ltxt; + + // free the buffer + XFree(buffer); + + *context = XCLIB_XCOUT_NONE; + + // complete contents of selection fetched, return 1 + return; + + case XCLIB_XCOUT_INCR: + // To use the INCR method, we basically delete the + // property with the selection in it, wait for an + // event indicating that the property has been created, + // then read it, delete it, etc. + + // make sure that the event is relevant + if (evt.type != PropertyNotify) + return; + + // skip unless the property has a new value + if (evt.xproperty.state != PropertyNewValue) + return; + + // check size and format of the property + XGetWindowProperty(m_display, win, m_xclip_out, 0, 0, False, + AnyPropertyType, &pty_type, &pty_format, + &pty_items, &pty_size, (unsigned char **) &buffer); + + if (pty_format != 8) { + // property does not contain text, delete it + // to tell the other X client that we have read + // it and to send the next property + XFree(buffer); + XDeleteProperty(m_display, win, m_xclip_out); + return; + } + + if (pty_size == 0) { + // no more data, exit from loop + XFree(buffer); + XDeleteProperty(m_display, win, m_xclip_out); + *context = XCLIB_XCOUT_NONE; + + // this means that an INCR transfer is now + // complete, return 1 + return; + } + + XFree(buffer); + + // if we have come this far, the propery contains + // text, we know the size. + XGetWindowProperty(m_display, win, m_xclip_out, 0, (long) pty_size, + False, AnyPropertyType, &pty_type, &pty_format, + &pty_items, &pty_size, (unsigned char **) &buffer); + + // allocate memory to accommodate data in *txt + if (*len == 0) { + *len = pty_items; + ltxt = (unsigned char *) malloc(*len); } else { - if(XGetWindowProperty(m_display, m_window, xevent.xselection.property , 0L, 4096L, False, AnyPropertyType, &rtype, &bits, &len, &bytes, &data) == Success) { - if (data) { - if (bits == 8 && (rtype == compound_text || rtype == a_text || rtype == a_string)) { - tmp_data = (unsigned char*) malloc(strlen((char*)data)+1); - strcpy((char*)tmp_data, (char*)data); - } - else - tmp_data= NULL; - - XFree(data); - return (GHOST_TUns8*)tmp_data; - } - } - return(NULL); + *len += pty_items; + ltxt = (unsigned char *) realloc(ltxt, *len); } - } + + // add data to ltxt + memcpy(<xt[*len - pty_items], buffer, pty_items); + + *txt = ltxt; + XFree(buffer); + + // delete property to get the next item + XDeleteProperty(m_display, win, m_xclip_out); + XFlush(m_display); + return; } + return; } - void -GHOST_SystemX11:: -putClipboard( -GHOST_TInt8 *buffer, int flag) const +GHOST_TUns8 *GHOST_SystemX11::getClipboard(bool selection) const { - static Atom Primary_atom; - Window m_window, owner; - - if(!buffer) {return;} - - if(flag == 0) { - Primary_atom = XInternAtom(m_display, "CLIPBOARD", False); - if(txt_cut_buffer) { free((void*)txt_cut_buffer); } + Atom sseln; + Atom target= m_string; + Window owner; + + // from xclip.c doOut() v0.11 + unsigned char *sel_buf; + unsigned long sel_len= 0; + XEvent evt; + unsigned int context= XCLIB_XCOUT_NONE; + + if (selection == True) + sseln= m_primary; + else + sseln= m_clipboard; + + vector<GHOST_IWindow *> & win_vec = m_windowManager->getWindows(); + vector<GHOST_IWindow *>::iterator win_it = win_vec.begin(); + GHOST_WindowX11 * window = static_cast<GHOST_WindowX11 *>(*win_it); + Window win = window->getXWindow(); + + /* check if we are the owner. */ + owner= XGetSelectionOwner(m_display, sseln); + if (owner == win) { + if (sseln == m_clipboard) { + sel_buf= (unsigned char *)malloc(strlen(txt_cut_buffer)+1); + strcpy((char *)sel_buf, txt_cut_buffer); + return((GHOST_TUns8*)sel_buf); + } + else { + sel_buf= (unsigned char *)malloc(strlen(txt_select_buffer)+1); + strcpy((char *)sel_buf, txt_select_buffer); + return((GHOST_TUns8*)sel_buf); + } + } + else if (owner == None) + return(NULL); + + while (1) { + /* only get an event if xcout() is doing something */ + if (context != XCLIB_XCOUT_NONE) + XNextEvent(m_display, &evt); + + /* fetch the selection, or part of it */ + getClipboard_xcout(evt, sseln, target, &sel_buf, &sel_len, &context); + + /* fallback is needed. set XA_STRING to target and restart the loop. */ + if (context == XCLIB_XCOUT_FALLBACK) { + context= XCLIB_XCOUT_NONE; + target= m_string; + continue; + } + else if (context == XCLIB_XCOUT_FALLBACK_UTF8) { + /* utf8 fail, move to compouned text. */ + context= XCLIB_XCOUT_NONE; + target= m_compound_text; + continue; + } + else if (context == XCLIB_XCOUT_FALLBACK_COMP) { + /* compouned text faile, move to text. */ + context= XCLIB_XCOUT_NONE; + target= m_text; + continue; + } + + /* only continue if xcout() is doing something */ + if (context == XCLIB_XCOUT_NONE) + break; + } + + if (sel_len) { + /* only print the buffer out, and free it, if it's not + * empty + */ + unsigned char *tmp_data = (unsigned char*) malloc(sel_len+1); + memcpy((char*)tmp_data, (char*)sel_buf, sel_len); + tmp_data[sel_len] = '\0'; - txt_cut_buffer = (char*) malloc(strlen(buffer)+1); - strcpy(txt_cut_buffer, buffer); - } else { - Primary_atom = XInternAtom(m_display, "PRIMARY", False); - if(txt_select_buffer) { free((void*)txt_select_buffer); } + if (sseln == m_string) + XFree(sel_buf); + else + free(sel_buf); - txt_select_buffer = (char*) malloc(strlen(buffer)+1); - strcpy(txt_select_buffer, buffer); + return (GHOST_TUns8*)tmp_data; } - - vector<GHOST_IWindow *> & win_vec = m_windowManager->getWindows(); + return(NULL); +} + +void GHOST_SystemX11::putClipboard(GHOST_TInt8 *buffer, bool selection) const +{ + Window m_window, owner; + + vector<GHOST_IWindow *> & win_vec = m_windowManager->getWindows(); vector<GHOST_IWindow *>::iterator win_it = win_vec.begin(); GHOST_WindowX11 * window = static_cast<GHOST_WindowX11 *>(*win_it); m_window = window->getXWindow(); - if(!Primary_atom) { - return; - } - - XSetSelectionOwner(m_display, Primary_atom, m_window, CurrentTime); - owner = XGetSelectionOwner(m_display, Primary_atom); - if (owner != m_window) - fprintf(stderr, "failed to own primary\n"); + if (buffer) { + if (selection == False) { + XSetSelectionOwner(m_display, m_clipboard, m_window, CurrentTime); + owner= XGetSelectionOwner(m_display, m_clipboard); + if (txt_cut_buffer) + free((void*)txt_cut_buffer); + + txt_cut_buffer = (char*) malloc(strlen(buffer)+1); + strcpy(txt_cut_buffer, buffer); + } else { + XSetSelectionOwner(m_display, m_primary, m_window, CurrentTime); + owner= XGetSelectionOwner(m_display, m_primary); + if (txt_select_buffer) + free((void*)txt_select_buffer); + + txt_select_buffer = (char*) malloc(strlen(buffer)+1); + strcpy(txt_select_buffer, buffer); + } - return; + if (owner != m_window) + fprintf(stderr, "failed to own primary\n"); + } } - diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index 576577917ba..711a188ffe9 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -199,27 +199,54 @@ public: prepareNdofInfo( volatile GHOST_TEventNDOFData *current_values ); - + + /* Helped function for get data from the clipboard. */ + void getClipboard_xcout(XEvent evt, Atom sel, Atom target, + unsigned char **txt, unsigned long *len, + unsigned int *context) const; + /** * Returns unsinged char from CUT_BUFFER0 - * @param flag Flag indicates which buffer to return 0 for clipboard 1 for selection - * @return Returns the Clipboard indicated by Flag + * @param selection Get selection, X11 only feature + * @return Returns the Clipboard indicated by Flag */ - GHOST_TUns8* - getClipboard(int flag) const; + GHOST_TUns8 *getClipboard(bool selection) const; /** * Puts buffer to system clipboard * @param buffer The buffer to copy to the clipboard - * @param flag Flag indicates which buffer to set ownership of 0 for clipboard 1 for selection + * @param selection Set the selection into the clipboard, X11 only feature */ - virtual void putClipboard(GHOST_TInt8 *buffer, int flag) const; + void putClipboard(GHOST_TInt8 *buffer, bool selection) const; - /* Atom used for ICCCM. */ + /** + * Atom used for ICCCM, WM-spec and Motif. + * We only need get this atom at the start, it's relative + * to the display not the window and are public for every + * window that need it. + */ + Atom m_wm_state; + Atom m_wm_change_state; + Atom m_net_state; + Atom m_net_max_horz; + Atom m_net_max_vert; + Atom m_net_fullscreen; + Atom m_motif; Atom m_wm_take_focus; Atom m_wm_protocols; Atom m_delete_window_atom; + /* Atoms for Selection, copy & paste. */ + Atom m_targets; + Atom m_string; + Atom m_compound_text; + Atom m_text; + Atom m_clipboard; + Atom m_primary; + Atom m_xclip_out; + Atom m_incr; + Atom m_utf8_string; + private : Display * m_display; diff --git a/intern/ghost/intern/GHOST_TimerManager.h b/intern/ghost/intern/GHOST_TimerManager.h index 27bbdb1ea1d..b37b5b79c14 100644 --- a/intern/ghost/intern/GHOST_TimerManager.h +++ b/intern/ghost/intern/GHOST_TimerManager.h @@ -33,10 +33,6 @@ #ifndef _GHOST_TIMER_MANAGER_H_ #define _GHOST_TIMER_MANAGER_H_ -#ifdef WIN32 -#pragma warning (disable:4786) // suppress stl-MSVC debug info warning -#endif // WIN32 - #include <vector> #include "GHOST_Types.h" diff --git a/intern/ghost/intern/GHOST_WindowCarbon.cpp b/intern/ghost/intern/GHOST_WindowCarbon.cpp index 9ae9e283b69..87bb86a37e7 100644 --- a/intern/ghost/intern/GHOST_WindowCarbon.cpp +++ b/intern/ghost/intern/GHOST_WindowCarbon.cpp @@ -51,7 +51,6 @@ AGL_RGBA, AGL_DOUBLEBUFFER, AGL_ACCELERATED, AGL_DEPTH_SIZE, 32, -AGL_AUX_BUFFERS, 1, AGL_NONE, }; @@ -61,7 +60,6 @@ AGL_DOUBLEBUFFER, AGL_ACCELERATED, AGL_FULLSCREEN, AGL_DEPTH_SIZE, 32, -AGL_AUX_BUFFERS, 1, AGL_NONE, }; @@ -252,7 +250,9 @@ void GHOST_WindowCarbon::getClientBounds(GHOST_Rect& bounds) const { Rect rect; GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getClientBounds(): window invalid") - ::GetPortBounds(m_grafPtr, &rect); + //::GetPortBounds(m_grafPtr, &rect); + ::GetWindowBounds(m_windowRef, kWindowContentRgn, &rect); + bounds.m_b = rect.bottom; bounds.m_l = rect.left; bounds.m_r = rect.right; @@ -326,7 +326,7 @@ GHOST_TWindowState GHOST_WindowCarbon::getState() const { GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getState(): window invalid") GHOST_TWindowState state; - if (::IsWindowVisible(m_windowRef)) { + if (::IsWindowVisible(m_windowRef) == false) { state = GHOST_kWindowStateMinimized; } else if (::IsWindowInStandardState(m_windowRef, nil, nil)) { @@ -378,6 +378,12 @@ GHOST_TSuccess GHOST_WindowCarbon::setState(GHOST_TWindowState state) case GHOST_kWindowStateMinimized: ::HideWindow(m_windowRef); break; + case GHOST_kWindowStateModified: + SetWindowModified(m_windowRef, 1); + break; + case GHOST_kWindowStateUnModified: + SetWindowModified(m_windowRef, 0); + break; case GHOST_kWindowStateMaximized: case GHOST_kWindowStateNormal: default: diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h index 46d8036328e..46e80d2c603 100644 --- a/intern/ghost/intern/GHOST_WindowManager.h +++ b/intern/ghost/intern/GHOST_WindowManager.h @@ -33,10 +33,6 @@ #ifndef _GHOST_WINDOW_MANAGER_H_ #define _GHOST_WINDOW_MANAGER_H_ -#ifdef WIN32 -#pragma warning (disable:4786) // suppress stl-MSVC debug info warning -#endif // WIN32 - #include <vector> #include "GHOST_Rect.h" diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 2094ae87c67..759951802af 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -111,22 +111,24 @@ GHOST_WindowWin32::GHOST_WindowWin32( m_hasMouseCaptured(false), m_nPressedButtons(0), m_customCursor(0), + m_wintab(NULL), m_tabletData(NULL), m_tablet(0), - m_wintab(NULL), m_maxPressure(0) { if (state != GHOST_kWindowStateFullScreen) { - /* Convert client size into window size */ - width += GetSystemMetrics(SM_CXSIZEFRAME)*2; - height += GetSystemMetrics(SM_CYSIZEFRAME)*2 + GetSystemMetrics(SM_CYCAPTION); + // take taskbar into account + RECT rect; + SystemParametersInfo(SPI_GETWORKAREA,0,&rect,0); + height = rect.bottom - rect.top; + width = rect.right - rect.left; m_hWnd = ::CreateWindow( s_windowClassName, // pointer to registered class name title, // pointer to window name WS_OVERLAPPEDWINDOW, // window style - left, // horizontal position of window - top, // vertical position of window + rect.left, // horizontal position of window + rect.top, // vertical position of window width, // window width height, // window height 0, // handle to parent or owner window @@ -150,7 +152,7 @@ GHOST_WindowWin32::GHOST_WindowWin32( } if (m_hWnd) { // Store a pointer to this class in the window structure - LONG result = ::SetWindowLong(m_hWnd, GWL_USERDATA, (LONG)this); + ::SetWindowLongPtr(m_hWnd, GWL_USERDATA, (LONG_PTR)this); // Store the device context m_hDC = ::GetDC(m_hWnd); @@ -239,7 +241,7 @@ GHOST_WindowWin32::~GHOST_WindowWin32() if (m_wintab) { GHOST_WIN32_WTClose fpWTClose = ( GHOST_WIN32_WTClose ) ::GetProcAddress( m_wintab, "WTClose" ); if (fpWTClose) { - if (m_tablet) + if (m_tablet) fpWTClose(m_tablet); if (m_tabletData) delete m_tabletData; @@ -297,11 +299,22 @@ void GHOST_WindowWin32::getWindowBounds(GHOST_Rect& bounds) const void GHOST_WindowWin32::getClientBounds(GHOST_Rect& bounds) const { RECT rect; - ::GetClientRect(m_hWnd, &rect); - bounds.m_b = rect.bottom; - bounds.m_l = rect.left; - bounds.m_r = rect.right; - bounds.m_t = rect.top; + + LONG_PTR result = ::GetWindowLongPtr(m_hWnd, GWL_STYLE); + ::GetWindowRect(m_hWnd, &rect); + + if((result & (WS_POPUP | WS_MAXIMIZE)) != (WS_POPUP | WS_MAXIMIZE)) { + bounds.m_b = rect.bottom-GetSystemMetrics(SM_CYCAPTION)-GetSystemMetrics(SM_CYSIZEFRAME)*2; + bounds.m_l = rect.left; + bounds.m_r = rect.right-GetSystemMetrics(SM_CYSIZEFRAME)*2; + bounds.m_t = rect.top; + } else { + ::GetWindowRect(m_hWnd, &rect); + bounds.m_b = rect.bottom; + bounds.m_l = rect.left; + bounds.m_r = rect.right; + bounds.m_t = rect.top; + } } @@ -310,7 +323,7 @@ GHOST_TSuccess GHOST_WindowWin32::setClientWidth(GHOST_TUns32 width) GHOST_TSuccess success; GHOST_Rect cBnds, wBnds; getClientBounds(cBnds); - if (cBnds.getWidth() != width) { + if (cBnds.getWidth() != (GHOST_TInt32)width) { getWindowBounds(wBnds); int cx = wBnds.getWidth() + width - cBnds.getWidth(); int cy = wBnds.getHeight(); @@ -329,7 +342,7 @@ GHOST_TSuccess GHOST_WindowWin32::setClientHeight(GHOST_TUns32 height) GHOST_TSuccess success; GHOST_Rect cBnds, wBnds; getClientBounds(cBnds); - if (cBnds.getHeight() != height) { + if (cBnds.getHeight() != (GHOST_TInt32)height) { getWindowBounds(wBnds); int cx = wBnds.getWidth(); int cy = wBnds.getHeight() + height - cBnds.getHeight(); @@ -348,7 +361,7 @@ GHOST_TSuccess GHOST_WindowWin32::setClientSize(GHOST_TUns32 width, GHOST_TUns32 GHOST_TSuccess success; GHOST_Rect cBnds, wBnds; getClientBounds(cBnds); - if ((cBnds.getWidth() != width) || (cBnds.getHeight() != height)) { + if ((cBnds.getWidth() != (GHOST_TInt32)width) || (cBnds.getHeight() != (GHOST_TInt32)height)) { getWindowBounds(wBnds); int cx = wBnds.getWidth() + width - cBnds.getWidth(); int cy = wBnds.getHeight() + height - cBnds.getHeight(); @@ -369,7 +382,11 @@ GHOST_TWindowState GHOST_WindowWin32::getState() const state = GHOST_kWindowStateMinimized; } else if (::IsZoomed(m_hWnd)) { - state = GHOST_kWindowStateMaximized; + LONG_PTR result = ::GetWindowLongPtr(m_hWnd, GWL_STYLE); + if((result & (WS_POPUP | WS_MAXIMIZE)) != (WS_POPUP | WS_MAXIMIZE)) + state = GHOST_kWindowStateMaximized; + else + state = GHOST_kWindowStateFullScreen; } else { state = GHOST_kWindowStateNormal; @@ -402,23 +419,25 @@ GHOST_TSuccess GHOST_WindowWin32::setState(GHOST_TWindowState state) wp.length = sizeof(WINDOWPLACEMENT); ::GetWindowPlacement(m_hWnd, &wp); switch (state) { - case GHOST_kWindowStateMinimized: - wp.showCmd = SW_SHOWMINIMIZED; + case GHOST_kWindowStateMinimized: + wp.showCmd = SW_SHOWMINIMIZED; break; - case GHOST_kWindowStateMaximized: - ShowWindow(m_hWnd, SW_HIDE); //fe. HACK! - //Solves redraw problems when switching from fullscreen to normal. - - wp.showCmd = SW_SHOWMAXIMIZED; - SetWindowLong(m_hWnd, GWL_STYLE, WS_OVERLAPPEDWINDOW); + case GHOST_kWindowStateMaximized: + ShowWindow(m_hWnd, SW_HIDE); + wp.showCmd = SW_SHOWMAXIMIZED; + SetWindowLongPtr(m_hWnd, GWL_STYLE, WS_OVERLAPPEDWINDOW); break; case GHOST_kWindowStateFullScreen: wp.showCmd = SW_SHOWMAXIMIZED; - SetWindowLong(m_hWnd, GWL_STYLE, WS_POPUP | WS_MAXIMIZE); + wp.ptMaxPosition.x = 0; + wp.ptMaxPosition.y = 0; + SetWindowLongPtr(m_hWnd, GWL_STYLE, WS_POPUP | WS_MAXIMIZE); break; - case GHOST_kWindowStateNormal: - default: - wp.showCmd = SW_SHOWNORMAL; + case GHOST_kWindowStateNormal: + default: + ShowWindow(m_hWnd, SW_HIDE); + wp.showCmd = SW_SHOWNORMAL; + SetWindowLongPtr(m_hWnd, GWL_STYLE, WS_OVERLAPPEDWINDOW); break; } return ::SetWindowPlacement(m_hWnd, &wp) == TRUE ? GHOST_kSuccess : GHOST_kFailure; @@ -475,7 +494,7 @@ GHOST_TSuccess GHOST_WindowWin32::installDrawingContext(GHOST_TDrawingContextTyp switch (type) { case GHOST_kDrawingContextTypeOpenGL: { - if(m_stereoVisual) + if(m_stereoVisual) sPreferredFormat.dwFlags |= PFD_STEREO; // Attempt to match device context pixel format to the preferred format @@ -612,9 +631,9 @@ void GHOST_WindowWin32::loadCursor(bool visible, GHOST_TStandardCursor cursor) c default: success = false; } - + if (success) { - HCURSOR hCursor = ::SetCursor(::LoadCursor(0, id)); + ::SetCursor(::LoadCursor(0, id)); } } } @@ -645,7 +664,7 @@ void GHOST_WindowWin32::processWin32TabletInitEvent() { if (m_wintab) { GHOST_WIN32_WTInfo fpWTInfo = ( GHOST_WIN32_WTInfo ) ::GetProcAddress( m_wintab, "WTInfoA" ); - + // let's see if we can initialize tablet here /* check if WinTab available. */ if (fpWTInfo) { @@ -656,7 +675,7 @@ void GHOST_WindowWin32::processWin32TabletInitEvent() m_maxPressure = Pressure.axMax; else m_maxPressure = 0; - + BOOL tiltSupport = fpWTInfo (WTI_DEVICES, DVC_ORIENTATION, &Orientation); if (tiltSupport) { /* does the tablet support azimuth ([0]) and altitude ([1]) */ @@ -722,17 +741,17 @@ void GHOST_WindowWin32::processWin32TabletEvent(WPARAM wParam, LPARAM lParam) WACOM uses negative altitude values to show that the pen is inverted; therefore we cast .orAltitude as an (int) and then use the absolute value. */ - + /* convert raw fixed point data to radians */ - altRad = (fabs((float)ort.orAltitude)/(float)m_maxAltitude) * M_PI/2.0; - azmRad = ((float)ort.orAzimuth/(float)m_maxAzimuth) * M_PI*2.0; + altRad = (float)((fabs((float)ort.orAltitude)/(float)m_maxAltitude) * M_PI/2.0); + azmRad = (float)(((float)ort.orAzimuth/(float)m_maxAzimuth) * M_PI*2.0); /* find length of the stylus' projected vector on the XY plane */ vecLen = cos(altRad); /* from there calculate X and Y components based on azimuth */ m_tabletData->Xtilt = sin(azmRad) * vecLen; - m_tabletData->Ytilt = sin(M_PI/2.0 - azmRad) * vecLen; + m_tabletData->Ytilt = (float)(sin(M_PI/2.0 - azmRad) * vecLen); } else { m_tabletData->Xtilt = 0.0f; @@ -762,25 +781,25 @@ static GHOST_TUns16 uns16ReverseBits(GHOST_TUns16 shrt) shrt= ((shrt>>8)&0x00FF) | ((shrt<<8)&0xFF00); return shrt; } -GHOST_TSuccess GHOST_WindowWin32::setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], +GHOST_TSuccess GHOST_WindowWin32::setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY) { - return setWindowCustomCursorShape((GHOST_TUns8*)bitmap, (GHOST_TUns8*)mask, + return setWindowCustomCursorShape((GHOST_TUns8*)bitmap, (GHOST_TUns8*)mask, 16, 16, hotX, hotY, 0, 1); } -GHOST_TSuccess GHOST_WindowWin32::setWindowCustomCursorShape(GHOST_TUns8 *bitmap, - GHOST_TUns8 *mask, int sizeX, int sizeY, int hotX, int hotY, +GHOST_TSuccess GHOST_WindowWin32::setWindowCustomCursorShape(GHOST_TUns8 *bitmap, + GHOST_TUns8 *mask, int sizeX, int sizeY, int hotX, int hotY, int fg_color, int bg_color) { GHOST_TUns32 andData[32]; GHOST_TUns32 xorData[32]; GHOST_TUns32 fullBitRow, fullMaskRow; int x, y, cols; - + cols=sizeX/8; /* Num of whole bytes per row (width of bm/mask) */ if (sizeX%8) cols++; - + if (m_customCursor) { DestroyCursor(m_customCursor); m_customCursor = NULL; @@ -820,9 +839,9 @@ GHOST_TSuccess GHOST_WindowWin32::setWindowCustomCursorShape(GHOST_TUns8 *bitmap static int WeightPixelFormat(PIXELFORMATDESCRIPTOR& pfd) { int weight = 0; - + /* assume desktop color depth is 32 bits per pixel */ - + /* cull unusable pixel formats */ /* if no formats can be found, can we determine why it was rejected? */ if( !(pfd.dwFlags & PFD_SUPPORT_OPENGL) || @@ -831,45 +850,45 @@ static int WeightPixelFormat(PIXELFORMATDESCRIPTOR& pfd) { ( pfd.cDepthBits <= 8 ) || !(pfd.iPixelType == PFD_TYPE_RGBA) ) return 0; - + weight = 1; /* it's usable */ - + /* the bigger the depth buffer the better */ /* give no weight to a 16-bit depth buffer, because those are crap */ weight += pfd.cDepthBits - 16; - + weight += pfd.cColorBits - 8; - + /* want swap copy capability -- it matters a lot */ if(pfd.dwFlags & PFD_SWAP_COPY) weight += 16; - + /* but if it's a generic (not accelerated) view, it's really bad */ if(pfd.dwFlags & PFD_GENERIC_FORMAT) weight /= 10; - + return weight; } -/* A modification of Ron Fosner's replacement for ChoosePixelFormat */ +/* A modification of Ron Fosner's replacement for ChoosePixelFormat */ /* returns 0 on error, else returns the pixel format number to be used */ static int EnumPixelFormats(HDC hdc) { int iPixelFormat; int i, n, w, weight = 0; PIXELFORMATDESCRIPTOR pfd; - + /* we need a device context to do anything */ if(!hdc) return 0; iPixelFormat = 1; /* careful! PFD numbers are 1 based, not zero based */ - - /* obtain detailed information about + + /* obtain detailed information about the device context's first pixel format */ - n = 1+::DescribePixelFormat(hdc, iPixelFormat, + n = 1+::DescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd); - + /* choose a pixel format using the useless Windows function in case we come up empty handed */ iPixelFormat = ::ChoosePixelFormat( hdc, &sPreferredFormat ); - + if(!iPixelFormat) return 0; /* couldn't find one to use */ for(i=1; i<=n; i++) { /* not the idiom, but it's right */ @@ -884,7 +903,7 @@ static int EnumPixelFormats(HDC hdc) { } } if (weight == 0) { - // we could find the correct stereo setting, just find any suitable format + // we could find the correct stereo setting, just find any suitable format for(i=1; i<=n; i++) { /* not the idiom, but it's right */ ::DescribePixelFormat( hdc, i, sizeof(PIXELFORMATDESCRIPTOR), &pfd ); w = WeightPixelFormat(pfd); diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 73d61a30977..2cc30aaa5bc 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -55,6 +55,16 @@ typedef struct { #define MWM_HINTS_DECORATIONS (1L << 1) /* + * A Client can't change the window property, that is + * the work of the window manager. In case, we send + * a ClientMessage to the RootWindow with the property + * and the Action (WM-spec define this): + */ +#define _NET_WM_STATE_REMOVE 0 +#define _NET_WM_STATE_ADD 1 +#define _NET_WM_STATE_TOGGLE 2 + +/* import bpy I = bpy.data.images['blender.png'] # the 48x48 icon @@ -258,49 +268,25 @@ GHOST_WindowX11( } - - // Are we in fullscreen mode - then include - // some obscure blut code to remove decorations. - - if (state == GHOST_kWindowStateFullScreen) { - - MotifWmHints hints; - Atom atom; - - atom = XInternAtom(m_display, "_MOTIF_WM_HINTS", False); - - if (atom == None) { - GHOST_PRINT("Could not intern X atom for _MOTIF_WM_HINTS.\n"); - } else { - hints.flags = MWM_HINTS_DECORATIONS; - hints.decorations = 0; /* Absolutely no decorations. */ - // other hints.decorations make no sense - // you can't select individual decorations - - XChangeProperty(m_display, m_window, - atom, atom, 32, - PropModeReplace, (unsigned char *) &hints, 4); - } - } else if (state == GHOST_kWindowStateMaximized) { - // With this, xprop should report the following just after launch - // _NET_WM_STATE(ATOM) = _NET_WM_STATE_MAXIMIZED_VERT, _NET_WM_STATE_MAXIMIZED_HORZ - // After demaximization the right side is empty, though (maybe not the most correct then?) - Atom state, atomh, atomv; - - state = XInternAtom(m_display, "_NET_WM_STATE", False); - atomh = XInternAtom(m_display, "_NET_WM_STATE_MAXIMIZED_HORZ", False); - atomv = XInternAtom(m_display, "_NET_WM_STATE_MAXIMIZED_VERT", False); - if (state == None ) { - GHOST_PRINT("Atom _NET_WM_STATE requested but not avaliable nor created.\n"); - } else { - XChangeProperty(m_display, m_window, - state, XA_ATOM, 32, - PropModeAppend, (unsigned char *) &atomh, 1); - XChangeProperty(m_display, m_window, - state, XA_ATOM, 32, - PropModeAppend, (unsigned char *) &atomv, 1); - } - } + /* + * One of the problem with WM-spec is that can't set a property + * to a window that isn't mapped. That is why we can't "just + * call setState" here. + * + * To fix this, we first need know that the window is really + * map waiting for the MapNotify event. + * + * So, m_post_init indicate that we need wait for the MapNotify + * event and then set the Window state to the m_post_state. + */ + if ((state != GHOST_kWindowStateNormal) && (state != GHOST_kWindowStateMinimized)) { + m_post_init = True; + m_post_state = state; + } + else { + m_post_init = False; + m_post_state = GHOST_kWindowStateNormal; + } // Create some hints for the window manager on how // we want this window treated. @@ -386,7 +372,8 @@ GHOST_WindowX11( XDestroyImage( mask_image ); xwmhints->initial_state = NormalState; - xwmhints->flags = IconPixmapHint|IconMaskHint|StateHint; + xwmhints->input= True; + xwmhints->flags= InputHint|IconPixmapHint|IconMaskHint|StateHint; XSetWMHints(display, m_window, xwmhints ); XFree(xwmhints); // done setting the icon @@ -620,7 +607,7 @@ screenToClient( GHOST_TInt32& outX, GHOST_TInt32& outY ) const { - // not sure about this one! + // This is correct! int ax,ay; Window temp; @@ -664,28 +651,298 @@ clientToScreen( outY = ay; } +void GHOST_WindowX11::icccmSetState(int state) +{ + XEvent xev; - GHOST_TWindowState -GHOST_WindowX11:: -getState( -) const { - //FIXME - return GHOST_kWindowStateNormal; + if (state != IconicState) + return; + + xev.xclient.type = ClientMessage; + xev.xclient.serial = 0; + xev.xclient.send_event = True; + xev.xclient.display = m_display; + xev.xclient.window = m_window; + xev.xclient.format = 32; + xev.xclient.message_type = m_system->m_wm_change_state; + xev.xclient.data.l[0] = state; + XSendEvent (m_display, RootWindow(m_display, DefaultScreen(m_display)), + False, SubstructureNotifyMask | SubstructureRedirectMask, &xev); } - GHOST_TSuccess -GHOST_WindowX11:: -setState( - GHOST_TWindowState state -){ - //TODO +int GHOST_WindowX11::icccmGetState(void) const +{ + unsigned char *prop_ret; + unsigned long bytes_after, num_ret; + Atom type_ret; + int format_ret, st; + + prop_ret = NULL; + st = XGetWindowProperty(m_display, m_window, m_system->m_wm_state, 0, + 0x7fffffff, False, m_system->m_wm_state, &type_ret, + &format_ret, &num_ret, &bytes_after, &prop_ret); + + if ((st == Success) && (prop_ret) && (num_ret == 2)) + st = prop_ret[0]; + else + st = NormalState; + + if (prop_ret) + XFree(prop_ret); + return (st); +} + +void GHOST_WindowX11::netwmMaximized(bool set) +{ + XEvent xev; + + xev.xclient.type = ClientMessage; + xev.xclient.serial = 0; + xev.xclient.send_event = True; + xev.xclient.window = m_window; + xev.xclient.message_type = m_system->m_net_state; + xev.xclient.format = 32; + + if (set == True) + xev.xclient.data.l[0] = _NET_WM_STATE_ADD; + else + xev.xclient.data.l[0] = _NET_WM_STATE_REMOVE; + + xev.xclient.data.l[1] = m_system->m_net_max_horz; + xev.xclient.data.l[2] = m_system->m_net_max_vert; + xev.xclient.data.l[3] = 0; + xev.xclient.data.l[4] = 0; + XSendEvent(m_display, RootWindow(m_display, DefaultScreen(m_display)), + False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); +} + +bool GHOST_WindowX11::netwmIsMaximized(void) const +{ + unsigned char *prop_ret; + unsigned long bytes_after, num_ret, i; + Atom type_ret; + bool st; + int format_ret, ret, count; + + prop_ret = NULL; + st = False; + ret = XGetWindowProperty(m_display, m_window, m_system->m_net_state, 0, + 0x7fffffff, False, XA_ATOM, &type_ret, &format_ret, + &num_ret, &bytes_after, &prop_ret); + if ((ret == Success) && (prop_ret) && (format_ret == 32)) { + count = 0; + for (i = 0; i < num_ret; i++) { + if (((unsigned long *) prop_ret)[i] == m_system->m_net_max_horz) + count++; + if (((unsigned long *) prop_ret)[i] == m_system->m_net_max_vert) + count++; + if (count == 2) { + st = True; + break; + } + } + } + + if (prop_ret) + XFree(prop_ret); + return (st); +} + +void GHOST_WindowX11::netwmFullScreen(bool set) +{ + XEvent xev; + + xev.xclient.type = ClientMessage; + xev.xclient.serial = 0; + xev.xclient.send_event = True; + xev.xclient.window = m_window; + xev.xclient.message_type = m_system->m_net_state; + xev.xclient.format = 32; + + if (set == True) + xev.xclient.data.l[0] = _NET_WM_STATE_ADD; + else + xev.xclient.data.l[0] = _NET_WM_STATE_REMOVE; + + xev.xclient.data.l[1] = m_system->m_net_fullscreen; + xev.xclient.data.l[2] = 0; + xev.xclient.data.l[3] = 0; + xev.xclient.data.l[4] = 0; + XSendEvent(m_display, RootWindow(m_display, DefaultScreen(m_display)), + False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); +} + +bool GHOST_WindowX11::netwmIsFullScreen(void) const +{ + unsigned char *prop_ret; + unsigned long bytes_after, num_ret, i; + Atom type_ret; + bool st; + int format_ret, ret; + + prop_ret = NULL; + st = False; + ret = XGetWindowProperty(m_display, m_window, m_system->m_net_state, 0, + 0x7fffffff, False, XA_ATOM, &type_ret, &format_ret, + &num_ret, &bytes_after, &prop_ret); + if ((ret == Success) && (prop_ret) && (format_ret == 32)) { + for (i = 0; i < num_ret; i++) { + if (((unsigned long *) prop_ret)[i] == m_system->m_net_fullscreen) { + st = True; + break; + } + } + } + + if (prop_ret) + XFree(prop_ret); + return (st); +} + +void GHOST_WindowX11::motifFullScreen(bool set) +{ + MotifWmHints hints; + + hints.flags = MWM_HINTS_DECORATIONS; + if (set == True) + hints.decorations = 0; + else + hints.decorations = 1; + + XChangeProperty(m_display, m_window, m_system->m_motif, + m_system->m_motif, 32, PropModeReplace, + (unsigned char *) &hints, 4); +} + +bool GHOST_WindowX11::motifIsFullScreen(void) const +{ + unsigned char *prop_ret; + unsigned long bytes_after, num_ret; + MotifWmHints *hints; + Atom type_ret; + bool state; + int format_ret, st; + + prop_ret = NULL; + state = False; + st = XGetWindowProperty(m_display, m_window, m_system->m_motif, 0, + 0x7fffffff, False, m_system->m_motif, + &type_ret, &format_ret, &num_ret, + &bytes_after, &prop_ret); + if ((st == Success) && (prop_ret)) { + hints = (MotifWmHints *) prop_ret; + if (hints->flags & MWM_HINTS_DECORATIONS) { + if (!hints->decorations) + state = True; + } + } + + if (prop_ret) + XFree(prop_ret); + return (state); +} - if (state == (int)getState()) { +GHOST_TWindowState GHOST_WindowX11::getState() const +{ + GHOST_TWindowState state_ret; + int state; + + state_ret = GHOST_kWindowStateNormal; + state = icccmGetState(); + /* + * In the Iconic and Withdrawn state, the window + * is unmaped, so only need return a Minimized state. + */ + if ((state == IconicState) || (state == WithdrawnState)) + state_ret = GHOST_kWindowStateMinimized; + else if (netwmIsMaximized() == True) + state_ret = GHOST_kWindowStateMaximized; + else if (netwmIsFullScreen() == True) + state_ret = GHOST_kWindowStateFullScreen; + else if (motifIsFullScreen() == True) + state_ret = GHOST_kWindowStateFullScreen; + return (state_ret); +} + +GHOST_TSuccess GHOST_WindowX11::setState(GHOST_TWindowState state) +{ + GHOST_TWindowState cur_state; + bool is_max, is_full, is_motif_full; + + cur_state = getState(); + if (state == (int)cur_state) return GHOST_kSuccess; - } else { - return GHOST_kFailure; + + if (cur_state != GHOST_kWindowStateMinimized) { + /* + * The window don't have this property's + * if it's not mapped. + */ + is_max = netwmIsMaximized(); + is_full = netwmIsFullScreen(); + } + else { + is_max = False; + is_full = False; + } + + is_motif_full = motifIsFullScreen(); + + if (state == GHOST_kWindowStateNormal) { + if (is_max == True) + netwmMaximized(False); + if (is_full == True) + netwmFullScreen(False); + if (is_motif_full == True) + motifFullScreen(False); + icccmSetState(NormalState); + return (GHOST_kSuccess); + } + + if (state == GHOST_kWindowStateFullScreen) { + /* + * We can't change to full screen if the window + * isn't mapped. + */ + if (cur_state == GHOST_kWindowStateMinimized) + return (GHOST_kFailure); + + if (is_max == True) + netwmMaximized(False); + if (is_full == False) + netwmFullScreen(True); + if (is_motif_full == False) + motifFullScreen(True); + return (GHOST_kSuccess); + } + + if (state == GHOST_kWindowStateMaximized) { + /* + * We can't change to Maximized if the window + * isn't mapped. + */ + if (cur_state == GHOST_kWindowStateMinimized) + return (GHOST_kFailure); + + if (is_full == True) + netwmFullScreen(False); + if (is_motif_full == True) + motifFullScreen(False); + if (is_max == False) + netwmMaximized(True); + return (GHOST_kSuccess); + } + + if (state == GHOST_kWindowStateMinimized) { + /* + * The window manager need save the current state of + * the window (maximized, full screen, etc). + */ + icccmSetState(IconicState); + return (GHOST_kSuccess); } + return (GHOST_kFailure); } #include <iostream> diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h index abb5c131cb7..1392e2c19a6 100644 --- a/intern/ghost/intern/GHOST_WindowX11.h +++ b/intern/ghost/intern/GHOST_WindowX11.h @@ -212,6 +212,15 @@ public: const GHOST_TabletData* GetTabletData() { return &m_xtablet.CommonData; } + + /* + * Need this in case that we want start the window + * in FullScree or Maximized state. + * Check GHOST_WindowX11.cpp + */ + bool m_post_init; + GHOST_TWindowState m_post_state; + protected: /** * Tries to install a rendering context in this window. @@ -327,6 +336,18 @@ private : /* Tablet devices */ XTablet m_xtablet; + + void icccmSetState(int state); + int icccmGetState() const; + + void netwmMaximized(bool set); + bool netwmIsMaximized() const; + + void netwmFullScreen(bool set); + bool netwmIsFullScreen() const; + + void motifFullScreen(bool set); + bool motifIsFullScreen() const; }; diff --git a/intern/ghost/intern/Makefile b/intern/ghost/intern/Makefile index 467ec768720..5b95bbb3b68 100644 --- a/intern/ghost/intern/Makefile +++ b/intern/ghost/intern/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # ghost intern Makefile @@ -38,8 +40,6 @@ CCSRCS += GHOST_Rect.cpp GHOST_DisplayManager.cpp GHOST_C-api.cpp CCSRCS += GHOST_CallbackEventConsumer.cpp CCSRCS += GHOST_NDOFManager.cpp -include nan_definitions.mk - ifeq ($(OS),$(findstring $(OS), "darwin")) CCSRCS += $(wildcard *Carbon.cpp) endif diff --git a/intern/ghost/test/multitest/Makefile b/intern/ghost/test/multitest/Makefile index e67faf012d2..1ecbcd98e2b 100644 --- a/intern/ghost/test/multitest/Makefile +++ b/intern/ghost/test/multitest/Makefile @@ -41,7 +41,6 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../.. @@ -49,7 +48,6 @@ OCGGHOST = $(OCGDIR)/intern/ghost LIBS = $(OCGGHOST)/$(DEBUG_DIR)libghost.a SLIBS += $(LCGDIR)/string/lib/libstring.a -SLIBS += $(LCGDIR)/bmfont/lib/libbmfont.a SLIBS += $(LCGDIR)/guardedalloc/lib/libguardedalloc.a all:: diff --git a/intern/guardedalloc/Makefile b/intern/guardedalloc/Makefile index f0cef3d222c..55894d54c8e 100644 --- a/intern/guardedalloc/Makefile +++ b/intern/guardedalloc/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # decimation main makefile. @@ -38,16 +40,13 @@ TESTDIRS = test include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_GUARDEDALLOC) ] || mkdir $(NAN_GUARDEDALLOC) @[ -d $(NAN_GUARDEDALLOC)/include ] || mkdir $(NAN_GUARDEDALLOC)/include - @[ -d $(NAN_GUARDEDALLOC)/lib ] || mkdir $(NAN_GUARDEDALLOC)/lib - @[ -d $(NAN_GUARDEDALLOC)/lib/debug ] || mkdir $(NAN_GUARDEDALLOC)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/debug/ + @[ -d $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a - ranlib $(NAN_GUARDEDALLOC)/lib/debug/libguardedalloc.a + ranlib $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR)libguardedalloc.a endif @../tools/cpifdiff.sh *.h $(NAN_GUARDEDALLOC)/include/ diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript index ef6c6b49266..0184ddd9785 100644 --- a/intern/guardedalloc/SConscript +++ b/intern/guardedalloc/SConscript @@ -5,4 +5,4 @@ Import('env') sources = env.Glob('intern/*.c') incs = '.' -env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [10, 175] ) +env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [5, 175] ) diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c index 5c59640200f..979e77ebbed 100644 --- a/intern/guardedalloc/intern/mmap_win.c +++ b/intern/guardedalloc/intern/mmap_win.c @@ -162,6 +162,7 @@ intptr_t munmap(void *ptr, intptr_t size) CloseHandle( mm->maphandle ); CloseHandle( mm->fhandle); mmap_remlink(mmapbase, mm); + free(mm); return 0; } diff --git a/intern/iksolver/Makefile b/intern/iksolver/Makefile index a6cfa88eb30..09e6e3a1c2a 100644 --- a/intern/iksolver/Makefile +++ b/intern/iksolver/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # iksolver main makefile. @@ -38,16 +40,13 @@ TESTDIRS = test include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_IKSOLVER) ] || mkdir $(NAN_IKSOLVER) @[ -d $(NAN_IKSOLVER)/include ] || mkdir $(NAN_IKSOLVER)/include - @[ -d $(NAN_IKSOLVER)/lib ] || mkdir $(NAN_IKSOLVER)/lib - @[ -d $(NAN_IKSOLVER)/lib/debug ] || mkdir $(NAN_IKSOLVER)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libiksolver.a $(NAN_IKSOLVER)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libiksolver.a $(NAN_IKSOLVER)/lib/debug/ + @[ -d $(NAN_IKSOLVER)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_IKSOLVER)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libiksolver.a $(NAN_IKSOLVER)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_IKSOLVER)/lib/libiksolver.a - ranlib $(NAN_IKSOLVER)/lib/debug/libiksolver.a + ranlib $(NAN_IKSOLVER)/lib/$(DEBUG_DIR)libiksolver.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_IKSOLVER)/include/ diff --git a/intern/iksolver/SConscript b/intern/iksolver/SConscript index 543ee46487c..df8c10b7302 100644 --- a/intern/iksolver/SConscript +++ b/intern/iksolver/SConscript @@ -5,5 +5,5 @@ sources = env.Glob('intern/*.cpp') incs = 'intern ../moto/include ../memutil' -env.BlenderLib ('bf_IK', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] ) +env.BlenderLib ('bf_IK', sources, Split(incs), [], libtype=['intern'], priority=[100] ) diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp index 9de937ea4b2..9eec1c38a2d 100644 --- a/intern/iksolver/intern/IK_Solver.cpp +++ b/intern/iksolver/intern/IK_Solver.cpp @@ -175,11 +175,12 @@ void IK_SetLimit(IK_Segment *seg, IK_SegmentAxis axis, float lmin, float lmax) IK_QSegment *qseg = (IK_QSegment*)seg; if (axis >= IK_TRANS_X) { - if(!qseg->Translational()) + if(!qseg->Translational()) { if(qseg->Composite() && qseg->Composite()->Translational()) qseg = qseg->Composite(); else return; + } if(axis == IK_TRANS_X) axis = IK_X; else if(axis == IK_TRANS_Y) axis = IK_Y; @@ -201,11 +202,12 @@ void IK_SetStiffness(IK_Segment *seg, IK_SegmentAxis axis, float stiffness) MT_Scalar weight = 1.0-stiffness; if (axis >= IK_TRANS_X) { - if(!qseg->Translational()) + if(!qseg->Translational()) { if(qseg->Composite() && qseg->Composite()->Translational()) qseg = qseg->Composite(); else return; + } if(axis == IK_TRANS_X) axis = IK_X; else if(axis == IK_TRANS_Y) axis = IK_Y; diff --git a/intern/memutil/Makefile b/intern/memutil/Makefile index 787ca4fd58f..50aa0528f31 100644 --- a/intern/memutil/Makefile +++ b/intern/memutil/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # memutil main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_MEMUTIL) ] || mkdir $(NAN_MEMUTIL) @[ -d $(NAN_MEMUTIL)/include ] || mkdir $(NAN_MEMUTIL)/include - @[ -d $(NAN_MEMUTIL)/lib ] || mkdir $(NAN_MEMUTIL)/lib - @[ -d $(NAN_MEMUTIL)/lib/debug ] || mkdir $(NAN_MEMUTIL)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libmemutil.a $(NAN_MEMUTIL)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libmemutil.a $(NAN_MEMUTIL)/lib/debug + @[ -d $(NAN_MEMUTIL)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_MEMUTIL)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libmemutil.a $(NAN_MEMUTIL)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_MEMUTIL)/lib/libmemutil.a - ranlib $(NAN_MEMUTIL)/lib/debug/libmemutil.a + ranlib $(NAN_MEMUTIL)/lib/$(DEBUG_DIR)libmemutil.a endif @../tools/cpifdiff.sh *.h $(NAN_MEMUTIL)/include/ diff --git a/intern/moto/Makefile b/intern/moto/Makefile index 7bd7ea10abc..3ad4fde9c4e 100644 --- a/intern/moto/Makefile +++ b/intern/moto/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # moto main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_MOTO) ] || mkdir $(NAN_MOTO) @[ -d $(NAN_MOTO)/include ] || mkdir $(NAN_MOTO)/include - @[ -d $(NAN_MOTO)/lib ] || mkdir $(NAN_MOTO)/lib - @[ -d $(NAN_MOTO)/lib/debug ] || mkdir $(NAN_MOTO)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libmoto.a $(NAN_MOTO)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libmoto.a $(NAN_MOTO)/lib/debug/ + @[ -d $(NAN_MOTO)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_MOTO)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libmoto.a $(NAN_MOTO)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_MOTO)/lib/libmoto.a - ranlib $(NAN_MOTO)/lib/debug/libmoto.a + ranlib $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a endif @../tools/cpifdiff.sh include/*.h $(NAN_MOTO)/include/ diff --git a/intern/moto/SConscript b/intern/moto/SConscript index 636515aa5c5..a730e6de535 100644 --- a/intern/moto/SConscript +++ b/intern/moto/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp') incs = 'include' -env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern','game','game2','player'], priority = [15, 55, 100, 135] ) +env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern'], priority = [130] ) diff --git a/intern/opennl/Makefile b/intern/opennl/Makefile index a84fd135d1d..023491792db 100644 --- a/intern/opennl/Makefile +++ b/intern/opennl/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # opennl main makefile. @@ -40,25 +42,19 @@ DIRS = intern superlu include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_OPENNL) ] || mkdir $(NAN_OPENNL) @[ -d $(NAN_OPENNL)/include ] || mkdir $(NAN_OPENNL)/include - @[ -d $(NAN_OPENNL)/lib ] || mkdir $(NAN_OPENNL)/lib - @[ -d $(NAN_OPENNL)/lib/debug ] || mkdir $(NAN_OPENNL)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libopennl.a $(NAN_OPENNL)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libopennl.a $(NAN_OPENNL)/lib/debug/ + @[ -d $(NAN_OPENNL)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_OPENNL)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libopennl.a $(NAN_OPENNL)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_OPENNL)/lib/libopennl.a - ranlib $(NAN_OPENNL)/lib/debug/libopennl.a + ranlib $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a endif @../tools/cpifdiff.sh extern/*.h $(NAN_OPENNL)/include/ @[ -d $(NAN_SUPERLU) ] || mkdir $(NAN_SUPERLU) - @[ -d $(NAN_SUPERLU)/lib ] || mkdir $(NAN_SUPERLU)/lib - @[ -d $(NAN_SUPERLU)/lib/debug ] || mkdir $(NAN_SUPERLU)/lib/debug - @../tools/cpifdiff.sh $(DIR_SLU)/libsuperlu.a $(NAN_SUPERLU)/lib/ - @../tools/cpifdiff.sh $(DIR_SLU)/debug/libsuperlu.a $(NAN_SUPERLU)/lib/debug/ + @[ -d $(NAN_SUPERLU)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_SUPERLU)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR_SLU)/$(DEBUG_DIR)libsuperlu.a $(NAN_SUPERLU)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_SUPERLU)/lib/libsuperlu.a - ranlib $(NAN_SUPERLU)/lib/debug/libsuperlu.a + ranlib $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a endif diff --git a/intern/opennl/superlu/util.c b/intern/opennl/superlu/util.c index 824cabacee5..f77da9c4736 100644 --- a/intern/opennl/superlu/util.c +++ b/intern/opennl/superlu/util.c @@ -34,7 +34,7 @@ float DenseSize(int n, float sum_nw); void superlu_abort_and_exit(char* msg) { - fprintf(stderr, msg); + fprintf(stderr, "%s", msg); exit (-1); } diff --git a/intern/string/Makefile b/intern/string/Makefile index e885b87babe..7972defd406 100644 --- a/intern/string/Makefile +++ b/intern/string/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # string main makefile. @@ -38,16 +40,13 @@ DIRS = intern include nan_subdirs.mk -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_STRING) ] || mkdir $(NAN_STRING) @[ -d $(NAN_STRING)/include ] || mkdir $(NAN_STRING)/include - @[ -d $(NAN_STRING)/lib ] || mkdir $(NAN_STRING)/lib - @[ -d $(NAN_STRING)/lib/debug ] || mkdir $(NAN_STRING)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libstring.a $(NAN_STRING)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libstring.a $(NAN_STRING)/lib/debug/ + @[ -d $(NAN_STRING)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_STRING)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libstring.a $(NAN_STRING)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_STRING)/lib/libstring.a - ranlib $(NAN_STRING)/lib/debug/libstring.a + ranlib $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a endif @../tools/cpifdiff.sh *.h $(NAN_STRING)/include/ diff --git a/intern/string/SConscript b/intern/string/SConscript index 7f817f82759..8973ac88a66 100644 --- a/intern/string/SConscript +++ b/intern/string/SConscript @@ -4,4 +4,4 @@ Import ('env') sources = env.Glob('intern/*.cpp') incs = '.' -env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['core', 'player'], priority = [30,10] ) +env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['intern'], priority = [50] ) diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index ec945c80c7c..941430fd976 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -142,7 +142,7 @@ public: inline operator const char *() const { return pData; } inline char *Ptr() { return pData; } inline const char *ReadPtr() const { return pData; } - inline float ToFloat() const { float x=atof(pData); return x; } + inline float ToFloat() const { float x=(float)(atof(pData)); return x; } inline int ToInt() const { return atoi(pData); } // Operators |