LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some new labels in the editor

Browse source
This commit is contained in:
Mikulas Florek 2014-11-14 01:13:37 +01:00
parent 4bb9ddaa7b
commit dcb5a5663f
3 changed files with 58 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
qteditor/QtEditor/assetbrowser.ui
View file

@ -31,7 +31,35 @@
<number>2</number>
</property>
<item>
<widget class="QLineEdit" name="searchInput"/>
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Filter</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="searchInput"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QComboBox" name="filterComboBox">

30
qteditor/QtEditor/entity_list.ui
View file

@ -72,7 +72,35 @@
</widget>
</item>
<item>
<widget class="QLineEdit" name="nameFilterEdit"/>
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Filter</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="nameFilterEdit"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QTreeView" name="entityList">

2
src/graphics/culling_system.cpp
View file

@ -34,8 +34,6 @@ namespace Lumix
class CullingJob : public MTJD::Job
{
friend class ResultsCollectorJob;
public:
CullingJob(const CullingSystem::InputSpheres& spheres, const CullingSystem::Indexes& indexes, CullingSystem::Results& results, int start, int end, const Frustum& frustum, MTJD::Manager& manager, IAllocator& allocator)
: Job(true, MTJD::Priority::Default, false, manager, allocator)