diff --git a/CMakeLists.txt b/CMakeLists.txt index 321308a..6a4adba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,8 +15,8 @@ link_directories(${GTK2_LIBRARY_DIRS}) list(APPEND FC_DEP_LIBS ${GTK2_LIBRARIES}) list(APPEND FC_DEP_LIBS freeimage) -add_subdirectory(src/1raster) -#add_subdirectory(src/2texture) +#add_subdirectory(src/1raster) +add_subdirectory(src/2texture) #add_subdirectory(src/3statemachine) #add_subdirectory(src/4matrix) #add_subdirectory(src/5threed) diff --git a/src/2texture/texture.cc b/src/2texture/texture.cc index 70c68fd..ae37138 100644 --- a/src/2texture/texture.cc +++ b/src/2texture/texture.cc @@ -9,8 +9,8 @@ using namespace std; -gint height = 500; -gint width = 500; +gint height = 720; +gint width = 1280; Raster raster(width, height); @@ -19,11 +19,11 @@ Raster raster(width, height); */ void example() { Image* image = Image::loadFromFile("/home/blobt/Documents/dev/cpp/3dbase/image/scale.jpg"); - + //Image* image = Image::loadFromFile("/home/blobt/Documents/dev/cpp/3dbase2/assets/images/test.jpg"); Raster::Vertex ver1 = { - int2(-50, 10), float2(0.0f, 0.0f), Rgba(255, 0, 0), - int2(-50, 110), float2(0.0f, 1.0f), Rgba(255, 0, 0), - int2(50, 10), float2(1.0f, 0.0f), Rgba(255, 0, 0) + int2(10, 10), float2(0.0f, 0.0f), Rgba(255, 0, 0), + int2(500, -500), float2(1.0f, 1.0f), Rgba(255, 0, 0), + int2(10, -500), float2(0.0f, 1.0f), Rgba(255, 0, 0) }; raster.drawTriangle(ver1, image);