mirror of
https://github.com/simtactics/mysimulation.git
synced 2025-03-15 14:51:21 +00:00
Aside from adding the new source files for libjpeg-turbo, added SLERP quaternion interpolation to libvitaboy Renderer.
The renderer is also making use of the new File::ReadFile() interface added to the FileHandler library.
This commit is contained in:
parent
7bf2669441
commit
83ad5d89d1
6 changed files with 815 additions and 865 deletions
|
@ -1,6 +1,35 @@
|
|||
cmake_minimum_required(VERSION 2.6)
|
||||
project(FileHandler)
|
||||
|
||||
add_subdirectory(libexpat)
|
||||
add_subdirectory(libfar)
|
||||
add_subdirectory(libpng)
|
||||
add_subdirectory(utk)
|
||||
add_subdirectory(xa)
|
||||
add_subdirectory(zlib)
|
||||
add_subdirectory(zlib)
|
||||
|
||||
set(FILEHANDLER_SERIES 0)
|
||||
set(FILEHANDLER_MAJOR 0)
|
||||
set(FILEHANDLER_MINOR 0)
|
||||
|
||||
set(FILEHANDLER_SOURCES
|
||||
File.cpp
|
||||
)
|
||||
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Libraries/FileHandler)
|
||||
|
||||
add_library(FileHandler_static STATIC ${FILEHANDLER_SOURCES})
|
||||
set_target_properties(FileHandler_static PROPERTIES
|
||||
OUTPUT_NAME "FileHandler${FILEHANDLER_SERIES}"
|
||||
PREFIX ""
|
||||
CLEAN_DIRECT_OUTPUT 1)
|
||||
|
||||
add_library(FileHandler_shared SHARED ${FILEHANDLER_SOURCES})
|
||||
set_target_properties(FileHandler_shared PROPERTIES
|
||||
OUTPUT_NAME "FileHandler${FILEHANDLER_SERIES}"
|
||||
VERSION ${FILEHANDLER_SERIES}${FILEHANDLER_MAJOR}.${FILEHANDLER_MINOR}.0
|
||||
SOVERSION ${FILEHANDLER_SERIES}${FILEHANDLER_MAJOR}
|
||||
PREFIX ""
|
||||
IMPORT_PREFIX ""
|
||||
CLEAN_DIRECT_OUTPUT 1)
|
||||
target_link_libraries(FileHandler_shared kernel32)
|
59
Libraries/FileHandler/File.cpp
Normal file
59
Libraries/FileHandler/File.cpp
Normal file
|
@ -0,0 +1,59 @@
|
|||
/*
|
||||
libvitaboy - Copyright (c) 2012 Fatbag <X-Fi6@phppoll.org>
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted, provided that the above
|
||||
copyright notice and this permission notice appear in all copies.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include <windows.h>
|
||||
#include "FileHandler.hpp"
|
||||
|
||||
namespace File {
|
||||
|
||||
int Error = 0;
|
||||
unsigned FileSize = 0;
|
||||
|
||||
uint8_t * ReadFile(const char * Filename){
|
||||
HANDLE hFile = CreateFile(Filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
|
||||
if(hFile == INVALID_HANDLE_VALUE){
|
||||
File::Error = (GetLastError() == ERROR_FILE_NOT_FOUND) ? FERR_NOT_FOUND : FERR_OPEN;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
FileSize = GetFileSize(hFile, NULL);
|
||||
if(FileSize == 0){
|
||||
CloseHandle(hFile);
|
||||
File::Error = FERR_BLANK;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
uint8_t * InData = (uint8_t*) malloc(FileSize);
|
||||
if(InData == NULL){
|
||||
CloseHandle(hFile);
|
||||
File::Error = FERR_MEMORY;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
DWORD bytestransferred;
|
||||
BOOL result = ::ReadFile(hFile, InData, FileSize, &bytestransferred, NULL);
|
||||
CloseHandle(hFile);
|
||||
|
||||
if(!result || bytestransferred != FileSize){
|
||||
free(InData);
|
||||
File::Error = FERR_READ;
|
||||
return NULL;
|
||||
}
|
||||
return InData;
|
||||
}
|
||||
|
||||
}
|
32
Libraries/FileHandler/FileHandler.hpp
Normal file
32
Libraries/FileHandler/FileHandler.hpp
Normal file
|
@ -0,0 +1,32 @@
|
|||
/*
|
||||
FileHandler - Copyright (c) 2012 Fatbag <X-Fi6@phppoll.org>
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted, provided that the above
|
||||
copyright notice and this permission notice appear in all copies.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
enum FErr {
|
||||
FERR_NOT_FOUND,
|
||||
FERR_OPEN,
|
||||
FERR_BLANK,
|
||||
FERR_MEMORY,
|
||||
FERR_READ
|
||||
};
|
||||
|
||||
namespace File {
|
||||
|
||||
extern int Error;
|
||||
extern unsigned FileSize;
|
||||
|
||||
uint8_t * ReadFile(const char * Filename);
|
||||
|
||||
}
|
|
@ -15,6 +15,8 @@ if(WIN32)
|
|||
set(LIBVITABOY_SOURCES ${LIBVITABOY_SOURCES} resource.rc)
|
||||
endif()
|
||||
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Libraries/FileHandler)
|
||||
|
||||
add_library(libvitaboy_static STATIC ${LIBVITABOY_SOURCES})
|
||||
set_target_properties(libvitaboy_static PROPERTIES
|
||||
OUTPUT_NAME "vitaboy"
|
||||
|
@ -34,4 +36,4 @@ add_executable(vbparse vbparse.cpp)
|
|||
target_link_libraries(vbparse libvitaboy_static)
|
||||
|
||||
add_executable(Renderer Renderer.cpp)
|
||||
target_link_libraries(Renderer libvitaboy_shared "${CMAKE_SOURCE_DIR}/Libraries/libvitaboy/libSOIL.a" opengl32 glu32 winmm)
|
||||
target_link_libraries(Renderer libvitaboy_shared "${CMAKE_SOURCE_DIR}/Libraries/libvitaboy/libSOIL.a" FileHandler_shared opengl32 glu32 winmm)
|
File diff suppressed because it is too large
Load diff
|
@ -40,23 +40,6 @@ float DotProduct(Rotation_t * q1, Rotation_t * q2){
|
|||
return q1->x*q2->x + q1->y*q2->y + q1->z*q2->z + q1->w*q2->w;
|
||||
}
|
||||
|
||||
void CombineQuaternions(Rotation_t * Destination, Rotation_t * Source){
|
||||
// the constructor takes its arguments as (x, y, z, w)
|
||||
float dx = Destination->x;
|
||||
float dy = Destination->y;
|
||||
float dz = Destination->z;
|
||||
float dw = Destination->w;
|
||||
float sx = Source->x;
|
||||
float sy = Source->y;
|
||||
float sz = Source->z;
|
||||
float sw = Source->w;
|
||||
|
||||
Destination->x = dw*sx + dx*sw + dy*sz - dz*sy;
|
||||
Destination->y = dw*sy + dy*sw + dz*sx - dx*sz;
|
||||
Destination->z = dw*sz + dz*sw + dx*sy - dy*sx;
|
||||
Destination->w = dw*sw - dx*sx - dy*sy - dz*sz;
|
||||
}
|
||||
|
||||
void FindQuaternionMatrix(float * Matrix, Rotation_t * Quaternion){
|
||||
float x2 = Quaternion->x * Quaternion->x;
|
||||
float y2 = Quaternion->y * Quaternion->y;
|
||||
|
|
Loading…
Add table
Reference in a new issue