Skip to content

Commit 26fcf13

Browse files
rdbrdb
committed
Merge branch 'master' into input-overhaul
2 parents 70bfe21 + 272f130 commit 26fcf13

File tree

155 files changed

+1131
-2472
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+1131
-2472
lines changed

‎contrib/src/rplight/gpuCommand.I

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*
2525
*/
2626

27-
#include "stdint.h"
27+
#include <stdint.h>
2828

2929
/**
3030
* @brief Appends an integer to the GPUCommand.

‎direct/src/filter/CommonFilters.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ def reconfigure(self, fullrebuild, changed):
184184
if ("BlurSharpen" in configuration):
185185
blur0=self.textures["blur0"]
186186
blur1=self.textures["blur1"]
187-
self.blur.append(self.manager.renderQuadInto(colortex=blur0,div=2))
188-
self.blur.append(self.manager.renderQuadInto(colortex=blur1))
187+
self.blur.append(self.manager.renderQuadInto("filter-blur0", colortex=blur0,div=2))
188+
self.blur.append(self.manager.renderQuadInto("filter-blur1", colortex=blur1))
189189
self.blur[0].setShaderInput("src", self.textures["color"])
190190
self.blur[0].setShader(self.loadShader("filter-blurx.sha"))
191191
self.blur[1].setShaderInput("src", blur0)
@@ -195,9 +195,9 @@ def reconfigure(self, fullrebuild, changed):
195195
ssao0=self.textures["ssao0"]
196196
ssao1=self.textures["ssao1"]
197197
ssao2=self.textures["ssao2"]
198-
self.ssao.append(self.manager.renderQuadInto(colortex=ssao0))
199-
self.ssao.append(self.manager.renderQuadInto(colortex=ssao1,div=2))
200-
self.ssao.append(self.manager.renderQuadInto(colortex=ssao2))
198+
self.ssao.append(self.manager.renderQuadInto("filter-ssao0", colortex=ssao0))
199+
self.ssao.append(self.manager.renderQuadInto("filter-ssao1", colortex=ssao1,div=2))
200+
self.ssao.append(self.manager.renderQuadInto("filter-ssao2", colortex=ssao2))
201201
self.ssao[0].setShaderInput("depth", self.textures["depth"])
202202
self.ssao[0].setShaderInput("normal", self.textures["aux"])
203203
self.ssao[0].setShaderInput("random", loader.loadTexture("maps/random.rgb"))
@@ -215,21 +215,21 @@ def reconfigure(self, fullrebuild, changed):
215215
bloom3=self.textures["bloom3"]
216216
if (bloomconf.size == "large"):
217217
scale=8
218-
downsampler="filter-down4.sha"
218+
downsampler="filter-down4"
219219
elif (bloomconf.size == "medium"):
220220
scale=4
221-
downsampler="filter-copy.sha"
221+
downsampler="filter-copy"
222222
else:
223223
scale=2
224-
downsampler="filter-copy.sha"
225-
self.bloom.append(self.manager.renderQuadInto(colortex=bloom0, div=2, align=scale))
226-
self.bloom.append(self.manager.renderQuadInto(colortex=bloom1, div=scale, align=scale))
227-
self.bloom.append(self.manager.renderQuadInto(colortex=bloom2, div=scale, align=scale))
228-
self.bloom.append(self.manager.renderQuadInto(colortex=bloom3, div=scale, align=scale))
224+
downsampler="filter-copy"
225+
self.bloom.append(self.manager.renderQuadInto("filter-bloomi", colortex=bloom0, div=2, align=scale))
226+
self.bloom.append(self.manager.renderQuadInto(downsampler, colortex=bloom1, div=scale, align=scale))
227+
self.bloom.append(self.manager.renderQuadInto("filter-bloomx", colortex=bloom2, div=scale, align=scale))
228+
self.bloom.append(self.manager.renderQuadInto("filter-bloomy", colortex=bloom3, div=scale, align=scale))
229229
self.bloom[0].setShaderInput("src", self.textures["color"])
230230
self.bloom[0].setShader(self.loadShader("filter-bloomi.sha"))
231231
self.bloom[1].setShaderInput("src", bloom0)
232-
self.bloom[1].setShader(self.loadShader(downsampler))
232+
self.bloom[1].setShader(self.loadShader(downsampler + ".sha"))
233233
self.bloom[2].setShaderInput("src", bloom1)
234234
self.bloom[2].setShader(self.loadShader("filter-bloomx.sha"))
235235
self.bloom[3].setShaderInput("src", bloom2)

‎direct/src/filter/FilterManager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def renderSceneInto(self, depthtex=None, colortex=None, auxtex=None, auxbits=0,
236236

237237
return quad
238238

239-
def renderQuadInto(self, mul=1, div=1, align=1, depthtex=None, colortex=None, auxtex0=None, auxtex1=None):
239+
def renderQuadInto(self, name="filter-stage", mul=1, div=1, align=1, depthtex=None, colortex=None, auxtex0=None, auxtex1=None):
240240

241241
""" Creates an offscreen buffer for an intermediate
242242
computation. Installs a quad into the buffer. Returns
@@ -250,7 +250,7 @@ def renderQuadInto(self, mul=1, div=1, align=1, depthtex=None, colortex=None, au
250250

251251
depthbits = bool(depthtex != None)
252252

253-
buffer = self.createBuffer("filter-stage", winx, winy, texgroup, depthbits)
253+
buffer = self.createBuffer(name, winx, winy, texgroup, depthbits)
254254

255255
if (buffer == None):
256256
return None

‎direct/src/plugin/fileSpec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include "fileSpec.h"
1515
#include "wstring_encode.h"
16-
#include "openssl/md5.h"
16+
#include <openssl/md5.h>
1717

1818
#include <fstream>
1919
#include <fcntl.h>

‎direct/src/plugin/get_twirl_data.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313

1414
#include "get_twirl_data.h"
15-
#include "string.h"
15+
#include <string.h>
1616

1717
struct twirl_flip {
1818
int _index;

‎direct/src/plugin/load_plugin.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "is_pathsep.h"
1717
#include "wstring_encode.h"
1818

19-
#include "assert.h"
19+
#include <assert.h>
2020

2121
#include <iostream>
2222

‎direct/src/plugin/p3dCert.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include <FL/Fl_Window.H>
1919

2020
#define OPENSSL_NO_KRB5
21-
#include "openssl/x509.h"
22-
#include "openssl/x509_vfy.h"
23-
#include "openssl/pem.h"
21+
#include <openssl/x509.h>
22+
#include <openssl/x509_vfy.h>
23+
#include <openssl/pem.h>
2424

2525
#include <string>
2626
#include <iostream>

‎direct/src/plugin/p3dCert_wx.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include "wstring_encode.h"
1616
#include "mkdir_complete.h"
1717

18-
#include "wx/cmdline.h"
19-
#include "wx/filename.h"
18+
#include <wx/cmdline.h>
19+
#include <wx/filename.h>
2020

2121
#include "ca_bundle_data_src.c"
2222

‎direct/src/plugin/p3dCert_wx.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
#ifndef P3DCERT_WX_H
1515
#define P3DCERT_WX_H
1616

17-
#include "wx/wx.h"
17+
#include <wx/wx.h>
1818

1919
#define OPENSSL_NO_KRB5
20-
#include "openssl/x509.h"
21-
#include "openssl/x509_vfy.h"
22-
#include "openssl/pem.h"
20+
#include <openssl/x509.h>
21+
#include <openssl/x509_vfy.h>
22+
#include <openssl/pem.h>
2323

2424
#include <string>
2525
#include <iostream>

‎direct/src/plugin/p3dHost.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "mkdir_complete.h"
1818
#include "wstring_encode.h"
1919
#include "xml_helpers.h"
20-
#include "openssl/md5.h"
20+
#include <openssl/md5.h>
2121

2222
#include <algorithm>
2323

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy