[10097] Update G3D up to v8.0b4

+ Got rid of zip lib requirement in G3D...
  Still can re-enable code by defining _HAVE_ZIP...

+ Remove silly X11 lib dependency from G3D
  Code doesn't seem to do anything yet anyway, and even if, we don't want it :p

+ Fix another weird G3D build problem...

+ Remove some __asm usage in g3d, which is not available on Win64
  My editor also decided to remove a ton of trailing white spaces...tss...

+ Reapply G3D fixes for 64bit VC

+ not use SSE specific header when SSE not enabled in *nix

+ Updated project files

+ New vmap_assembler VC90/VC80 Project

+ vmap assembler binaries updates

NOTE: Old vmap fikes expected work (as tests show) with new library version.
      But better use new generated versions. Its different in small parts to bad or good...

(based on Lynx3d's repo commit 44798d3)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Lynx3d 2010-06-23 04:01:54 +04:00 committed by VladimirMangos
parent 2f3c518935
commit ae3ad10bcf
235 changed files with 58189 additions and 4547 deletions

View file

@ -1,10 +1,10 @@
/**
@file stringutils.h
@maintainer Morgan McGuire, matrix@graphics3d.com
@maintainer Morgan McGuire, http://graphics.cs.williams.edu
@author 2000-09-09
@edited 2002-11-30
@edited 2008-08-05
*/
#ifndef G3D_STRINGUTILS_H
@ -12,12 +12,22 @@
#include "G3D/platform.h"
#include "G3D/Array.h"
#include <string>
#include <cstring>
namespace G3D {
extern const char* NEWLINE;
/** Separates a comma-separated line, properly escaping commas within
double quotes (") and super quotes ("""). This matches Microsoft Excel's
CSV output.
\param stripQuotes If true, strips leading and trailing " and """
\sa G3D::stringSplit, G3D::TextInput, G3D::readWholeFile
*/
void parseCommaSeparated(const std::string s, Array<std::string>& array, bool stripQuotes = true);
/**
Returns true if the test string begins with the pattern string.
*/
@ -91,36 +101,36 @@ std::string trimWhitespace(
/** These standard C functions are renamed for clarity/naming
conventions and to return bool, not int.
*/
inline bool isWhiteSpace(const char c) {
inline bool isWhiteSpace(const unsigned char c) {
return isspace(c) != 0;
}
/** These standard C functions are renamed for clarity/naming
conventions and to return bool, not int.
*/
inline bool isNewline(const char c) {
inline bool isNewline(const unsigned char c) {
return (c == '\n') || (c == '\r');
}
/** These standard C functions are renamed for clarity/naming
conventions and to return bool, not int.
*/
inline bool isDigit(const char c) {
inline bool isDigit(const unsigned char c) {
return isdigit(c) != 0;
}
/** These standard C functions are renamed for clarity/naming
conventions and to return bool, not int.
*/
inline bool isLetter(const char c) {
inline bool isLetter(const unsigned char c) {
return isalpha(c) != 0;
}
inline bool isSlash(const char c) {
inline bool isSlash(const unsigned char c) {
return (c == '\\') || (c == '/');
}
inline bool isQuote(const char c) {
inline bool isQuote(const unsigned char c) {
return (c == '\'') || (c == '\"');
}