[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/games/kolf-ng
From:       Stefan Majewsky <majewsky () gmx ! net>
Date:       2009-09-22 19:09:49
Message-ID: 1253646589.544442.4040.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1026880 by majewsky:

Reorder base textures into a new subdirectory, and install them into a separate data \
directory.

 M  +4 -3      CMakeLists.txt  
 M  +2 -11     courses/CMakeLists.txt  
 D             courses/flat-terrain.bmp  
 D             courses/grass_256.jpg  
 M  +3 -3      editor/blender-model.cpp  
 A             textures (directory)  
 A             textures/CMakeLists.txt  
 A             textures/default-grass.jpg   courses/default-grass.jpg#1026709
 A             textures/default-rock.jpg   courses/default-rock.jpg#1026709
 A             textures/default-water.jpg   courses/default-water.jpg#1026762


--- trunk/playground/games/kolf-ng/CMakeLists.txt #1026879:1026880
@@ -4,14 +4,14 @@
 add_definitions(${ODE_DEFINITIONS})
 
 if(OPENGL_FOUND)
-	add_definitions(-DKOLF2_WITH_OPENGL)
+	add_definitions(-DKOLF_WITH_OPENGL)
 	if(WIN32)
 		set(opengl_libs opengl32.lib glu32.lib)
 	endif(WIN32)
 	set(KOLF2_EXTRA_LINK_LIBS ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} \
${OPENGL_glu_LIBRARY})  endif(OPENGL_FOUND)
 
-set(kolfng_SRCS
+set(kolf_SRCS
 	3d/renderstatemanager.cpp
 	3d/texturepool.cpp
 	editor/blender-blendthread.cpp
@@ -95,7 +95,7 @@
 	main.cpp
 )
 
-kde4_add_executable(kolf-ng ${kolfng_SRCS})
+kde4_add_executable(kolf-ng ${kolf_SRCS})
 target_link_libraries(kolf-ng ${KDE4_KDEUI_LIBS} ${KDEGAMES_LIBRARY} \
${ODE_LIBRARIES} ${KOLF2_EXTRA_LINK_LIBS})  # Reminder: Change ${KDEGAMES_LIBRARY} to \
"kdegames" when moving to kdegames module.  
@@ -109,3 +109,4 @@
 install(FILES ${kolf_xmlgui_SRCS} DESTINATION ${DATA_INSTALL_DIR}/kolf-ng)
 
 add_subdirectory(courses)
+add_subdirectory(textures)
--- trunk/playground/games/kolf-ng/courses/CMakeLists.txt #1026879:1026880
@@ -1,15 +1,6 @@
-set(kolf_COURSES
+install(FILES
 	test1.kolf
 	test1-3d.kolf
 	test1-terrain.kolf
-	flat-terrain.bmp
-	test1-heightmap.bmp
-	test2-heightmap.png
 	test1-texture.bmp
-	grass_256.jpg
-	default-grass.jpg
-	default-rock.jpg
-	default-water.jpg
-)
-
-install(FILES ${kolf_COURSES} DESTINATION ${DATA_INSTALL_DIR}/kolf-ng/courses)
+DESTINATION ${DATA_INSTALL_DIR}/kolf-ng/courses)
--- trunk/playground/games/kolf-ng/editor/blender-model.cpp #1026879:1026880
@@ -28,17 +28,17 @@
 	: QAbstractListModel(parent)
 {
 	//default rock texture
-	QString fileName = KStandardDirs::locate("appdata", \
QLatin1String("courses/default-rock.jpg")); +	QString fileName = \
KStandardDirs::locate("appdata", QLatin1String("textures/default-rock.jpg"));  \
Kolf::BlenderTexture* texture = new Kolf::BlenderTexture(fileName);  \
texture->setRange(150, 255, 255);  m_textures << texture;
 	//default grass texture
-	fileName = KStandardDirs::locate("appdata", \
QLatin1String("courses/default-grass.jpg")); +	fileName = \
KStandardDirs::locate("appdata", QLatin1String("textures/default-grass.jpg"));  \
texture = new Kolf::BlenderTexture(fileName);  texture->setRange(60, 140, 220);
 	m_textures << texture;
 	//default water texture
-	fileName = KStandardDirs::locate("appdata", \
QLatin1String("courses/default-water.jpg")); +	fileName = \
KStandardDirs::locate("appdata", QLatin1String("textures/default-water.jpg"));  \
texture = new BlenderTexture(fileName);  texture->setRange(0, 0, 80);
 	m_textures << texture;


[prev in list] [next in list] [prev in thread] [next in thread]