mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-12 19:31:41 +00:00
Adjusts handling for httpObject class so that if curl flag is off, files are not included and references are disabled to avoid compilation issues
Adds SMAA anti aliasing Adjusts AA option setting to properly work and facilitate SMAA Added defaults for AA to facilitate SMAA Updated brightness and HDR values on Example Level to comply more closely to the Editor default to give better default results Fixed issue where ShapeEditor wasn't initialized properly when we'd open it from the Asset Browser
This commit is contained in:
parent
ae1131e167
commit
5e9d7d63a1
36 changed files with 3436 additions and 23 deletions
|
|
@ -25,7 +25,10 @@
|
|||
#include "core/strings/stringFunctions.h"
|
||||
#include "core/util/hashFunction.h"
|
||||
#include "console/consoleTypes.h"
|
||||
|
||||
#ifdef TORQUE_NET_CURL
|
||||
#include "app/net/httpObject.h"
|
||||
#endif
|
||||
|
||||
// jamesu - debug DNS
|
||||
//#define TORQUE_DEBUG_LOOKUPS
|
||||
|
|
@ -559,7 +562,9 @@ bool Net::init()
|
|||
smConnectionReceive = new ConnectionReceiveEvent();
|
||||
smPacketReceive = new PacketReceiveEvent();
|
||||
|
||||
#ifdef TORQUE_NET_CURL
|
||||
HTTPObject::init();
|
||||
#endif
|
||||
|
||||
Process::notify(&Net::process, PROCESS_NET_ORDER);
|
||||
|
||||
|
|
@ -570,7 +575,9 @@ void Net::shutdown()
|
|||
{
|
||||
Process::remove(&Net::process);
|
||||
|
||||
#ifdef TORQUE_NET_CURL
|
||||
HTTPObject::shutdown();
|
||||
#endif
|
||||
|
||||
while (gPolledSockets.size() > 0)
|
||||
{
|
||||
|
|
@ -1103,8 +1110,10 @@ void Net::process()
|
|||
processListenSocket(PlatformNetState::udpSocket);
|
||||
processListenSocket(PlatformNetState::udp6Socket);
|
||||
|
||||
#ifdef TORQUE_NET_CURL
|
||||
// process HTTPObject
|
||||
HTTPObject::process();
|
||||
#endif
|
||||
|
||||
// process the polled sockets. This blob of code performs functions
|
||||
// similar to WinsockProc in winNet.cc
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue