diff -Naur fung-calc-1.3.2b/config.h fung-calc-1.3.2b-jca/config.h --- fung-calc-1.3.2b/config.h 1969-12-31 19:00:00.000000000 -0500 +++ fung-calc-1.3.2b-jca/config.h 2006-09-15 15:32:44.000000000 -0400 @@ -0,0 +1,92 @@ +/* Somewhat standard config.h file generated by Jeremy Andrus :-) */ + +/* Define if you have libjpeg */ +#define HAVE_LIBJPEG 1 + +/* Define if you have libpng */ +#define HAVE_LIBPNG 1 + +/* Define if you have a working libpthread (will enable threaded code) */ +#define HAVE_LIBPTHREAD 1 + +/* Define if you have libz */ +#define HAVE_LIBZ 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define if you have res_init */ +#define HAVE_RES_INIT 1 + +/* Define if you have the res_init prototype */ +#define HAVE_RES_INIT_PROTO 1 + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* C++ compiler supports template repository */ +#define HAVE_TEMPLATE_REPOSITORY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Base installation directory */ +#define INSTALL_DIR "C:\\Program Files\\Fung-Calc" + +/* Name of package */ +#define PACKAGE "fung-calc" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* The size of a `char', as computed by sizeof. */ +#define SIZEOF_CHAR 1 + +/* The size of a `char *', as computed by sizeof. */ +#define SIZEOF_CHAR_P 4 + +/* The size of a `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of a `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "1.3.2b" + diff -Naur fung-calc-1.3.2b/src/fung-calc.rc fung-calc-1.3.2b-jca/src/fung-calc.rc --- fung-calc-1.3.2b/src/fung-calc.rc 1969-12-31 19:00:00.000000000 -0500 +++ fung-calc-1.3.2b-jca/src/fung-calc.rc 2006-09-15 15:25:33.000000000 -0400 @@ -0,0 +1,2 @@ +IDI_ICON1 ICON DISCARDABLE "icons/app-fung_calc.ico" + diff -Naur fung-calc-1.3.2b/src/icons/app-fung_calc.ico fung-calc-1.3.2b-jca/src/icons/app-fung_calc.ico --- fung-calc-1.3.2b/src/icons/app-fung_calc.ico 1969-12-31 19:00:00.000000000 -0500 +++ fung-calc-1.3.2b-jca/src/icons/app-fung_calc.ico 2006-09-15 15:25:34.000000000 -0400 @@ -0,0 +1 @@ +00(0`HH)))KKKZZZZZZZYUWTEWTFYXT[[[ZZZZYUWTEWTFYXT[[[ZZZZYUWTEWTFYXSZZZZVVXLLS++QS..YPPZWWZXUWTEWTFYXT[[[ZZZZYUWTEWTFYXT[[[ZZZZYUWTEWTFYXSWWWFFF %%%[[[û¸û¸û·ĴWZLOvwķú¸û¸û·FFF...qqqゆXewWWW//,srk늉P^I·YXS.,%qmZǦ¥tmGXG|ĺWTF.-%qmYǤѲ읔{[lڥخWTE00-tsnĂiߋ߱ûZYU000uutتٚ퇆~zյZZZ000uuu띉ש^\XSzhZZZ//,srlޣ|Ơ\lqfZLZFgĠ¸YXT.,%qmZǦܝڪذƩ⛙ZGsbdjggz֚WTF.-%qmYǤВzsvqifIu[ݐȤѧԤٙWTE00-tsnǶ{xXgU~t|r`ûZYU000uut^RNCieߺЙܞZZZ000uuuQJF?jhꚖZZZ//,srlȴ{|ZmYy뚒߬ͨ¸YXT.,%qmZǦ͐vmr|efޗϭ۳WTF.-%qmYǤؘԣӪŧ㡟`Kvghr}Ė՗ߡWTE00-tsn栀͝^nwoqf퐀ťûZYU000ttt霈ز{yn퐅ZZZ//0ttu}mg}{ֲZZZ))/eesӧЗҘӓt{x쟓NNY.HHp̝뙕әԜ鞞뙕әԜ鞞뙕әԜ鞞ffgh틌ꘌΗʙט|і]MSomn鉌؍̟љԜ陙z{78V.FGp˚떒Ӗԙ際떒Ӗԙ際떒Ӗԙ際deff툉떐ҖҘᗇߗzϞsptnooSk_}˕ΖԘ薖xy67V**0hhtȽۥۢܠ㘉||vW^~޶PPZ..0rru윔ÿ캞볘럙w{肅鈆ro{쇈XXZ000uuuޤզؚ|||{~xzhvermvvǼZZZ//,srlЫȦꉁ^\oruh´¸YXT.,%qmZǦݴڱتҖ̔}yymblۊveg׉x|ȟت֚ךݮWTF.,%qmYǤښƕwpqmkkqj{{ݻ׺ڰWTE00-tsnƗ엀WLRGgYw_}gyֱֳ환ꝛûZYU000uut﹏|a_YVyq|ºZZZ000uuu֭ŷsrlh}mZZZ//,srl³y}틁ɥѭꙘ霛¸YXT.,%qmZǦݯΑ|sksgzvy戀ϭ׶–әWTF.,%qmYǤؙѢpw]v`u骆ڴWTE00-tsnȣ쥀y~ꐉߖqw߱ûZYU000uutׯ囥^Rz{ZZZ000uuuةqKZp||ͨձZZZ//,srl䛋כy՟no޲¸YXT.,%qmZǦʖҘýܴЧiz^tl̔ݯWTF.,%qmYǤȖә۬Ďtm`iլ޳߯ߟWTE00-tsn띜zelSwgșݰúZYU000tttvu퉇솃yosſZWV///tttѩɼ|yl[|këYOO(((aaaǤǥǤǥǤǥտҁ˄˹ǤǥƢàȼҼ͠ȌuLjrȃ|mnTTF&&555aaatttttstsnqmYqmZsrluuuuuttsnqmYqmZsrluuuuuttsnqmYqmZsrluuurruhhsFGoHHoeesttuttttsnqmYqmZsrluuuuuttsnqmYqmZsrkutttporhdo^NnYImKFf**Q% (((0000000/-.,%.,%//,0000000/-.,%.,%//,0000000/-.,%.,%//,000..0**0--))/0000000/-.,%.,%//,0000000/-.,%.,%//,000//...+-*#-(!, )  \ No newline at end of file diff -Naur fung-calc-1.3.2b/src/libfungcalc/3D/glTextRender.cpp fung-calc-1.3.2b-jca/src/libfungcalc/3D/glTextRender.cpp --- fung-calc-1.3.2b/src/libfungcalc/3D/glTextRender.cpp 1969-12-31 19:00:00.000000000 -0500 +++ fung-calc-1.3.2b-jca/src/libfungcalc/3D/glTextRender.cpp 2006-09-15 15:25:37.000000000 -0400 @@ -0,0 +1,126 @@ + +#include +#include "glTextRender.h" + +GLubyte GLTextRender::m_rasters[95][13] = { + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36}, + {0x00, 0x00, 0x00, 0x66, 0x66, 0xff, 0x66, 0x66, 0xff, 0x66, 0x66, 0x00, 0x00}, + {0x00, 0x00, 0x18, 0x7e, 0xff, 0x1b, 0x1f, 0x7e, 0xf8, 0xd8, 0xff, 0x7e, 0x18}, + {0x00, 0x00, 0x0e, 0x1b, 0xdb, 0x6e, 0x30, 0x18, 0x0c, 0x76, 0xdb, 0xd8, 0x70}, + {0x00, 0x00, 0x7f, 0xc6, 0xcf, 0xd8, 0x70, 0x70, 0xd8, 0xcc, 0xcc, 0x6c, 0x38}, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x0c, 0x0e}, + {0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c}, + {0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30}, + {0x00, 0x00, 0x00, 0x00, 0x99, 0x5a, 0x3c, 0xff, 0x3c, 0x5a, 0x99, 0x00, 0x00}, + {0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 0x00, 0x00}, + {0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x03, 0x03}, + {0x00, 0x00, 0x3c, 0x66, 0xc3, 0xe3, 0xf3, 0xdb, 0xcf, 0xc7, 0xc3, 0x66, 0x3c}, + {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x38, 0x18}, + {0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0xe7, 0x7e}, + {0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0x07, 0x03, 0x03, 0xe7, 0x7e}, + {0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xff, 0xcc, 0x6c, 0x3c, 0x1c, 0x0c}, + {0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xff}, + {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, + {0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x03, 0x03, 0xff}, + {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e}, + {0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x03, 0x7f, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e}, + {0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06}, + {0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60}, + {0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x0c, 0x06, 0x03, 0xc3, 0xc3, 0x7e}, + {0x00, 0x00, 0x3f, 0x60, 0xcf, 0xdb, 0xd3, 0xdd, 0xc3, 0x7e, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18}, + {0x00, 0x00, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, + {0x00, 0x00, 0x7e, 0xe7, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, + {0x00, 0x00, 0xfc, 0xce, 0xc7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc7, 0xce, 0xfc}, + {0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xff}, + {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xff}, + {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xcf, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, + {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, + {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e}, + {0x00, 0x00, 0x7c, 0xee, 0xc6, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06}, + {0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xe0, 0xf0, 0xd8, 0xcc, 0xc6, 0xc3}, + {0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0}, + {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb, 0xff, 0xff, 0xe7, 0xc3}, + {0x00, 0x00, 0xc7, 0xc7, 0xcf, 0xcf, 0xdf, 0xdb, 0xfb, 0xf3, 0xf3, 0xe3, 0xe3}, + {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xe7, 0x7e}, + {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, + {0x00, 0x00, 0x3f, 0x6e, 0xdf, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c}, + {0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, + {0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0xe0, 0xc0, 0xc0, 0xe7, 0x7e}, + {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff}, + {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, + {0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, + {0x00, 0x00, 0xc3, 0xe7, 0xff, 0xff, 0xdb, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, + {0x00, 0x00, 0xc3, 0x66, 0x66, 0x3c, 0x3c, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3}, + {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3}, + {0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x7e, 0x0c, 0x06, 0x03, 0x03, 0xff}, + {0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c}, + {0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60}, + {0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c}, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18}, + {0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x30, 0x70}, + {0x00, 0x00, 0x7f, 0xc3, 0xc3, 0x7f, 0x03, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0}, + {0x00, 0x00, 0x7e, 0xc3, 0xc0, 0xc0, 0xc0, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x03, 0x03, 0x03, 0x03, 0x03}, + {0x00, 0x00, 0x7f, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x33, 0x1e}, + {0x7e, 0xc3, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0}, + {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00}, + {0x38, 0x6c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x00}, + {0x00, 0x00, 0xc6, 0xcc, 0xf8, 0xf0, 0xd8, 0xcc, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0}, + {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78}, + {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xfe, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00}, + {0xc0, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0x00, 0x00, 0x00, 0x00}, + {0x03, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xfe, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0xfe, 0x03, 0x03, 0x7e, 0xc0, 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x1c, 0x36, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x00}, + {0x00, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0xc3, 0xe7, 0xff, 0xdb, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00}, + {0xc0, 0x60, 0x60, 0x30, 0x18, 0x3c, 0x66, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0xff, 0x60, 0x30, 0x18, 0x0c, 0x06, 0xff, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x0f, 0x18, 0x18, 0x18, 0x38, 0xf0, 0x38, 0x18, 0x18, 0x18, 0x0f}, + {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, + {0x00, 0x00, 0xf0, 0x18, 0x18, 0x18, 0x1c, 0x0f, 0x1c, 0x18, 0x18, 0x18, 0xf0}, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00} + }; + +GLTextRender::GLTextRender() +{ + + + GLuint i; + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + m_fontOffset = glGenLists (128); + for (i = 32; i < 127; i++) { + glNewList(i+m_fontOffset, GL_COMPILE); + glBitmap(8, 13, 0.0, 2.0, 10.0, 0.0, m_rasters[i-32]); + glEndList(); + } + +} + + +void GLTextRender::printString(const char *s) +{ + glPushAttrib (GL_LIST_BIT); + glListBase(m_fontOffset); + glCallLists(strlen(s), GL_UNSIGNED_BYTE, (GLubyte *)s); + glPopAttrib (); +} + diff -Naur fung-calc-1.3.2b/src/libfungcalc/3D/glTextRender.h fung-calc-1.3.2b-jca/src/libfungcalc/3D/glTextRender.h --- fung-calc-1.3.2b/src/libfungcalc/3D/glTextRender.h 1969-12-31 19:00:00.000000000 -0500 +++ fung-calc-1.3.2b-jca/src/libfungcalc/3D/glTextRender.h 2006-09-15 15:25:37.000000000 -0400 @@ -0,0 +1,26 @@ + +#ifndef GLTEXTRENDER_H +#define GLTEXTRENDER_H + +#include +#include + +class GLTextRender +{ + public: + GLTextRender(); + + ~GLTextRender() + { + } + + void printString( const char * s ); + + private: + static GLubyte m_rasters[95][13]; + GLuint m_fontOffset; +}; + +#endif + + diff -Naur fung-calc-1.3.2b/src/libfungcalc/3D/glbasicgraph.cpp fung-calc-1.3.2b-jca/src/libfungcalc/3D/glbasicgraph.cpp --- fung-calc-1.3.2b/src/libfungcalc/3D/glbasicgraph.cpp 2003-07-16 00:09:23.000000000 -0400 +++ fung-calc-1.3.2b-jca/src/libfungcalc/3D/glbasicgraph.cpp 2006-09-15 15:25:37.000000000 -0400 @@ -20,7 +20,8 @@ #include "config.h" -#if HAVE_GLUT +//#if HAVE_GLUT +#if 0 #include #endif //HAVE_GLUT @@ -574,7 +575,11 @@ void GLBasicGraph::drawText(GLfloat x, GLfloat y, GLfloat z, const char *s) { - #if HAVE_GLUT + glRasterPos3f(x, y, z); + m_textRender.printString(s); + glRasterPos3f(-x, -y, -z); + //#if HAVE_GLUT + #if 0 glRasterPos3f(x, y, z); for (const char *c = s; *c != '\0'; c++) glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, *c); diff -Naur fung-calc-1.3.2b/src/libfungcalc/3D/glbasicgraph.h fung-calc-1.3.2b-jca/src/libfungcalc/3D/glbasicgraph.h --- fung-calc-1.3.2b/src/libfungcalc/3D/glbasicgraph.h 2003-07-14 17:26:23.000000000 -0400 +++ fung-calc-1.3.2b-jca/src/libfungcalc/3D/glbasicgraph.h 2006-09-15 15:25:37.000000000 -0400 @@ -20,6 +20,7 @@ #include #include "commongraph.h" +#include "glTextRender.h" class QTimer; @@ -195,7 +196,10 @@ QTimer *rotate_timer; bool rotating_z, rotating_y, rotating_x; int rotate_speed; - + + // This object knows how to render text + GLTextRender m_textRender; + private slots: void autoRotateStep(); }; diff -Naur fung-calc-1.3.2b/src/libfungcalcui/interface.ui.h fung-calc-1.3.2b-jca/src/libfungcalcui/interface.ui.h --- fung-calc-1.3.2b/src/libfungcalcui/interface.ui.h 2003-07-19 01:00:44.000000000 -0400 +++ fung-calc-1.3.2b-jca/src/libfungcalcui/interface.ui.h 2006-09-15 15:25:34.000000000 -0400 @@ -34,7 +34,7 @@ #else #include #include -#include +#include #endif //KDE_APP #include diff -Naur fung-calc-1.3.2b/src/qMakefile fung-calc-1.3.2b-jca/src/qMakefile --- fung-calc-1.3.2b/src/qMakefile 2003-07-03 19:22:01.000000000 -0400 +++ fung-calc-1.3.2b-jca/src/qMakefile 2006-09-15 15:25:33.000000000 -0400 @@ -4,74 +4,116 @@ TRANSLATIONS = translations/fung-calc.es.ts DEFINES = GLGRAPH +DEFINES += _NO_OLDNAMES + +CONFIG += qt opengl uic moc release +CONFIG -= dlopen_opengl + + +REQUIRES = opengl INCLUDEPATH = \ - libfungcalc/graphs/2D \ - libfungcalc/graphs/3D \ - libfungcalc/graphs \ + libfungcalc/2D \ + libfungcalc/3D \ + libfungcalc/fparser \ libfungcalc/mathfunctions \ libfungcalc \ libfungcalcui \ libfungcalcui/2D \ libfungcalcui/3D \ HEADERS = \ + libfungcalc/2D/basicgraph.h \ + libfungcalc/2D/densityplot.h \ + libfungcalc/2D/expressiongraph.h \ + libfungcalc/2D/functiongraph.h \ + libfungcalc/2D/graphevent.h \ + libfungcalc/2D/parametricgraph.h \ + libfungcalc/2D/polargraph.h \ + libfungcalc/2D/statplotgraph.h \ + libfungcalc/3D/glbasicgraph.h \ + libfungcalc/3D/glexpressiongraph.h \ + libfungcalc/3D/glfunctiongraph.h \ + libfungcalc/3D/glpolargraph.h \ + libfungcalc/3D/glcylindricalgraph.h \ + libfungcalc/commongraph.h \ + libfungcalcui/2D/basicgraphmain.h \ + libfungcalcui/2D/expressiongraphmain.h \ + libfungcalcui/3D/glbasicgraphmain.h \ + libfungcalcui/commongraphmain.h \ + libfungcalcui/fungcolorbutton.h \ libfungcalcui/graphtypeinfo.h \ - libfungcalcui/2D/statplotgraphmain.ui.h SOURCES = \ - libfungcalc/mathfunctions/maximumfunction.cpp \ - libfungcalc/mathfunctions/intersectionfunction.cpp \ + libfungcalc/2D/basicgraph.cpp \ + libfungcalc/2D/densityplot.cpp \ + libfungcalc/2D/expressiongraph.cpp \ + libfungcalc/2D/frequencyplot.cpp \ + libfungcalc/2D/functiongraph.cpp \ + libfungcalc/2D/graphevent.cpp \ + libfungcalc/2D/parametricgraph.cpp \ + libfungcalc/2D/plotmodule.cpp \ + libfungcalc/2D/polargraph.cpp \ + libfungcalc/2D/scatterplot.cpp \ + libfungcalc/2D/statplotgraph.cpp \ + libfungcalc/2D/whiskerplot.cpp \ + libfungcalc/3D/glbasicgraph.cpp \ + libfungcalc/3D/glcylindricalgraph.cpp \ + libfungcalc/3D/glexpressiongraph.cpp \ + libfungcalc/3D/glfunctiongraph.cpp \ + libfungcalc/3D/glpolargraph.cpp \ + libfungcalc/3D/glTextRender.cpp \ + libfungcalc/fparser/fparser.cc \ libfungcalc/mathfunctions/arclengthfunction.cpp \ - libfungcalc/mathfunctions/mathfunction.cpp \ - libfungcalc/mathfunctions/distancefunction.cpp \ libfungcalc/mathfunctions/definiteintegralfunction.cpp \ + libfungcalc/mathfunctions/distancefunction.cpp \ + libfungcalc/mathfunctions/intersectionfunction.cpp \ + libfungcalc/mathfunctions/mathfunction.cpp \ + libfungcalc/mathfunctions/mathfunctionimplementor.cpp \ + libfungcalc/mathfunctions/maximumfunction.cpp \ libfungcalc/mathfunctions/meanvaluefunction.cpp \ - libfungcalc/fparser/fparser.cc \ - libfungcalc/graphs/2D/statplotgraph.cpp \ - libfungcalc/graphs/2D/expressiongraph.cpp \ - libfungcalc/graphs/2D/parametricgraph.cpp \ - libfungcalc/graphs/2D/functiongraph.cpp \ - libfungcalc/graphs/2D/basicgraph.cpp \ - libfungcalc/graphs/2D/graphevent.cpp \ - libfungcalc/graphs/2D/polargraph.cpp \ - libfungcalc/graphs/2D/densityplot.cpp \ - libfungcalc/statinfo.cpp \ - libfungcalc/rectcoord.cpp \ - libfungcalc/sphericalcoord.cpp \ + libfungcalc/mathfunctions/minimumfunction.cpp \ + libfungcalc/mathfunctions/zerofunction.cpp \ + libfungcalc/animator.cpp \ libfungcalc/cartesian3dcoord.cpp \ + libfungcalc/commongraph.cpp \ libfungcalc/cylindricalcoord.cpp \ - libfungcalc/sphericalcoord.cpp \ - libfungcalc/plot.cpp \ - libfungcalc/graphs/3D/glfunctiongraph.cpp \ - libfungcalc/graphs/3D/glbasicgraph.cpp \ - libfungcalc/graphs/3D/glpolargraph.cpp \ - libfungcalc/graphs/3D/glcylindricalgraph.cpp \ - libfungcalc/graphs/3D/glparametricgraph.cpp \ - libfungcalc/graphs/3D/glexpressiongraph.cpp \ - libfungcalc/fungvector.cpp \ - libfungcalc/fungparser.cpp \ libfungcalc/expression.cpp \ - libfungcalc/graphs/commongraph.cpp \ - libfungcalcui/graph.cpp \ - libfungcalcui/fungcolorbutton.cpp \ - libfungcalcui/fungxmlhandler.cpp \ - libfungcalcui/commongraphmain.cpp \ + libfungcalc/fungmath.cpp \ + libfungcalc/fungpainter.cpp \ + libfungcalc/fungparser.cpp \ + libfungcalc/fungvector.cpp \ + libfungcalc/polarcoord.cpp \ + libfungcalc/rectcoord.cpp \ + libfungcalc/sphericalcoord.cpp \ + libfungcalc/statinfo.cpp \ libfungcalcui/2D/basicgraphmain.cpp \ + libfungcalcui/2D/expressiongraphmain.cpp \ libfungcalcui/3D/glbasicgraphmain.cpp \ + libfungcalcui/commongraphmain.cpp \ + libfungcalcui/fungcolorbutton.cpp \ + libfungcalcui/fungxmlhandler.cpp \ + libfungcalcui/graph.cpp \ main.cpp INTERFACES = \ + libfungcalcui/2D/densityplotmain.ui \ + libfungcalcui/2D/functiongraphmain.ui \ + libfungcalcui/2D/parametricgraphmain.ui \ + libfungcalcui/2D/polargraphmain.ui \ libfungcalcui/2D/statplotgraphmain.ui \ + libfungcalcui/3D/glcylindricalgraphmain.ui \ libfungcalcui/3D/glfunctiongraphmain.ui \ libfungcalcui/3D/glpolargraphmain.ui \ - libfungcalcui/3D/glcylindricalgraphmain.ui \ - libfungcalcui/newgraphdialog.ui \ - libfungcalcui/zoomfactordialog.ui \ + libfungcalcui/animationparamsdialog.ui \ libfungcalcui/interface.ui \ - libfungcalcui/2D/polargraphmain.ui \ - libfungcalcui/2D/parametricgraphmain.ui \ - libfungcalcui/2D/functiongraphmain.ui \ - libfungcalcui/2D/densityplotmain.ui \ - libfungcalcui/usage.ui + libfungcalcui/newgraphdialog.ui \ + libfungcalcui/usage.ui \ + libfungcalcui/valuedialog.ui \ + libfungcalcui/zoomfactordialog.ui + +win32 { + RC_FILE = fung-calc.rc +} +