Mercurial > hg > Members > kono > Cerium

changeset 226:0f80d90fe40a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix Makefile
author gongo@gendarme.cr.ie.u-ryukyu.ac.jp
date Wed, 11 Feb 2009 11:02:45 +0900
parents 1a5d05b3a48d
children d54cbfafcb82
files TaskManager/Test/test_render/Camera.cpp TaskManager/Test/test_render/Makefile.def TaskManager/Test/test_render/spe/Makefile TaskManager/Test/test_render/viewer_types.h
diffstat 4 files changed, 14 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Test/test_render/Camera.cpp	Tue Feb 10 20:51:56 2009 +0900
+++ b/TaskManager/Test/test_render/Camera.cpp	Wed Feb 11 11:02:45 2009 +0900
@@ -64,6 +64,11 @@
 {
     name = (const char*)"Camera";
 
+
+    fov  = 60.0f;
+    near = 0.0f;
+    far  = 1000.0f;
+
     zd[0] =  0.0f;
     zd[1] =  0.0f;
     zd[2] =  1.0f;
@@ -74,14 +79,6 @@
     yd[2] = 0.0f;
     yd[3] = 1.0f;
 
-    fov  = 60.0f;
-    near = 0.0f;
-    far  = 1000.0f;
-
-    m_view = new float[16];
-    m_pers = new float[16];
-    m_screen = new float[16];
-
     // Screen の真ん中を初期値とする
     xyz[0] = w/2.0f;
     xyz[1] = h/2.0f;
@@ -90,6 +87,10 @@
     xyz[2] = -(((xyz[1] < xyz[0]) ? xyz[1] : xyz[0])/tanf((fov/2.0f)*M_PI/180.0f));
     //xyz[2] = -200.0f;
     xyz[3] = 1.0f;
+
+    m_view = new float[16];
+    m_pers = new float[16];
+    m_screen = new float[16];
     
     this->set_move_collision(camera_move, camera_collision);
 }
--- a/TaskManager/Test/test_render/Makefile.def	Tue Feb 10 20:51:56 2009 +0900
+++ b/TaskManager/Test/test_render/Makefile.def	Wed Feb 11 11:02:45 2009 +0900
@@ -1,15 +1,6 @@
 TARGET = test_nogl
 
-# include/library path
-# ex: macosx
-#CERIUM = /Users/gongo/Source/Concurrency/Game_project/Cerium
-#CERIUM = /Users/gongo/Source/hg/Cerium
-
-# ex: linux/ps3
-CERIUM = /home/gongo/Cerium
-#CERIUM = /Users/tkaito/Cerium
-
-#CERIUM = ../../..
+CERIUM = ../../..
 
 CC      = g++
 CFLAGS  = -O9 -g -Wall# -DDEBUG
--- a/TaskManager/Test/test_render/spe/Makefile	Tue Feb 10 20:51:56 2009 +0900
+++ b/TaskManager/Test/test_render/spe/Makefile	Wed Feb 11 11:02:45 2009 +0900
@@ -2,6 +2,8 @@
 
 TARGET = ../spe-main
 
+TOP = ../$(CERIUM)
+
 SRCS_TMP = $(wildcard *.cpp)
 SRCS_EXCLUDE = CreatePolygon.cpp
 SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
@@ -9,8 +11,8 @@
 
 CC      = spu-g++
 CFLAGS  = -O9 -Wall -g -fno-exceptions -fno-rtti #-DDEBUG
-INCLUDE = -I$(CERIUM)/include/TaskManager -I. -I..
-LIBS    = -L$(CERIUM)/TaskManager -lspemanager
+INCLUDE = -I$(TOP)/include/TaskManager -I. -I..
+LIBS    = -L$(TOP)/TaskManager -lspemanager
 
 .SUFFIXES: .cpp .o
 
--- a/TaskManager/Test/test_render/viewer_types.h	Tue Feb 10 20:51:56 2009 +0900
+++ b/TaskManager/Test/test_render/viewer_types.h	Wed Feb 11 11:02:45 2009 +0900
@@ -13,7 +13,6 @@
 enum video_type {
     VTYPE_SDL,
     VTYPE_FB,
-    // OPENGL,
 };
 
 #if defined(__LITTLE_ENDIAN__)