Updated windows projects

build/windows/win32/PolycodeCore/PolycodeCore.vcxproj

@@ -155,6 +155,8 @@
     <Text Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\bindings\javascript\PolycodeJS.cpp" />
+    <ClCompile Include="..\..\..\..\src\bindings\lua\PolycodeLua.cpp" />
     <ClCompile Include="..\..\..\..\src\core\lodepng.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyBasicFileProvider.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyBezierCurve.cpp" />
@@ -211,6 +213,7 @@
     <ClCompile Include="..\..\..\..\src\core\PolySceneRenderTexture.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolySceneSound.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolySceneSprite.cpp" />
+    <ClCompile Include="..\..\..\..\src\core\PolyScript.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyServer.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyShader.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolySkeleton.cpp" />
@@ -233,6 +236,7 @@
     <ClCompile Include="..\..\..\..\src\core\tinyxml.cpp" />
     <ClCompile Include="..\..\..\..\src\core\tinyxmlerror.cpp" />
     <ClCompile Include="..\..\..\..\src\core\tinyxmlparser.cpp" />
+    <ClCompile Include="..\..\..\..\src\duktape\duktape.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\Polycode.h" />

build/windows/win32/PolycodeCore/PolycodeCore.vcxproj.filters

@@ -252,6 +252,18 @@
     <ClCompile Include="..\..\..\..\src\core\PolyServer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\duktape\duktape.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\bindings\lua\PolycodeLua.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\bindings\javascript\PolycodeJS.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\core\PolyScript.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyFont.h">

build/windows/win32/PolycodeStudio/PolycodeStudio.vcxproj

@@ -96,7 +96,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;pathcch.lib;portaudio.lib;lua5.1.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;PolycodeUI_d.lib;Polycore_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>liblua.lib;ws2_32.lib;winmm.lib;pathcch.lib;portaudio.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;PolycodeUI_d.lib;Polycore_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>if not exist "$(TargetDir)default.pak" copy "..\..\..\..\assets\default\default.pak" "$(TargetDir)"
@@ -122,7 +122,7 @@ if not exist "$(TargetDir)Standalone" (
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;pathcch.lib;portaudio.lib;lua5.1.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;PolycodeUI_d.lib;Polycore_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>liblua.lib;ws2_32.lib;winmm.lib;pathcch.lib;portaudio.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;PolycodeUI_d.lib;Polycore_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>if not exist "$(TargetDir)default.pak" copy "..\..\..\..\assets\default\default.pak" "$(TargetDir)"
@@ -152,7 +152,7 @@ if not exist "$(TargetDir)Standalone" (
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;pathcch.lib;portaudio.lib;lua5.1.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;PolycodeUI.lib;Polycore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>liblua.lib;ws2_32.lib;winmm.lib;pathcch.lib;portaudio.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;PolycodeUI.lib;Polycore.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>if not exist "$(TargetDir)default.pak" copy "..\..\..\..\assets\default\default.pak" "$(TargetDir)"
@@ -182,7 +182,7 @@ if not exist "$(TargetDir)Standalone" (
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;pathcch.lib;portaudio.lib;lua5.1.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;PolycodeUI.lib;Polycore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>liblua.lib;ws2_32.lib;winmm.lib;pathcch.lib;portaudio.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;PolycodeUI.lib;Polycore.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>if not exist "$(TargetDir)default.pak" copy "..\..\..\..\assets\default\default.pak" "$(TargetDir)"

build/windows/win32/TemplateApp/PolycodeTemplateApp.cpp

@@ -25,7 +25,7 @@ PolycodeTemplateApp::PolycodeTemplateApp(PolycodeView *view) {
 
 	// scene->setOverrideMaterial((Material*)globalPool->getResource(Resource::RESOURCE_MATERIAL, "Unlit"));
 
-	for (int i = 0; i < 3000; i++) {
+	for (int i = 0; i < 300; i++) {
 		test = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 0.5, 0.5);
 		test->setMaterialByName("Unlit");
 		test->getShaderPass(0).shaderBinding->loadTextureForParam("diffuse", "main_icon.png");
@@ -37,9 +37,9 @@ PolycodeTemplateApp::PolycodeTemplateApp(PolycodeView *view) {
 	}
 	Camera *camera = scene->getDefaultCamera();
 
-	fpsLabel = new SceneLabel("FPS:", 32, "main", Label::ANTIALIAS_FULL, 0.1);
+	fpsLabel = new SceneLabel("YO MOMMA!", 64, "main", Label::ANTIALIAS_FULL, 0.1);
 	scene->addChild(fpsLabel);
-	fpsLabel->setPositionX(-0.6);
+	//fpsLabel->setPositionX(-0.3);
 	
 	scene->getDefaultCamera()->setPostFilterByName("HDRProcessBloom");
 
@@ -76,7 +76,7 @@ bool PolycodeTemplateApp::Update() {
 	}
 
 	if (Services()->getRenderer()->getRenderThread()->getFrameInfo().timeTaken > 0) {
-		fpsLabel->setText("FPS:" + String::IntToString(1000 / Services()->getRenderer()->getRenderThread()->getFrameInfo().timeTaken));
+		//fpsLabel->setText("FPS:" + String::IntToString(1000 / Services()->getRenderer()->getRenderThread()->getFrameInfo().timeTaken));
 	}
 
 	return core->updateAndRender();

build/windows/win32/TemplateApp/TemplateApp.vcxproj

@@ -100,7 +100,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;portaudio.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;Polycore_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;winmm.lib;portaudio.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;liblua.lib;Polycore_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>if not exist "$(TargetDir)default.pak" copy "..\..\..\..\assets\default\default.pak" "$(TargetDir)"
@@ -119,7 +119,7 @@ if not exist "$(TargetDir)glew32.dll" copy "..\..\..\..\lib\win32\$(PlatformTarg
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;portaudio.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;Polycore_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;winmm.lib;portaudio.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;liblua.lib;Polycore_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>if not exist "$(TargetDir)default.pak" copy "..\..\..\..\assets\default\default.pak" "$(TargetDir)"
@@ -142,7 +142,7 @@ if not exist "$(TargetDir)glew32.dll" copy "..\..\..\..\lib\win32\$(PlatformTarg
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;portaudio.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;Polycore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;winmm.lib;portaudio.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;liblua.lib;Polycore.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>if not exist "$(TargetDir)default.pak" copy "..\..\..\..\assets\default\default.pak" "$(TargetDir)"
@@ -165,7 +165,7 @@ if not exist "$(TargetDir)glew32.dll" copy "..\..\..\..\lib\win32\$(PlatformTarg
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ws2_32.lib;winmm.lib;portaudio.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;Polycore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;winmm.lib;portaudio.lib;libvorbisfile.lib;libvorbis.lib;libogg.lib;opengl32.lib;glew32s.lib;glew32.lib;freetype.lib;physfs.lib;zlib.lib;liblua.lib;Polycore.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>if not exist "$(TargetDir)default.pak" copy "..\..\..\..\assets\default\default.pak" "$(TargetDir)"

include/polycode/bindings/javascript/PolycodeJSWrappers.h

@@ -7762,9 +7762,9 @@ namespace Polycode {
 		Ray *inst = (Ray*)duk_to_pointer(context, 0);
 		Vector3 box = *(Vector3*)duk_to_pointer(context, 1);
 		Matrix4 transformMatrix = *(Matrix4*)duk_to_pointer(context, 2);
-		Number near = duk_to_number(context, 3);
-		Number far = duk_to_number(context, 4);
-		duk_push_number(context, inst->boxIntersect(box,transformMatrix,near,far));
+		Number vnear = duk_to_number(context, 3);
+		Number vfar = duk_to_number(context, 4);
+		duk_push_number(context, inst->boxIntersect(box,transformMatrix,vnear,vfar));
 		return 1;
 	}
 

include/polycode/bindings/lua/PolycodeLuaWrappers.h

@@ -10660,19 +10660,19 @@ static int Polycode_Ray_set_inv_direction(lua_State *L) {
 		Vector3 box = *(Vector3*) *((PolyBase**)lua_touserdata(L, 2));
 		luaL_checktype(L, 3, LUA_TUSERDATA);
 		Matrix4 transformMatrix = *(Matrix4*) *((PolyBase**)lua_touserdata(L, 3));
-		Number near;
+		Number vnear;
 		if(lua_isnumber(L, 4)) {
-			near = lua_tonumber(L, 4);
+			vnear = lua_tonumber(L, 4);
 		} else {
-			near = 0.0;
+			vnear = 0.0;
 		}
-		Number far;
+		Number vfar;
 		if(lua_isnumber(L, 5)) {
-			far = lua_tonumber(L, 5);
+			vfar = lua_tonumber(L, 5);
 		} else {
-			far = 9999.0;
+			vfar = 9999.0;
 		}
-		lua_pushnumber(L, inst->boxIntersect(box, transformMatrix, near, far));
+		lua_pushnumber(L, inst->boxIntersect(box, transformMatrix, vnear, vfar));
 		return 1;
 	}
 	static int Polycode_Ray_planeIntersectPoint(lua_State *L) {

include/polycode/core/PolyRay.h

@@ -35,7 +35,7 @@ namespace Polycode {
 			Ray();
 			Ray(const Vector3 &origin, const Vector3 &direction);
 	
-			Number boxIntersect(const Vector3 &box, const Matrix4 &transformMatrix, float near = 0.0, float far = 9999.0) const;
+			Number boxIntersect(const Vector3 &box, const Matrix4 &transformMatrix, float vnear = 0.0, float vfar = 9999.0) const;
 			
 			Vector3 planeIntersectPoint(const Vector3 &planeNormal, Number planeDistance) const;
 			Vector3 planeIntersectPoint(const Vector3 &planeNormal, const Vector3 &planePosition) const;

lib

@@ -1 +1 @@
-Subproject commit 50c6ffeb29c5201b0ad3f5e8ab90b99ed0e06a19
+Subproject commit c55c4fec1d77ab356c0cf72ba175efc88b14ed05

src/core/PolyRay.cpp

@@ -133,7 +133,7 @@ bool Ray::closestPointsBetween(const Ray &ray2, Vector3 *point1, Vector3 *point2
 	return true;
 }
 
-Number Ray::boxIntersect(const Vector3 &box, const Matrix4 &transformMatrix, float near, float far) const {
+Number Ray::boxIntersect(const Vector3 &box, const Matrix4 &transformMatrix, float vnear, float vfar) const {
 
 	if(box.x == 0 || box.y == 0 || box.z == 0)
 		return -1.0;
@@ -171,7 +171,7 @@ Number Ray::boxIntersect(const Vector3 &box, const Matrix4 &transformMatrix, flo
 	if (tzmax < tmax)
 		tmax = tzmax;
 		
-	if( (tmin < far) && (tmax > near) ) {
+	if( (tmin < vfar) && (tmax > vnear) ) {
 		Vector3 hitpoint = r.origin + (r.direction * fabs(tmin));
 		hitpoint = transformMatrix * hitpoint;
 		return origin.distance(hitpoint);