Mercurial > hg > Game > Cerium

changeset 2041:363b7c401c79 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make Rendefing Engine
author Shin,ichi Uehara
date Mon, 23 Mar 2015 17:47:12 +0900
parents 892c77a1529f
children 110e72b06b20
files Renderer/Engine/Application.h Renderer/Engine/Joystick.cc Renderer/Engine/Makefile.def Renderer/Engine/Makefile.macosx Renderer/Engine/RenderingGlobal.h Renderer/Engine/RenderingTasks.h Renderer/Engine/SceneGraph.cc Renderer/Engine/task/AllocateSegment.cc Renderer/Engine/task/CreatePolygonFromSceneGraph.cc Renderer/Engine/task/CreateSpan.cc Renderer/Engine/viewer.cc Renderer/Test/Makefile.macosx
diffstat 12 files changed, 29 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/Application.h	Thu Feb 12 17:04:03 2015 +0900
+++ b/Renderer/Engine/Application.h	Mon Mar 23 17:47:12 2015 +0900
@@ -15,7 +15,8 @@
     Application();
     virtual ~Application();
 
-    virtual bool app_loop(Viewer *viewer){ return 1; /* use all execute */ };
+    //virtual bool app_loop(Viewer *viewer){ return 1; /* use all execute */ };
+    virtual bool app_loop(Viewer *viewer){ return true; /* use all execute */ };
     virtual HTaskPtr application_task(HTaskPtr next, Viewer* viewer){return next;};
     virtual MainLoopPtr init(Viewer *viewer, int w, int h)  = 0;
 };
--- a/Renderer/Engine/Joystick.cc	Thu Feb 12 17:04:03 2015 +0900
+++ b/Renderer/Engine/Joystick.cc	Mon Mar 23 17:47:12 2015 +0900
@@ -20,7 +20,7 @@
 static const int CIRCLE   = 13;
 static const int CROSS    = 14;
 static const int SQUARE   = 15;
-static const int PS       = 16;
+//static const int PS       = 16;
 
 #if 0 // PS2 コントローラ
 static const int CROSS = 0;
--- a/Renderer/Engine/Makefile.def	Thu Feb 12 17:04:03 2015 +0900
+++ b/Renderer/Engine/Makefile.def	Mon Mar 23 17:47:12 2015 +0900
@@ -12,5 +12,5 @@
 
 CFLAGS  = -Wall $(ABI) $(OPT)  #  -DDEBUG
 CXXFLAGS = $(CFLAGS)
-INCLUDE = -I$(CERIUM)/include/TaskManager -I.
+INCLUDE = -I. -I$(CERIUM)/include/TaskManager
 # LIBS = -L$(CERIUM)/TaskManager -m$(ABIBIT)
--- a/Renderer/Engine/Makefile.macosx	Thu Feb 12 17:04:03 2015 +0900
+++ b/Renderer/Engine/Makefile.macosx	Mon Mar 23 17:47:12 2015 +0900
@@ -13,7 +13,7 @@
 
 LIBS += -lFifoManager
 
-CFLAGS += `sdl-config --cflags` `xml2-config --cflags` `freetype-config --cflags` -Drestrict=__restrict__
+CFLAGS += `sdl-config --cflags` `xml2-config --cflags` `freetype-config --cflags` -Drestrict=__restrict  -Wno-int-to-pointer-cast
 LIBS   += `sdl-config --libs` `xml2-config --libs` `freetype-config --libs` -lSDL_image -Wl,-framework,OpenGL 
 
 .SUFFIXES: .cc .o
--- a/Renderer/Engine/RenderingGlobal.h	Thu Feb 12 17:04:03 2015 +0900
+++ b/Renderer/Engine/RenderingGlobal.h	Mon Mar 23 17:47:12 2015 +0900
@@ -1,10 +1,9 @@
 
 /*Light 用の global_alloc ID*/
-
   LightData,
   LightSwitch,
   LightSysSwitch,
 
-/*spe_create_polygon 用*/
+  /*spe_create_polygon 用*/
 
   SG_COORD,
--- a/Renderer/Engine/RenderingTasks.h	Thu Feb 12 17:04:03 2015 +0900
+++ b/Renderer/Engine/RenderingTasks.h	Mon Mar 23 17:47:12 2015 +0900
@@ -45,3 +45,4 @@
 
      RUN_FINISH,
 
+
--- a/Renderer/Engine/SceneGraph.cc	Thu Feb 12 17:04:03 2015 +0900
+++ b/Renderer/Engine/SceneGraph.cc	Mon Mar 23 17:47:12 2015 +0900
@@ -12,7 +12,8 @@
 #include "TaskManager.h"
 #include "polygon_pack.h"
 #include <ft2build.h>
-#include <freetype/freetype.h>
+//#include <freetype/freetype.h>
+#include <freetype.h>
 
 using namespace std;
 
--- a/Renderer/Engine/task/AllocateSegment.cc	Thu Feb 12 17:04:03 2015 +0900
+++ b/Renderer/Engine/task/AllocateSegment.cc	Mon Mar 23 17:47:12 2015 +0900
@@ -33,15 +33,15 @@
      */
 
     MemList *ml = smanager->createMemList(sizeof(uint32) * TEXTURE_BLOCK_SIZE, MAX_TILE);
-    smanager->global_set(GLOBAL_TILE_LIST, (void *)ml);
+    smanager->global_set(/*GLOBAL_TILE_LIST*/16384, (void *)ml);
 
 #ifdef USE_SEGMENT
 
     ml = smanager->createMemList(sizeof(PolygonPack), POLYGONPACK_SEGMENT_NUM);
-    smanager->global_set(GLOBAL_POLYGONPACK_LIST, (void *)ml);
+    smanager->global_set(/*GLOBAL_POLYGONPACK_LIST*/34848, (void *)ml);
 
     ml = smanager->createMemList(sizeof(SpanPack), SPANPACK_SEGMENT_NUM);
-    smanager->global_set(GLOBAL_SPANPACK_LIST, (void *)ml);
+    smanager->global_set(/*GLOBAL_SPANPACK_LIST*/20704, (void *)ml);
 
 #endif
 
--- a/Renderer/Engine/task/CreatePolygonFromSceneGraph.cc	Thu Feb 12 17:04:03 2015 +0900
+++ b/Renderer/Engine/task/CreatePolygonFromSceneGraph.cc	Mon Mar 23 17:47:12 2015 +0900
@@ -191,13 +191,13 @@
 
       for (int j = 0; j < light_num; j++) {
           // 光源のスイッチが入ってたら 
-	if (light_switch[j] == 1) {
+      	if (light_switch[j] == 1) {
               // 複数の光源の計算, 全部足し合わせてみる.. 
               // rdb値は255を超えた値は、255にされるからここではいくら足してもいい
               diffuse1 += lighting(xyz1, normal1, &light_xyz[j*4]);
               diffuse2 += lighting(xyz2, normal2, &light_xyz[j*4]);
               diffuse3 += lighting(xyz3, normal3, &light_xyz[j*4]);
-	}
+	      }
       }
 
 
--- a/Renderer/Engine/task/CreateSpan.cc	Thu Feb 12 17:04:03 2015 +0900
+++ b/Renderer/Engine/task/CreateSpan.cc	Mon Mar 23 17:47:12 2015 +0900
@@ -6,12 +6,14 @@
 #include "Func.h"
 
 // DMA channel
+#ifdef __SPU__
 static const int SPAN_PACK_LOAD    =  5;
 static const int SPAN_PACK_STORE   =  6;
 static const int POLYGON_PACK_LOAD =  7;
 static const int TILE_ALLOCATE     =  8;
 static const int TILE_LOAD         =  9;
 static const int TILE_STORE        = 10;
+#endif
 
 static int prev_index = 0;
 static SpanPackPtr spack = NULL;
--- a/Renderer/Engine/viewer.cc	Thu Feb 12 17:04:03 2015 +0900
+++ b/Renderer/Engine/viewer.cc	Mon Mar 23 17:47:12 2015 +0900
@@ -479,7 +479,7 @@
 
 	HTaskPtr task_create_sp = manager->create_task(CreateSpan);
 
-        task_create_sp->set_param(0,index_start);
+        task_create_sp->set_param(0,(memaddr)index_start);
 	
         /**
          * ex. screen_height が 480, spenum が 6 の場合、各SPEのy担当範囲
@@ -491,8 +491,8 @@
          *   [649..864] [865..1080]
          */
 
-        task_create_sp->set_param(1,starty);
-        task_create_sp->set_param(2,endy);
+        task_create_sp->set_param(1,(memaddr)starty);
+        task_create_sp->set_param(2,(memaddr)endy);
 
        	task_create_sp->set_inData(0,r[ppi].ppack, sizeof(PolygonPack));
         task_create_sp->set_inData(1,r[spi].spackList_ptr,
@@ -542,10 +542,10 @@
 	    task_draw = task_draw_array->next_task_array(DrawSpan,task_draw);
 	    task_draw->set_param(0,(memaddr)&pixels[(startx-1) + this->width*(starty-1)]);
 	    task_draw->set_param(1,this->width);
-	    task_draw->set_param(2,startx);
-	    task_draw->set_param(3,endx);
-	    task_draw->set_param(4,rangey);
-	    task_draw->set_param(5,spack->info.size);
+	    task_draw->set_param(2,(memaddr)startx);
+	    task_draw->set_param(3,(memaddr)endx);
+	    task_draw->set_param(4,(memaddr)rangey);
+	    task_draw->set_param(5,(memaddr)(spack->info.size));
 	    
 	    task_draw->set_inData(0,spack, sizeof(SpanPack));
 	    
@@ -582,11 +582,11 @@
 
                 task_draw->set_param(0,
                     (memaddr)&pixels[(startx-1) + this->width*(starty-1)]);
-                task_draw->set_param(1,this->width);
-		task_draw->set_param(2,startx);
-		task_draw->set_param(3,endx);
-		task_draw->set_param(4,rangey);
-		task_draw->set_param(5,spack->info.size);
+                task_draw->set_param(1,(memaddr)this->width);
+		task_draw->set_param(2,(memaddr)startx);
+		task_draw->set_param(3,(memaddr)endx);
+		task_draw->set_param(4,(memaddr)rangey);
+		task_draw->set_param(5,(memaddr)spack->info.size);
 
                 task_draw->set_inData(0,spack, sizeof(SpanPack));
 
--- a/Renderer/Test/Makefile.macosx	Thu Feb 12 17:04:03 2015 +0900
+++ b/Renderer/Test/Makefile.macosx	Mon Mar 23 17:47:12 2015 +0900
@@ -1,6 +1,6 @@
 include ./Makefile.def
 
-LIBS += -lCerium -lFifoManager 
+LIBS += -L$(CERIUM) -lFifoManager 
 
 CFLAGS += `sdl-config --cflags` `xml2-config --cflags` `freetype-config --cflags` $(INCLUDE)  
 LIBS   += `sdl-config --libs` `xml2-config --libs` `freetype-config --libs` -lSDL_image -Wl,-framework,OpenGL