Changeset 322 for ps

Timestamp:

05/30/04 02:46:58 (21 years ago)

Author:

janwas

Message:

ran everything though mark's newline stomper.

Location:

ps/trunk/source

Files:

• graphics/Model.cpp (modified) (1 diff)
• lib/sysdep/win/wposix.cpp (modified) (1 diff)
• main.cpp (modified) (6 diffs)
• renderer/Renderer.cpp (modified) (3 diffs)

ps/trunk/source/graphics/Model.cpp

@@ -265 +265 @@
 {
     // position model according to prop point position
-    CMatrix3D proptransform=point->m_Transform;;
-    if (m_BoneMatrices && point->m_BoneIndex!=0xff) {
-        proptransform.Concatenate(m_BoneMatrices[point->m_BoneIndex]);
-    }           
-    proptransform.Concatenate(m_Transform);
-    model->SetTransform(proptransform);
+    model->SetTransform(point->m_Transform);
 
     // check if we're already using this point, and replace

ps/trunk/source/lib/sysdep/win/wposix.cpp

@@ -263 +263 @@
 
 __declspec(naked) pthread_t pthread_self(void)
-{ __asm jmp     dword ptr [GetCurrentThreadId] }
+{ __asm jmp     dword ptr [GetCurrentThread] }
 
 

ps/trunk/source/main.cpp

@@ -421 +421 @@
 }
 
-extern "C" char* _getcwd(char*, int);
 
 int main(int argc, char* argv[])
@@ -427 +426 @@
     const int ERR_MSG_SIZE = 1000;
     wchar_t err_msg[ERR_MSG_SIZE];
-
-
-
-
 
     lib_init();
@@ -440 +435 @@
 
     detect();
-
-
 
     // init SDL
@@ -515 +508 @@
     }
 
+
     new CConfig;
 
@@ -520 +514 @@
     vfs_mount("", "mods/official/", 0);
 ////    dir_add_watch("mods\\official", false);
+
+
+//Handle xx = tex_load("art/textures/skins/structural/null.png");
 
 #ifndef NO_GUI
@@ -559 +556 @@
 
     g_EntityTemplateCollection.loadTemplates();
-
-
 
 

ps/trunk/source/renderer/Renderer.cpp

@@ -109 +109 @@
     m_Options.m_NoVBO=false;
     m_Options.m_NoPBuffer=false;
-    m_Options.m_Shadows=false;
+    m_Options.m_Shadows=true;
     m_Options.m_ShadowColor=RGBColor(0.4f,0.4f,0.4f);
 }
@@ -837 +837 @@
 void CRenderer::RenderModelsStreams(u32 streamflags)
 {
+    glMatrixMode(GL_MODELVIEW);
+
     for (uint i=0;i<m_Models.size();++i) {
         CModel* model=m_Models[i];
@@ -1345 +1347 @@
     }
 }
-