mikymod 12 лет назад
Родитель
Сommit
07792a0a8e
3 измененных файлов с 36 добавлено и 4 удалено
  1. 32 1
      game/lua/init.lua
  2. 3 3
      samples/lua/lua.cpp
  3. 1 0
      src/CMakeLists.txt

+ 32 - 1
game/lua/init.lua

@@ -8,7 +8,19 @@ require("vec3")
 require("mat4")
 require("quat")
 require("math_utils")
+require("camera")
 
+--------------------------------------------------------------
+--------------------------------------------------------------
+--------------------------------------------------------------
+print("-- testing Vec3 --\n")
+local pos = Vec3.vec3(1.0, 1.0, 1.0)
+
+
+
+--------------------------------------------------------------
+--------------------------------------------------------------
+--------------------------------------------------------------
 
 print("-- Testing Mat4 --\n")
 local m = Mat4.mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0)
@@ -29,6 +41,25 @@ m = Mat4.subtract(m, t)
 Mat4.print(m)
 print("\n")
 
+--------------------------------------------------------------
+--------------------------------------------------------------
+--------------------------------------------------------------
+
 local s = Math.sin(0.0)
 
-print("sin of 0 is " .. s)
+
+print("sin of 0 is " .. s)
+
+--------------------------------------------------------------
+--------------------------------------------------------------
+--------------------------------------------------------------
+
+local cam = Camera.camera(pos, 90.0, 1.6)
+
+print(Camera.position(cam).x)
+print(Camera.fov(cam))
+
+
+
+
+

+ 3 - 3
samples/lua/lua.cpp

@@ -21,7 +21,7 @@ int main(int argc, char** argv)
 
   res_manager.flush();
 
-  ScriptSystem script_system;
+  ScriptSystem* sys = scripter();
 
   while (1)
   {
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 
       ScriptResource* resource = (ScriptResource*)res_manager.data(script);
 
-      script_system.load(resource);
-      script_system.execute();
+      sys->load(resource);
+      sys->execute();
 
       break;
     }

+ 1 - 0
src/CMakeLists.txt

@@ -241,6 +241,7 @@ set (BINDS_SRC
 	binds/Vec3Binds.cpp
 	binds/QuatBinds.cpp
 	binds/Mat4Binds.cpp
+	binds/CameraBinds.cpp
 )
 
 set (CROWN_SOURCES