Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update #1

Open
wants to merge 176 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
176 commits
Select commit Hold shift + click to select a range
80d2c07
Merge branch 'master' into 0.3.1
Dec 25, 2010
5df06a3
Added image2d files
Apr 5, 2011
4628452
Added textureCube files
Apr 5, 2011
05c51ba
Added texture2d_array files
Apr 5, 2011
67f6fe2
Generalized array2d
Apr 6, 2011
17e0a13
Fixed texture2d and image2d separation
Apr 6, 2011
fa88630
Merge branch '0.4.0' into cubemap
Apr 6, 2011
0c0ce25
Added support for cubemap
Apr 6, 2011
bbd6c52
Merge branch '0.4.0' into texture2d_array
Apr 6, 2011
7b272ae
Implemented texture2d array
Apr 6, 2011
f38ef9f
Added cube map array files
Apr 6, 2011
0d2caff
Added texture cube array implementation
Apr 6, 2011
ce299d6
Added cubemap support for DDS
Apr 7, 2011
a8ac398
Added cubemap support
Apr 8, 2011
e7b6943
Merge branch '0.3.0' into 0.3.1
Apr 21, 2011
18fc871
Merge commit '0.3.0.3' into 0.3.1
Apr 21, 2011
6f00ce3
Merge branch '0.3.1' of ssh://ogl-image.git.sourceforge.net/gitroot/o…
Apr 21, 2011
3bc6810
Added CTest infra structure
May 10, 2011
68d1030
Fixed build on VC2005
May 10, 2011
9be10ba
Merge branch '0.3.1' of ssh://ogl-image.git.sourceforge.net/gitroot/o…
Jun 2, 2011
6bdfcb0
Merge branch 'cubemap' into 0.3.1
Oct 4, 2011
b7c677c
Improved test framework
Oct 4, 2011
ed3db9e
Added clear functions
Oct 4, 2011
8751840
Fixed merge
Oct 4, 2011
b1131aa
Fixed fetch build
Oct 4, 2011
ba4a1e3
Updated version
Oct 4, 2011
1a5ca3e
Fixed build
Oct 4, 2011
c465878
Added files for future development
Oct 6, 2011
75fb689
Added new design based on image class
Oct 6, 2011
344aa65
Merge branch '0.4.0' of ssh://ogl-image.git.sourceforge.net/gitroot/o…
Oct 6, 2011
f56e7fe
Fixed build errors
Oct 7, 2011
ee983c9
Follows better OpenGL conventions
Oct 7, 2011
203ac54
Added 'load' function
Oct 7, 2011
6533f6d
Added image copy function
Oct 7, 2011
9b8cdde
Added loader test file
Oct 11, 2011
78d3167
Added texture2d test
Oct 13, 2011
3447155
Removed extension namespace, updated GLM
Oct 13, 2011
b6967a9
Update GLM 0.9.3 beta
Oct 13, 2011
4083a10
Clean up, removed namespace
Nov 3, 2011
f0a0f56
Fixed build on MacOSX
Jan 11, 2012
cb43a50
Fixed shared_ptr, github bug #2 from pull https://gist.github.com/240…
Jun 2, 2012
b2481d4
Merge branch '0.3.0' into 0.3.1
Jun 2, 2012
9c16402
Merge branch '0.3.1' into 0.4.0
Jun 2, 2012
58e89d4
Fixed namespace
Jun 8, 2012
eff640d
Fixed variable name
Jun 16, 2012
8edd8d0
Added DDS cubemap and arrays
Jun 19, 2012
74acf62
Progress for the unified storage class
Jun 21, 2012
ba0ccdd
Completed readDDS10, reduced data movement and memory allocation, add…
Jun 21, 2012
480e36e
Updated API to take advantage of the storage functionnalities
Jun 25, 2012
4be061c
Tighter utilisation of the storage class by the texture* classes, fix…
Jun 27, 2012
443bd9a
Fixed linearTextureAddressing function
Jul 5, 2012
a84b66a
Renamed linearTextureAddressing
Jul 6, 2012
12a10cd
Added extract functions to copy a subset of a texture storage
Jul 6, 2012
3335d7b
Added storage offset
Jul 14, 2012
2a1f15e
Fixed build'
Aug 13, 2012
e24cd24
Fixed merge
Aug 13, 2012
ab52500
Updated storage class to use blockSize but not format and create a WI…
Aug 16, 2012
39b4c2b
Fixed blockSize
Aug 17, 2012
5ed699e
Fixed sizes functions and tests
Aug 18, 2012
bdb0373
Added copy_layers function
Aug 19, 2012
9da3660
Started integration of storage class to texture and image classes
Aug 19, 2012
6dd40ca
Fixed shared_ptr and implemented shared_ptr tests
Aug 20, 2012
329b931
Added image test. Implemeted image class
Aug 21, 2012
e20b586
Fixed image constructor that takes a storage instance in parameter
Aug 21, 2012
346c2ae
Added image == operator, fixed build, progress on texture2D class
Aug 27, 2012
c8b87b4
Dimensions are now a property of the image class
Aug 27, 2012
efdf68f
On storage, dimensions are dependente of the level.
Aug 27, 2012
ceb1978
Work on dimensions
Aug 27, 2012
1ac3571
Fixed and added comparison shader_ptr tests
Sep 23, 2012
3f84b12
Added shared_ptr reset and empty tests
Sep 23, 2012
4565d98
Fixed texture 2d build
Sep 23, 2012
90814d1
Fixed storage test build, improved assert for copy_layers function
Sep 23, 2012
8a4e439
Dont know
Sep 23, 2012
e55419e
Added cow_ptr implementation
Sep 23, 2012
56fae72
Fixed space characters
Sep 23, 2012
19cbea4
Added self assignment shared_ptr test
Sep 23, 2012
948b1d8
Completed operator * and ->
Sep 24, 2012
c957bab
Progress on size
Sep 29, 2012
a2114ca
Removed hidden file
Oct 9, 2012
90c4e03
Fixed DDS loading
Oct 14, 2012
9da91c7
Removed TGA loader
Oct 14, 2012
04226dd
Fixed all tests build and removed TGA tests
Oct 15, 2012
0544d86
Fixed space
Oct 15, 2012
c5c6b4b
Fixed shared_ptr test
Oct 15, 2012
519af3f
Removed image1d, image2d and image3d
Oct 16, 2012
a9286a0
Added format header and format descriptor functions
Oct 16, 2012
77e8d64
Use format description
Oct 16, 2012
9e806fc
Added is_compressed function descriptor API
Oct 16, 2012
8a36dc9
Fixed is_compressed declaration
Oct 16, 2012
057cf32
Added missing inline
Oct 16, 2012
b98fe84
Clean up
Oct 18, 2012
db76454
Added descriptor called views to storage. Limits the scope of storage…
Oct 19, 2012
664a719
Fixed all build issues on VC with the refactoring using the storage d…
Oct 20, 2012
1244d49
Fixed indexing, dimensions, size of texture 2d
Oct 22, 2012
5685d30
Added single image texture 2d test
Oct 22, 2012
bd47177
Created a separated addressing file and added first addressing test. …
Nov 20, 2012
bc749ac
Improve addressing test infrastructure to avoid code duplication.
Nov 20, 2012
a4487a4
Added level addressing tests
Nov 20, 2012
4ad12d3
Fixed storage test
Nov 21, 2012
121c293
Fixed initialization of the face size set to 0/FACE_DEFAULT instead of 1
Nov 21, 2012
f82d16f
Fixing data copy
Nov 22, 2012
02f087d
Fixed build
Nov 23, 2012
7a251b7
Added more tests
Nov 23, 2012
83a0945
Fixed build
Nov 29, 2012
60860e0
Fixed image size computation
Dec 2, 2012
3c7cc7d
Fixed texture size calculation for textures referencing texture array…
Dec 2, 2012
17f4498
Fixed dimensions computation for block based formats
Dec 2, 2012
b54f345
Removed dead code, clean up, fixed assert
Dec 2, 2012
27950c1
Fixed image operator =
Dec 5, 2012
fd562a1
Removed constructor taking data as a parameter, clean up constructors
Dec 5, 2012
15acc87
Improved comment on texture2d and image created from exist storage an…
Dec 5, 2012
fa171ce
Deleted size file
Dec 5, 2012
de503d6
Fixed build
Dec 5, 2012
114f4a5
No memory allocation when calling operator =
Dec 5, 2012
8e55dcb
Fixed location and copy of test texture files
Dec 5, 2012
299ed6e
Fixed DDS9 loader
Dec 6, 2012
ddb380f
Added storage loaders
Dec 11, 2012
fc1fcaa
Added cube map texture support
Dec 12, 2012
ea6714c
Fixed XCode project generation, but no more automatic copy of the dat…
Jan 3, 2013
7f90604
Fixed build
Jan 3, 2013
a4dab08
Added image descriptor in texture2D
Jan 4, 2013
e115a48
Fixed texture 2d operator[] read and write
Jan 6, 2013
cfe4cc2
Added test files for textureCube texture2DArray and textureCubeArray
Jan 10, 2013
6a308b2
Updated API for texture2D, texture2DArray, textureCube, textureCubeAr…
Jan 11, 2013
9ea6f6a
Updated interface from texture1D and texture1DArray
Jan 11, 2013
6f5b683
storage is no longer a detail class
Jan 12, 2013
836393e
Fix all build issues, no more face type
Jan 13, 2013
7cc5582
Added texture 1d and texture 1d array tests
Jan 13, 2013
9ee4dbb
Updated copyright headers
Jan 13, 2013
7a7d3da
Updated extension file headers
Jan 13, 2013
165c4cb
Uniformalized data() to all image and texture classes
Jan 13, 2013
c2a5d6d
Added texture3d implementation and tests
Jan 13, 2013
8b447fc
Updated data() function declaration
Jan 14, 2013
a26bb68
Fixed dimension type for texture cube and texture cube array
Jan 14, 2013
00a2af8
Fixed white spaces
Jan 14, 2013
b8182f6
Uniformalized image constructor parameter order with texture classes,…
Jan 15, 2013
614266a
Fixed image dimention type
Jan 15, 2013
2bec944
Fixed textureCube addressing of faces
Jan 21, 2013
a5e4319
Fixed addressing of texture3d, 1d, 1d array, cube array
Jan 21, 2013
d4d7d25
Calling data<genType>() requires blockSize to be the same size as gen…
Jan 21, 2013
c0c9af0
Revert "Calling data<genType>() requires blockSize to be the same siz…
Jan 21, 2013
4acfd66
Updated texture cube array tests
Jan 21, 2013
60e770d
Fixed textureCube data access
Jan 22, 2013
40db0fd
Fixed texture arrays view initializations. Updated texture2DArray tests
Jan 23, 2013
c1167ef
Completed texture 1d and 2d array tests
Jan 23, 2013
978a264
Fixed texture1d tests
Jan 23, 2013
be6a904
Fixed texture 3d tests
Jan 23, 2013
7d20348
Added size function expressed in unit of the template size parameter
Jan 23, 2013
896842c
Added clone function for texture classes
Jan 23, 2013
779227e
Clean up, added addressing class, updated loader
Jan 24, 2013
54471c1
Added missing function definition
Jan 24, 2013
2bd93f8
Fixed texture constructor with storage instances
Jan 25, 2013
0933179
Fixed DDS9 loader
Jan 25, 2013
b393e62
Fixed 2d texture loader
Jan 25, 2013
c87c71f
Improve formats support
Jan 27, 2013
244bcda
Clean up DDS loader code
Jan 27, 2013
7ed1d60
Fixed format setting at storage loading
Jan 27, 2013
f60a99f
Refactoring of storage class, shared_ptr hidden
Jan 27, 2013
de71ab9
Added storage cast operators
Jan 27, 2013
86f36fb
Improve the range of format supported for export
Jan 27, 2013
1b2c769
Fixed OpenGL loader, restaure GL states
Jan 27, 2013
e9cf803
Fixed textureCube loading from DDS
Jan 27, 2013
c4b095e
Added readme
Jan 28, 2013
034eb24
Refactoring of the DDS loader
Jan 28, 2013
9b412ab
Refactoring of the DDS loader
Jan 28, 2013
8294e2b
Added clone.hpp in gli.hpp
Jan 28, 2013
f67c13f
Separated loading and saving of DDS
Jan 28, 2013
ea72479
Use GLM 0.9.5 beta
Feb 1, 2013
ccc9a91
Fixed include
Feb 1, 2013
ab12240
Fixed uncompressed 8bits per channel DDS saving
Feb 2, 2013
7384c98
Fixed cubemap saving
Feb 2, 2013
19e1013
Fixed saving texture array
Feb 3, 2013
9d04857
Fixed GCC build
Feb 14, 2013
ececaa8
Updated readme
Mar 7, 2013
dc73f12
Fixed build with XCode
Mar 10, 2013
dc4e382
Updated readme
Mar 10, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
45 changes: 42 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,51 @@ cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
cmake_policy(VERSION 2.6)

project(gli)
enable_testing()

add_definitions(-D_CRT_SECURE_NO_WARNINGS)

include_directories("${CMAKE_CURRENT_SOURCE_DIR}/external/glm-0.9.1.1")
include_directories(".")

################################
# Add package

macro(addExternalPackageGTC NAME DIRECTORY)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/external/${DIRECTORY}/util)
set(${NAME}_PACKAGE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/${DIRECTORY})

find_package(${NAME})
if(NOT ${NAME}_FOUND)
message("ERROR: ${NAME} not found")
endif(NOT ${NAME}_FOUND)
endmacro(addExternalPackageGTC)

################################
# Add custom target to copy all data

set(TARGET_DATA_COPY DATA_COPY)
if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})
add_custom_target(
${TARGET_DATA_COPY}
COMMAND ${CMAKE_COMMAND} -E echo "In source build")
else(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})
add_custom_target(
${TARGET_DATA_COPY}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data)
endif(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})

set(OGL_DATA_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data)

################################
# Add GLM

set(GLM_DIRECTORY glm-0.9.5-beta)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/${GLM_DIRECTORY})

################################
# Add subdirectory

add_subdirectory(gli)
#add_subdirectory(doc)
#add_subdirectory(sample)
add_subdirectory(test)
#add_subdirectory(sample)
#add_subdirectory(doc)
12 changes: 0 additions & 12 deletions FindGLI.cmake

This file was deleted.

2 changes: 1 addition & 1 deletion copying.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

Copyright (c) 2005 - 2010 Christophe Riccio
Copyright (c) 2010 - 2013 Christophe Riccio

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Binary file added data/array.dds
Binary file not shown.
Binary file added data/cube.dds
Binary file not shown.
Binary file added data/test-rgb8-256a.dds
Binary file not shown.
Binary file added data/test-rgb8-256b.dds
Binary file not shown.
File renamed without changes.
Binary file removed data/test_rgb8.tga
Binary file not shown.
30 changes: 0 additions & 30 deletions external/glm-0.9.1.1/CMakeLists.txt

This file was deleted.

11 changes: 0 additions & 11 deletions external/glm-0.9.1.1/bench/CMakeLists.txt

This file was deleted.

12 changes: 0 additions & 12 deletions external/glm-0.9.1.1/doc/CMakeLists.txt

This file was deleted.

35 changes: 0 additions & 35 deletions external/glm-0.9.1.1/doc/about.html

This file was deleted.

Binary file not shown.
6 changes: 0 additions & 6 deletions external/glm-0.9.1.1/doc/build/build.bat

This file was deleted.

Binary file removed external/glm-0.9.1.1/doc/build/msvcp71.dll
Binary file not shown.
Binary file removed external/glm-0.9.1.1/doc/build/msvcr71.dll
Binary file not shown.
Binary file removed external/glm-0.9.1.1/doc/build/xalan-c_1_7_0.dll
Binary file not shown.
Binary file removed external/glm-0.9.1.1/doc/build/xalan.exe
Binary file not shown.
Binary file removed external/glm-0.9.1.1/doc/build/xerces-c_2_5_0.dll
Binary file not shown.
Loading