API tools faq
paste
Advertisement
illwieckz

netradiant cleanup preprocessed diff

illwieckz
Jul 8th, 2017
351
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 24.43 KB | None | 0 0
raw download clone embed print report
  1. diff -u1 -r preproc/before/build/brush_primit.ii preproc/after/build/brush_primit.ii
  2. --- preproc/before/build/brush_primit.ii    2017-07-09 04:26:32.974542166 +0200
  3. +++ preproc/after/build/brush_primit.ii 2017-07-09 04:40:18.146395856 +0200
  4. @@ -53394,11 +53394,2 @@
  5.  }
  6. -void BPMatDump( float A[2][3] ){
  7. - globalOutputStream() << "" << A[0][0]
  8. -       << " " << A[0][1]
  9. -       << " " << A[0][2]
  10. -       << "\n" << A[1][0]
  11. -       << " " << A[1][2]
  12. -       << " " << A[1][2]
  13. -       << "\n0 0 1\n";
  14. -}
  15.  void BPMatRotate( float A[2][3], float theta ){
  16. diff -u1 -r preproc/before/build/patchdialog.ii preproc/after/build/patchdialog.ii
  17. --- preproc/before/build/patchdialog.ii 2017-07-09 04:26:45.082670385 +0200
  18. +++ preproc/after/build/patchdialog.ii  2017-07-09 04:40:33.374562337 +0200
  19. @@ -78616,30 +78616,28 @@
  20.  void render( RenderStateFlags state ) const {
  21. - {
  22. -  if ( ( state & RENDER_BUMP ) != 0 ) {
  23. -   if ( GlobalShaderCache().useShaderLanguage() ) {
  24. -    GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  25. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_TexCoord0, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  26. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Tangent, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  27. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Binormal, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  28. -   }
  29. -   else
  30. -   {
  31. -    GlobalOpenGL().m_glVertexAttribPointerARB( 11, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  32. -    GlobalOpenGL().m_glVertexAttribPointerARB( 8, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  33. -    GlobalOpenGL().m_glVertexAttribPointerARB( 9, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  34. -    GlobalOpenGL().m_glVertexAttribPointerARB( 10, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  35. -   }
  36. -  }
  37. -  else
  38. -  {
  39. + if ( ( state & RENDER_BUMP ) != 0 ) {
  40. +  if ( GlobalShaderCache().useShaderLanguage() ) {
  41.     GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  42. -   GlobalOpenGL().m_glTexCoordPointer( 2, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  43. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_TexCoord0, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  44. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Tangent, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  45. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Binormal, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  46.    }
  47. -  GlobalOpenGL().m_glVertexPointer( 3, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->vertex );
  48. -  const RenderIndex* strip_indices = m_tess.m_indices.data();
  49. -  for ( std::size_t i = 0; i < m_tess.m_numStrips; i++, strip_indices += m_tess.m_lenStrips )
  50. +  else
  51.    {
  52. -   GlobalOpenGL().m_glDrawElements( 0x0008, GLsizei( m_tess.m_lenStrips ), RenderIndexTypeID, strip_indices );
  53. +   GlobalOpenGL().m_glVertexAttribPointerARB( 11, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  54. +   GlobalOpenGL().m_glVertexAttribPointerARB( 8, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  55. +   GlobalOpenGL().m_glVertexAttribPointerARB( 9, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  56. +   GlobalOpenGL().m_glVertexAttribPointerARB( 10, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  57.    }
  58.   }
  59. + else
  60. + {
  61. +  GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  62. +  GlobalOpenGL().m_glTexCoordPointer( 2, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  63. + }
  64. + GlobalOpenGL().m_glVertexPointer( 3, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->vertex );
  65. + const RenderIndex* strip_indices = m_tess.m_indices.data();
  66. + for ( std::size_t i = 0; i < m_tess.m_numStrips; i++, strip_indices += m_tess.m_lenStrips )
  67. + {
  68. +  GlobalOpenGL().m_glDrawElements( 0x0008, GLsizei( m_tess.m_lenStrips ), RenderIndexTypeID, strip_indices );
  69. + }
  70.  }
  71. @@ -78980,3 +78978,2 @@
  72.  void RenderDebug( RenderStateFlags state ) const;
  73. -void RenderNormals( RenderStateFlags state ) const;
  74.  void pushElement( const XMLElement& element ){
  75. diff -u1 -r preproc/before/build/patch.ii preproc/after/build/patch.ii
  76. --- preproc/before/build/patch.ii   2017-07-09 04:26:44.677666096 +0200
  77. +++ preproc/after/build/patch.ii    2017-07-09 04:40:33.289561422 +0200
  78. @@ -41756,30 +41756,28 @@
  79.  void render( RenderStateFlags state ) const {
  80. - {
  81. -  if ( ( state & RENDER_BUMP ) != 0 ) {
  82. -   if ( GlobalShaderCache().useShaderLanguage() ) {
  83. -    GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  84. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_TexCoord0, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  85. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Tangent, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  86. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Binormal, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  87. -   }
  88. -   else
  89. -   {
  90. -    GlobalOpenGL().m_glVertexAttribPointerARB( 11, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  91. -    GlobalOpenGL().m_glVertexAttribPointerARB( 8, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  92. -    GlobalOpenGL().m_glVertexAttribPointerARB( 9, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  93. -    GlobalOpenGL().m_glVertexAttribPointerARB( 10, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  94. -   }
  95. -  }
  96. -  else
  97. -  {
  98. + if ( ( state & RENDER_BUMP ) != 0 ) {
  99. +  if ( GlobalShaderCache().useShaderLanguage() ) {
  100.     GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  101. -   GlobalOpenGL().m_glTexCoordPointer( 2, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  102. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_TexCoord0, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  103. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Tangent, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  104. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Binormal, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  105.    }
  106. -  GlobalOpenGL().m_glVertexPointer( 3, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->vertex );
  107. -  const RenderIndex* strip_indices = m_tess.m_indices.data();
  108. -  for ( std::size_t i = 0; i < m_tess.m_numStrips; i++, strip_indices += m_tess.m_lenStrips )
  109. +  else
  110.    {
  111. -   GlobalOpenGL().m_glDrawElements( 0x0008, GLsizei( m_tess.m_lenStrips ), RenderIndexTypeID, strip_indices );
  112. +   GlobalOpenGL().m_glVertexAttribPointerARB( 11, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  113. +   GlobalOpenGL().m_glVertexAttribPointerARB( 8, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  114. +   GlobalOpenGL().m_glVertexAttribPointerARB( 9, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  115. +   GlobalOpenGL().m_glVertexAttribPointerARB( 10, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  116.    }
  117.   }
  118. + else
  119. + {
  120. +  GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  121. +  GlobalOpenGL().m_glTexCoordPointer( 2, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  122. + }
  123. + GlobalOpenGL().m_glVertexPointer( 3, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->vertex );
  124. + const RenderIndex* strip_indices = m_tess.m_indices.data();
  125. + for ( std::size_t i = 0; i < m_tess.m_numStrips; i++, strip_indices += m_tess.m_lenStrips )
  126. + {
  127. +  GlobalOpenGL().m_glDrawElements( 0x0008, GLsizei( m_tess.m_lenStrips ), RenderIndexTypeID, strip_indices );
  128. + }
  129.  }
  130. @@ -42120,3 +42118,2 @@
  131.  void RenderDebug( RenderStateFlags state ) const;
  132. -void RenderNormals( RenderStateFlags state ) const;
  133.  void pushElement( const XMLElement& element ){
  134. @@ -68392,44 +68389,2 @@
  135.  }
  136. -void RenderablePatchSolid::RenderNormals() const {
  137. - const std::size_t width = m_tess.m_numStrips + 1;
  138. - const std::size_t height = m_tess.m_lenStrips >> 1;
  139. - GlobalOpenGL().m_glBegin( 0x0001 );
  140. - for ( std::size_t i = 0; i < width; i++ )
  141. - {
  142. -  for ( std::size_t j = 0; j < height; j++ )
  143. -  {
  144. -   {
  145. -    Vector3 vNormal(
  146. -     vector3_added(
  147. -      vertex3f_to_vector3( ( m_tess.m_vertices.data() + ( j * width + i ) )->vertex ),
  148. -      vector3_scaled( normal3f_to_vector3( ( m_tess.m_vertices.data() + ( j * width + i ) )->normal ), 8 )
  149. -      )
  150. -     );
  151. -    GlobalOpenGL().m_glVertex3fv( vertex3f_to_array( ( m_tess.m_vertices.data() + ( j * width + i ) )->vertex ) );
  152. -    GlobalOpenGL().m_glVertex3fv( &vNormal[0] );
  153. -   }
  154. -   {
  155. -    Vector3 vNormal(
  156. -     vector3_added(
  157. -      vertex3f_to_vector3( ( m_tess.m_vertices.data() + ( j * width + i ) )->vertex ),
  158. -      vector3_scaled( normal3f_to_vector3( ( m_tess.m_vertices.data() + ( j * width + i ) )->tangent ), 8 )
  159. -      )
  160. -     );
  161. -    GlobalOpenGL().m_glVertex3fv( vertex3f_to_array( ( m_tess.m_vertices.data() + ( j * width + i ) )->vertex ) );
  162. -    GlobalOpenGL().m_glVertex3fv( &vNormal[0] );
  163. -   }
  164. -   {
  165. -    Vector3 vNormal(
  166. -     vector3_added(
  167. -      vertex3f_to_vector3( ( m_tess.m_vertices.data() + ( j * width + i ) )->vertex ),
  168. -      vector3_scaled( normal3f_to_vector3( ( m_tess.m_vertices.data() + ( j * width + i ) )->bitangent ), 8 )
  169. -      )
  170. -     );
  171. -    GlobalOpenGL().m_glVertex3fv( vertex3f_to_array( ( m_tess.m_vertices.data() + ( j * width + i ) )->vertex ) );
  172. -    GlobalOpenGL().m_glVertex3fv( &vNormal[0] );
  173. -   }
  174. -  }
  175. - }
  176. - GlobalOpenGL().m_glEnd();
  177. -}
  178.  unsigned int subarray_get_degen( PatchControlIter subarray, std::size_t strideU, std::size_t strideV ){
  179. diff -u1 -r preproc/before/build/patchmanip.ii preproc/after/build/patchmanip.ii
  180. --- preproc/before/build/patchmanip.ii  2017-07-09 04:26:45.501674822 +0200
  181. +++ preproc/after/build/patchmanip.ii   2017-07-09 04:40:33.834567288 +0200
  182. @@ -89900,30 +89900,28 @@
  183.  void render( RenderStateFlags state ) const {
  184. - {
  185. -  if ( ( state & RENDER_BUMP ) != 0 ) {
  186. -   if ( GlobalShaderCache().useShaderLanguage() ) {
  187. -    GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  188. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_TexCoord0, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  189. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Tangent, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  190. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Binormal, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  191. -   }
  192. -   else
  193. -   {
  194. -    GlobalOpenGL().m_glVertexAttribPointerARB( 11, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  195. -    GlobalOpenGL().m_glVertexAttribPointerARB( 8, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  196. -    GlobalOpenGL().m_glVertexAttribPointerARB( 9, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  197. -    GlobalOpenGL().m_glVertexAttribPointerARB( 10, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  198. -   }
  199. -  }
  200. -  else
  201. -  {
  202. + if ( ( state & RENDER_BUMP ) != 0 ) {
  203. +  if ( GlobalShaderCache().useShaderLanguage() ) {
  204.     GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  205. -   GlobalOpenGL().m_glTexCoordPointer( 2, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  206. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_TexCoord0, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  207. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Tangent, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  208. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Binormal, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  209.    }
  210. -  GlobalOpenGL().m_glVertexPointer( 3, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->vertex );
  211. -  const RenderIndex* strip_indices = m_tess.m_indices.data();
  212. -  for ( std::size_t i = 0; i < m_tess.m_numStrips; i++, strip_indices += m_tess.m_lenStrips )
  213. +  else
  214.    {
  215. -   GlobalOpenGL().m_glDrawElements( 0x0008, GLsizei( m_tess.m_lenStrips ), RenderIndexTypeID, strip_indices );
  216. +   GlobalOpenGL().m_glVertexAttribPointerARB( 11, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  217. +   GlobalOpenGL().m_glVertexAttribPointerARB( 8, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  218. +   GlobalOpenGL().m_glVertexAttribPointerARB( 9, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  219. +   GlobalOpenGL().m_glVertexAttribPointerARB( 10, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  220.    }
  221.   }
  222. + else
  223. + {
  224. +  GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  225. +  GlobalOpenGL().m_glTexCoordPointer( 2, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  226. + }
  227. + GlobalOpenGL().m_glVertexPointer( 3, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->vertex );
  228. + const RenderIndex* strip_indices = m_tess.m_indices.data();
  229. + for ( std::size_t i = 0; i < m_tess.m_numStrips; i++, strip_indices += m_tess.m_lenStrips )
  230. + {
  231. +  GlobalOpenGL().m_glDrawElements( 0x0008, GLsizei( m_tess.m_lenStrips ), RenderIndexTypeID, strip_indices );
  232. + }
  233.  }
  234. @@ -90264,3 +90262,2 @@
  235.  void RenderDebug( RenderStateFlags state ) const;
  236. -void RenderNormals( RenderStateFlags state ) const;
  237.  void pushElement( const XMLElement& element ){
  238. diff -u1 -r preproc/before/build/patchmodule.ii preproc/after/build/patchmodule.ii
  239. --- preproc/before/build/patchmodule.ii 2017-07-09 04:26:45.447674250 +0200
  240. +++ preproc/after/build/patchmodule.ii  2017-07-09 04:40:33.727566136 +0200
  241. @@ -41967,30 +41967,28 @@
  242.  void render( RenderStateFlags state ) const {
  243. - {
  244. -  if ( ( state & RENDER_BUMP ) != 0 ) {
  245. -   if ( GlobalShaderCache().useShaderLanguage() ) {
  246. -    GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  247. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_TexCoord0, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  248. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Tangent, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  249. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Binormal, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  250. -   }
  251. -   else
  252. -   {
  253. -    GlobalOpenGL().m_glVertexAttribPointerARB( 11, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  254. -    GlobalOpenGL().m_glVertexAttribPointerARB( 8, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  255. -    GlobalOpenGL().m_glVertexAttribPointerARB( 9, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  256. -    GlobalOpenGL().m_glVertexAttribPointerARB( 10, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  257. -   }
  258. -  }
  259. -  else
  260. -  {
  261. + if ( ( state & RENDER_BUMP ) != 0 ) {
  262. +  if ( GlobalShaderCache().useShaderLanguage() ) {
  263.     GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  264. -   GlobalOpenGL().m_glTexCoordPointer( 2, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  265. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_TexCoord0, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  266. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Tangent, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  267. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Binormal, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  268.    }
  269. -  GlobalOpenGL().m_glVertexPointer( 3, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->vertex );
  270. -  const RenderIndex* strip_indices = m_tess.m_indices.data();
  271. -  for ( std::size_t i = 0; i < m_tess.m_numStrips; i++, strip_indices += m_tess.m_lenStrips )
  272. +  else
  273.    {
  274. -   GlobalOpenGL().m_glDrawElements( 0x0008, GLsizei( m_tess.m_lenStrips ), RenderIndexTypeID, strip_indices );
  275. +   GlobalOpenGL().m_glVertexAttribPointerARB( 11, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  276. +   GlobalOpenGL().m_glVertexAttribPointerARB( 8, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  277. +   GlobalOpenGL().m_glVertexAttribPointerARB( 9, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  278. +   GlobalOpenGL().m_glVertexAttribPointerARB( 10, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  279.    }
  280.   }
  281. + else
  282. + {
  283. +  GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  284. +  GlobalOpenGL().m_glTexCoordPointer( 2, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  285. + }
  286. + GlobalOpenGL().m_glVertexPointer( 3, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->vertex );
  287. + const RenderIndex* strip_indices = m_tess.m_indices.data();
  288. + for ( std::size_t i = 0; i < m_tess.m_numStrips; i++, strip_indices += m_tess.m_lenStrips )
  289. + {
  290. +  GlobalOpenGL().m_glDrawElements( 0x0008, GLsizei( m_tess.m_lenStrips ), RenderIndexTypeID, strip_indices );
  291. + }
  292.  }
  293. @@ -42331,3 +42329,2 @@
  294.  void RenderDebug( RenderStateFlags state ) const;
  295. -void RenderNormals( RenderStateFlags state ) const;
  296.  void pushElement( const XMLElement& element ){
  297. diff -u1 -r preproc/before/build/surfacedialog.ii preproc/after/build/surfacedialog.ii
  298. --- preproc/before/build/surfacedialog.ii   2017-07-09 04:26:52.484748768 +0200
  299. +++ preproc/after/build/surfacedialog.ii    2017-07-09 04:40:41.290647540 +0200
  300. @@ -95503,30 +95503,28 @@
  301.  void render( RenderStateFlags state ) const {
  302. - {
  303. -  if ( ( state & RENDER_BUMP ) != 0 ) {
  304. -   if ( GlobalShaderCache().useShaderLanguage() ) {
  305. -    GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  306. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_TexCoord0, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  307. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Tangent, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  308. -    GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Binormal, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  309. -   }
  310. -   else
  311. -   {
  312. -    GlobalOpenGL().m_glVertexAttribPointerARB( 11, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  313. -    GlobalOpenGL().m_glVertexAttribPointerARB( 8, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  314. -    GlobalOpenGL().m_glVertexAttribPointerARB( 9, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  315. -    GlobalOpenGL().m_glVertexAttribPointerARB( 10, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  316. -   }
  317. -  }
  318. -  else
  319. -  {
  320. + if ( ( state & RENDER_BUMP ) != 0 ) {
  321. +  if ( GlobalShaderCache().useShaderLanguage() ) {
  322.     GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  323. -   GlobalOpenGL().m_glTexCoordPointer( 2, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  324. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_TexCoord0, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  325. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Tangent, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  326. +   GlobalOpenGL().m_glVertexAttribPointerARB( c_attr_Binormal, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  327.    }
  328. -  GlobalOpenGL().m_glVertexPointer( 3, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->vertex );
  329. -  const RenderIndex* strip_indices = m_tess.m_indices.data();
  330. -  for ( std::size_t i = 0; i < m_tess.m_numStrips; i++, strip_indices += m_tess.m_lenStrips )
  331. +  else
  332.    {
  333. -   GlobalOpenGL().m_glDrawElements( 0x0008, GLsizei( m_tess.m_lenStrips ), RenderIndexTypeID, strip_indices );
  334. +   GlobalOpenGL().m_glVertexAttribPointerARB( 11, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  335. +   GlobalOpenGL().m_glVertexAttribPointerARB( 8, 2, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  336. +   GlobalOpenGL().m_glVertexAttribPointerARB( 9, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->tangent );
  337. +   GlobalOpenGL().m_glVertexAttribPointerARB( 10, 3, 0x1406, 0, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->bitangent );
  338.    }
  339.   }
  340. + else
  341. + {
  342. +  GlobalOpenGL().m_glNormalPointer( 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->normal );
  343. +  GlobalOpenGL().m_glTexCoordPointer( 2, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->texcoord );
  344. + }
  345. + GlobalOpenGL().m_glVertexPointer( 3, 0x1406, sizeof( ArbitraryMeshVertex ), &m_tess.m_vertices.data()->vertex );
  346. + const RenderIndex* strip_indices = m_tess.m_indices.data();
  347. + for ( std::size_t i = 0; i < m_tess.m_numStrips; i++, strip_indices += m_tess.m_lenStrips )
  348. + {
  349. +  GlobalOpenGL().m_glDrawElements( 0x0008, GLsizei( m_tess.m_lenStrips ), RenderIndexTypeID, strip_indices );
  350. + }
  351.  }
  352. @@ -95867,3 +95865,2 @@
  353.  void RenderDebug( RenderStateFlags state ) const;
  354. -void RenderNormals( RenderStateFlags state ) const;
  355.  void pushElement( const XMLElement& element ){
  356. diff -u1 -r preproc/before/build/winding.ii preproc/after/build/winding.ii
  357. --- preproc/before/build/winding.ii 2017-07-09 04:26:54.889774236 +0200
  358. +++ preproc/after/build/winding.ii  2017-07-09 04:40:43.765674178 +0200
  359. @@ -30175,3 +30175,2 @@
  360.  }
  361. -const double DEBUG_EPSILON_SQUARED = ON_EPSILON * ON_EPSILON;
  362.  void Winding_Clip( const FixedWinding& winding, const Plane3& plane, const Plane3& clipPlane, std::size_t adjacent, FixedWinding& clipped ){
  363. diff -u1 -r preproc/before/contrib/ufoaiplug/ufoai_filters.ii preproc/after/contrib/ufoaiplug/ufoai_filters.ii
  364. --- preproc/before/contrib/ufoaiplug/ufoai_filters.ii   2017-07-09 04:26:31.850530263 +0200
  365. +++ preproc/after/contrib/ufoaiplug/ufoai_filters.ii    2017-07-09 04:40:15.610368008 +0200
  366. @@ -43100,4 +43100,8 @@
  367.  void visit( Face& face ) const {
  368. - m_surfaceFlagsVis = face.getShader().m_flags.m_surfaceFlags;
  369. - m_contentFlagsVis = face.getShader().m_flags.m_contentFlags;
  370. + if ( m_surfaceFlagsVis < 0 ) {
  371. +  m_surfaceFlagsVis = face.getShader().m_flags.m_surfaceFlags;
  372. + }
  373. + if ( m_contentFlagsVis < 0 ) {
  374. +  m_contentFlagsVis = face.getShader().m_flags.m_contentFlags;
  375. + }
  376.  }
  377. diff -u1 -r preproc/before/libs/splines/splines.ii preproc/after/libs/splines/splines.ii
  378. --- preproc/before/libs/splines/splines.ii  2017-07-09 04:26:01.755211561 +0200
  379. +++ preproc/after/libs/splines/splines.ii   2017-07-09 04:38:10.110989343 +0200
  380. @@ -17345,6 +17345,3 @@
  381.  void splineDraw()
  382. -void debugLine( idVec3 &color, float x, float y, float z, float x2, float y2, float z2 ) {
  383. - idVec3 from( x, y, z );
  384. - idVec3 to( x2, y2, z2 );
  385. -}
  386. +void debugLine( idVec3 &color, float x, float y, float z, float x2, float y2, float z2 )
  387.  void idSplineList::addToRenderer() {
  388. @@ -17675,5 +17672,3 @@
  389.   int numTargets = targetPositions.Num();
  390. - if ( numTargets == 0 ) {
  391. - }
  392. - else {
  393. + if ( numTargets != 0 ) {
  394.    if ( getActiveTarget()->numPoints() > 0 ) {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!