updated librw

librw

@@ -1 +1 @@
-Subproject commit b3ad490d1be3c1f41b416d3ceeaff3453bd2d28d
+Subproject commit 40eae78e793f234e332aff08265c41683faeb7f7

premake5.lua

@@ -192,3 +192,95 @@ project "re3"
 		libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") }
 		libdirs { path.join(_OPTIONS["glfwdir"], "lib-" .. string.gsub(_ACTION, "vs", "vc")) }
 		links { "opengl32", "glew32s", "glfw3" }
+
+
+project "reVC"
+	kind "WindowedApp"
+	targetname "reVC"
+	targetdir "bin/%{cfg.platform}/%{cfg.buildcfg}"
+	targetextension ".exe"
+	characterset ("MBCS")
+	linkoptions "/SAFESEH:NO"
+
+	defines { "MIAMI" }
+
+	files { "src/*.*" }
+	files { "src/animation/*.*" }
+	files { "src/audio/*.*" }
+	files { "src/control/*.*" }
+	files { "src/core/*.*" }
+	files { "src/entities/*.*" }
+	files { "src/math/*.*" }
+	files { "src/modelinfo/*.*" }
+	files { "src/objects/*.*" }
+	files { "src/peds/*.*" }
+	files { "src/render/*.*" }
+	files { "src/rw/*.*" }
+	files { "src/save/*.*" }
+	files { "src/skel/*.*" }
+	files { "src/skel/win/*.*" }
+	files { "src/skel/glfw/*.*" }
+	files { "src/text/*.*" }
+	files { "src/vehicles/*.*" }
+	files { "src/weapons/*.*" }
+	files { "src/extras/*.*" }
+	files { "eax/*.*" }
+
+	includedirs { "src" }
+	includedirs { "src/animation" }
+	includedirs { "src/audio" }
+	includedirs { "src/control" }
+	includedirs { "src/core" }
+	includedirs { "src/entities" }
+	includedirs { "src/math" }
+	includedirs { "src/modelinfo" }
+	includedirs { "src/objects" }
+	includedirs { "src/peds" }
+	includedirs { "src/render" }
+	includedirs { "src/rw" }
+	includedirs { "src/save/" }
+	includedirs { "src/skel/" }
+	includedirs { "src/skel/win" }
+	includedirs { "src/skel/glfw" }
+	includedirs { "src/text" }
+	includedirs { "src/vehicles" }
+	includedirs { "src/weapons" }
+	includedirs { "src/extras" }
+	includedirs { "eax" }
+
+	includedirs { "milessdk/include" }
+	includedirs { "eax" }
+
+	libdirs { "milessdk/lib" }
+	
+	setpaths("$(GTA_VC_RE_DIR)/", "$(TargetFileName)", "")
+	
+	filter "platforms:*RW33*"
+		staticruntime "on"
+		includedirs { "rwsdk/include/d3d8" }
+		libdirs { "rwsdk/lib/d3d8/release" }
+		links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtcharse" }
+		defines { "RWLIBS" }
+		linkoptions "/SECTION:_rwcseg,ER!W /MERGE:_rwcseg=.text"
+	
+	filter "platforms:*librw*"
+		defines { "LIBRW" }
+		files { "src/fakerw/*.*" }
+		includedirs { "src/fakerw" }
+		includedirs { Librw }
+		if(_OPTIONS["with-librw"]) then
+			libdirs { "lib/%{cfg.platform}/%{cfg.buildcfg}" }
+		end
+		links { "rw" }
+
+	filter "platforms:*d3d*"
+		includedirs { "dxsdk/include" }
+		libdirs { "dxsdk/lib" }
+
+	filter "platforms:*d3d9*"
+		links { "d3d9" }
+		
+	filter "platforms:*gl3_glfw*"
+		libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") }
+		libdirs { path.join(_OPTIONS["glfwdir"], "lib-" .. string.gsub(_ACTION, "vs", "vc")) }
+		links { "opengl32", "glew32s", "glfw3" }

src/fakerw/fake.cpp

@@ -429,8 +429,7 @@ void RwIm3DVertexSetU(RwIm3DVertex *vert, RwReal u) { vert->setU(u); }
 void RwIm3DVertexSetV(RwIm3DVertex *vert, RwReal v) { vert->setV(v); }
 void RwIm3DVertexSetRGBA(RwIm3DVertex *vert, RwUInt8 r, RwUInt8 g, RwUInt8 b, RwUInt8 a) { vert->setColor(r, g, b, a); }
 
-// WARNING: ignoring flags
+void  *RwIm3DTransform(RwIm3DVertex *pVerts, RwUInt32 numVerts, RwMatrix *ltm, RwUInt32 flags) { im3d::Transform(pVerts, numVerts, ltm, flags); return pVerts; }
-void  *RwIm3DTransform(RwIm3DVertex *pVerts, RwUInt32 numVerts, RwMatrix *ltm, RwUInt32 flags) { im3d::Transform(pVerts, numVerts, ltm); return pVerts; }
 RwBool RwIm3DEnd(void) { im3d::End(); return true; }
 RwBool RwIm3DRenderLine(RwInt32 vert1, RwInt32 vert2) {
 	RwImVertexIndex indices[2];

src/fakerw/rwcore.h

@@ -20,11 +20,11 @@ typedef RwUInt16 RwImVertexIndex;
 
 enum RwIm3DTransformFlags
 {
-	rwIM3D_VERTEXUV      = 1,
+	rwIM3D_VERTEXUV      = rw::im3d::VERTEXUV,
-	rwIM3D_ALLOPAQUE     = 2,
+	rwIM3D_ALLOPAQUE     = rw::im3d::ALLOPAQUE,
-	rwIM3D_NOCLIP        = 4,
+	rwIM3D_NOCLIP        = rw::im3d::NOCLIP,
-	rwIM3D_VERTEXXYZ     = 8,
+	rwIM3D_VERTEXXYZ     = rw::im3d::VERTEXXYZ,
-	rwIM3D_VERTEXRGBA    = 16,
+	rwIM3D_VERTEXRGBA    = rw::im3d::VERTEXRGBA,
 };
 
 void RwIm2DVertexSetCameraX(RwIm2DVertex *vert, RwReal camx);

src/render/Lines.cpp

@@ -60,6 +60,8 @@ CLines::RenderLineWithClipping(float x1, float y1, float z1, float x2, float y2,
 	col2.green = c2>>16;
 	col2.blue = c2>>8;
 	col2.alpha = c2;
+// HACK HACK until i got im3d fixed
+RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil);
 
 	RwIm3DVertexSetRGBA(&v[0], col1.red, col1.green, col1.blue, col1.alpha);
 	RwIm3DVertexSetRGBA(&v[1], col2.red, col2.green, col2.blue, col2.alpha);

src/skel/win/win.cpp

@@ -1884,13 +1884,11 @@ WinMain(HINSTANCE instance,
 	StaticPatcher::Apply();
 	SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
 
-/*
 	// TODO: make this an option somewhere
 	AllocConsole();
 	freopen("CONIN$", "r", stdin);
 	freopen("CONOUT$", "w", stdout);
 	freopen("CONOUT$", "w", stderr);
-*/
 
 	/* 
 	 * Initialize the platform independent data.