From ce4cb74a203468ada649ae676aa01fdc158f5e86 Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Mon, 10 Jul 2006 21:42:16 -0400 Subject: [PATCH] *** empty log message *** --- Doxyfile.doxygen | 261 +++++++++++++++++++++++++++++++++++++++++++++++ src/camera.cpp | 56 +++++++++- src/linux.cpp | 1 + src/windows.cpp | 18 +++- 4 files changed, 333 insertions(+), 3 deletions(-) create mode 100644 Doxyfile.doxygen diff --git a/Doxyfile.doxygen b/Doxyfile.doxygen new file mode 100644 index 0000000..5215572 --- /dev/null +++ b/Doxyfile.doxygen @@ -0,0 +1,261 @@ +# Doxyfile 1.4.7 + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +PROJECT_NAME = OpenArena +PROJECT_NUMBER = "0.1.2 2006-07-10" +OUTPUT_DIRECTORY = "C:/Documents and Settings/tomhicks/My Documents/Visual Studio 2005/Projects/openarena-clean/doc" +CREATE_SUBDIRS = NO +OUTPUT_LANGUAGE = English +USE_WINDOWS_ENCODING = YES +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = YES +STRIP_FROM_PATH = "C:/Documents and Settings/tomhicks/" +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = YES +SEPARATE_MEMBER_PAGES = NO +TAB_SIZE = 8 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = NO +OPTIMIZE_OUTPUT_JAVA = NO +BUILTIN_STL_SUPPORT = NO +DISTRIBUTE_GROUP_DOC = NO +SUBGROUPING = YES +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = YES +EXTRACT_PRIVATE = YES +EXTRACT_STATIC = YES +EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = NO +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = NO +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +SORT_BRIEF_DOCS = NO +SORT_BY_SCOPE_NAME = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +SHOW_DIRECTORIES = NO +FILE_VERSION_FILTER = +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_NO_PARAMDOC = NO +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = "C:/Documents and Settings/tomhicks/My Documents/Visual Studio 2005/Projects/openarena-clean/src" +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.d \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.idl \ + *.odl \ + *.cs \ + *.php \ + *.php3 \ + *.inc \ + *.m \ + *.mm \ + *.dox \ + *.py +RECURSIVE = YES +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = * +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = +FILTER_SOURCE_FILES = NO +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = NO +REFERENCES_RELATION = NO +REFERENCES_LINK_SOURCE = YES +USE_HTAGS = NO +VERBATIM_HEADERS = NO +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = NO +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +BINARY_TOC = NO +TOC_EXPAND = NO +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = NO +TREEVIEW_WIDTH = 250 +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +USE_PDFLATEX = NO +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = YES +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = YES +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = NO +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = YES +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = NO +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +GROUP_GRAPHS = YES +UML_LOOK = NO +TEMPLATE_RELATIONS = NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = NO +CALLER_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES +DOT_IMAGE_FORMAT = png +DOT_PATH = +DOTFILE_DIRS = +MAX_DOT_GRAPH_WIDTH = 1024 +MAX_DOT_GRAPH_HEIGHT = 1024 +MAX_DOT_GRAPH_DEPTH = 1000 +DOT_TRANSPARENT = NO +DOT_MULTI_TARGETS = NO +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO diff --git a/src/camera.cpp b/src/camera.cpp index cf36d71..c9cce05 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -106,7 +106,38 @@ namespace OpenArena } } #endif - //Most of this is sorta right for linux I think but since I don't know how yet it's currently windows only + #ifdef __APPLE__ + static double currentRotX = 0.0f; + Vec2i pos; + Vec2i middle; + double angleZ; + + middle.x = window.GetWidth()/2; + middle.y = window.GetHeight()/2; + pos = window.GetMousePosition(); + if(pos != middle) + { + window.SetMousePosition(middle); + angleZ = (middle.y - pos.y)/1000.0; + currentRotX-=angleZ; + if(currentRotX >1.0) + { + currentRotX = 1.0; + } + else if(currentRotX < -1.0) + { + currentRotX = -1.0; + } + else + { + Vec3d axis = (m_vView - m_vPosition).cross(m_vUpVector); + axis.normalize(); + RotateView(angleZ, axis.x, axis.y, axis.z); + RotateView((middle.x-pos.x)/1000.0, 0, 1, 0); + //RotateView((middle.x-pos.x)/1000.0, m_vUpVector.x, m_vUpVector.y, m_vUpVector.z); + } + } + #endif #ifdef WIN32 static double currentRotX = 0.0f; POINT mpos; @@ -229,6 +260,29 @@ namespace OpenArena { return m_vView; } + + void Camera::RotateHorizontal(float angle) + { + RotateView(angle, GetUpVector()); + } + + void Camera::RotateVertical(float angle) + { + RotateView(angle, GetRightVector()); + } + + Vec3f Camera::GetUpVector() + { + } + + Vec3f Camera::GetRightVector() + { + } + + Vec3f Camera::GetForwardVector() + { + } + }; diff --git a/src/linux.cpp b/src/linux.cpp index 239cfbd..7a5405a 100644 --- a/src/linux.cpp +++ b/src/linux.cpp @@ -222,6 +222,7 @@ int main(int argc, char** argv) { if(level.mlook) { + //get the mouse delta and rotate the camera accordingly level.defaultPlayer[0].camera.SetViewByMouse(g_Screen); } else diff --git a/src/windows.cpp b/src/windows.cpp index 4231818..a2bd6c8 100644 --- a/src/windows.cpp +++ b/src/windows.cpp @@ -31,6 +31,7 @@ //include necessary header files #include "main.h" #include "version.h" +#include "vector.h" //link necessary libraries #pragma comment(lib, "opengl32.lib") @@ -287,11 +288,24 @@ int WINAPI WinMain( HINSTANCE hInstance, { if (level.mlook) { - level.defaultPlayer[0].camera.SetViewByMouse(g_Screen); + using OpenArena::Vec2i; + //Get the mouse delta and rotate accordingly + + Vec2i mousePosition = g_Screen.GetMousePosition(); + Vec2i middleOfScreen = Vec2i(g_Screen.GetWidth()/2, g_Screen.GetHeight()/2); + Vec2i mouseDelta = mousePosition - middleOfScreen; + const float MOUSE_SENSATIVITY_HORIZONTAL = 1; + const float MOUSE_SENSATIVITY_VERTICAL = 1; + float horizontalAngle = mouseDelta.x * MOUSE_SENSATIVITY_HORIZONTAL; + float verticalAngle = mouseDelta.y * MOUSE_SENSATIVITY_VERTICAL; + level.defaultPlayer[0].camera.RotateHorizontal(horizontalAngle); + level.defaultPlayer[0].camera.RotateVertical(verticalAngle); + //level.defaultPlayer[0].camera.SetViewByMouse(g_Screen); } else { - SetCursorPos(g_Screen.GetWidth()/2, g_Screen.GetHeight()/2); + g_Screen.SetMousePosition(Vec2i(g_Screen.GetWidth()/2, g_Screen.GetHeight()/2)); + //SetCursorPos(g_Screen.GetWidth()/2, g_Screen.GetHeight()/2); } //////////